Merge branch 'master' of https://github.com/Sitefinity/feather

Sitefinity · Mar 20, 2015 · 85dd6b8 · 85dd6b8
2 parents ce14ecb + e09c4cf
commit 85dd6b8
Show file tree

Hide file tree

Showing 10 changed files with 2,237 additions and 2,066 deletions.
diff --git a/Telerik.Sitefinity.Frontend/assets/dist/css/html-field.css b/Telerik.Sitefinity.Frontend/assets/dist/css/html-field.css
@@ -1,4 +1,4 @@
-/* line 1, C:/github/feather/feather/Telerik.Sitefinity.Frontend/assets/src/sass/html-field.sass */
+/* line 1, D:/Repositories/feather/Telerik.Sitefinity.Frontend/assets/src/sass/html-field.sass */
 body[contenteditable="true"] {
   padding: 20px;
   box-sizing: border-box;

diff --git a/Telerik.Sitefinity.Frontend/assets/dist/css/sitefinity-backend.css b/Telerik.Sitefinity.Frontend/assets/dist/css/sitefinity-backend.css
diff --git a/Telerik.Sitefinity.Frontend/assets/dist/css/sitefinity-backend.min.css b/Telerik.Sitefinity.Frontend/assets/dist/css/sitefinity-backend.min.css
diff --git a/Telerik.Sitefinity.Frontend/assets/src/sass/icons/_icons.sass b/Telerik.Sitefinity.Frontend/assets/src/sass/icons/_icons.sass
@@ -41,6 +41,10 @@
 .icon-draft-single
   color: #596C9B
 
+.icon-txt-pdf
+  background-color: #ff4848
+  color: #fff
+
 
 // Icon with text
 .icon--text:before
@@ -60,3 +64,42 @@
 .icon-no-image
   font-size: 70px
   color: #ddd
+
+.icon-txt
+  position: relative
+  display: inline-block
+
+  &.icon-file
+    color: #999
+
+  [class^="icon-txt-"]
+    position: absolute
+    top: 45%
+    right: -11%
+    padding:0 0.4em
+    line-height: 1.6em
+    height: 1.6em
+    font-size: 0.25em
+    font-style: normal
+    font-weight: bold
+    text-transform: uppercase
+    background-color: #333
+    color: #fff
+
+  .icon-txt-xlsx
+    background-color: #38ab63
+
+  .icon-txt-doc,
+  .icon-txt-docx
+    background-color: #1a8cff
+
+  .icon-txt-ppt,
+  .icon-txt-pptx
+    background-color: #ed8527
+
+  .icon-txt-pdf
+    background-color: #ff4848
+
+  .icon-txt-zip
+    background-color: #596c9b
+
diff --git a/Telerik.Sitefinity.Frontend/assets/src/sass/modules/_sf-media-selector.sass b/Telerik.Sitefinity.Frontend/assets/src/sass/modules/_sf-media-selector.sass
@@ -270,9 +270,20 @@
 	img
 		max-width: 100%
 
+	h4
+		@include text-overflow()
+
 .sf-Media--info-image
 	border: 1px solid #ccc
 
+.sf-Media--info-doc
+	border: 1px solid #ccc
+	height: 160px
+	line-height: 160px
+	background-color: #fff
+
+	.icon-txt
+		font-size: 48px
 
 // Nav styles for sidebar links
 // Should be moved to another .sass file
@@ -299,4 +310,42 @@
 		&:hover
 			background-color: #bdbdbd
 
+//Document selector
+.Media-file--doc
+	border: 1px solid #d7d7d7
+
+	&.is-selected
+		.icon-file
+			.is-list &
+				color: #fff
+
+	.Media-file-wrapper
+		border: 10px solid transparent
 
+	.Media-file-thumb-holder
+		background: #fff
+
+		.is-list &
+			border: 0
+			background: transparent
+
+		.Media-item-title
+			display: inline-block
+			width: auto
+			color: #000
+			width: 130px
+			overflow: hidden
+			text-overflow: ellipsis
+			white-space: nowrap
+
+			.is-list &
+				display: none
+
+	.icon-txt
+		font-size: 48px
+
+		.is-list &
+			font-size: 38px
+
+	.icon-file
+		color: #999
diff --git a/...ty.Frontend/client-components/fields/html-field/sf-document-properties-content-block.html b/...ty.Frontend/client-components/fields/html-field/sf-document-properties-content-block.html
@@ -28,12 +28,10 @@ <h3 class="modal-title">Insert a document link</h3>
         </div>
 
         <expander expander-title='More options'>
-            <div class="row">
-                <div class="col-xs-9">
-                    <label>CSS classes</label>
-                    <input class="form-control" type="text" ng-model="model.cssClass" />
-                </div>
-            </div>
+
+            <label>CSS classes</label>
+            <input class="form-control" type="text" ng-model="model.cssClass" />
+
         </expander>
     </form>
 </div>

diff --git a/Telerik.Sitefinity.Frontend/client-components/fields/media-field/sf-media-field.html b/Telerik.Sitefinity.Frontend/client-components/fields/media-field/sf-media-field.html
@@ -1,15 +1,18 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-md-5 text-center">
-            <div class="sf-Media--info-image">
-                <img ng-src="{{sfMedia.ThumbnailUrl}}" src="" alt="{{sfMedia.Title.Value}}" />
+            <div class="sf-Media--info-doc">
+
+                <i class="icon-file icon-txt">
+                    <span class="icon-txt-{{sfMedia.Extension.substring(1).toLowerCase()}}">{{sfMedia.Extension}}</span>
+                </i>
             </div>
         </div>
 
         <div class="col-md-7">
             <p>
                 <h4>
-                    <a ng-href="{{sfMedia.MediaUrl}}" target="_blank">{{sfMedia.Title.Value}}</a>
+                    <a title="{{sfMedia.Title.Value}}" ng-href="{{sfMedia.MediaUrl}}" target="_blank">{{sfMedia.Title.Value}}</a>
                 </h4>
 
                 <strong>Type: </strong>

diff --git a/Telerik.Sitefinity.Frontend/client-components/selectors/common/sf-provider-selector.js b/Telerik.Sitefinity.Frontend/client-components/selectors/common/sf-provider-selector.js
@@ -40,7 +40,7 @@
                         scope.isOpen = false;
                         scope.selectedProvider = provider;
                         if (provider) {
-                            ngModelCtrl.$setViewValue(provider.Name);
+                            ngModelCtrl.$setViewValue(provider);
                         }
                     };
 

diff --git a/...tefinity.Frontend/client-components/selectors/media/documents/sf-document-collection.html b/...tefinity.Frontend/client-components/selectors/media/documents/sf-document-collection.html
@@ -29,15 +29,15 @@
 				</div>
 
 				<div class="Media-item-meta">
-					<div>{{item.ImagesCount}}</div>
+					<div>{{item.DocumentsCount}}</div>
 					{{item.LibrariesCount}}
 				</div>
 			</div>
 		</div>
 	</div>
 
 	<div>
-		<div ng-repeat="item in items | filter: { IsFolder : false }" class="Media-file" ng-click="select(item)" ng-class="{'is-selected' : isSelected(item)}" sf-scroll-if-selected>
+		<div ng-repeat="item in items | filter: { IsFolder : false }" class="Media-file Media-file--doc" ng-click="select(item)" ng-class="{'is-selected' : isSelected(item)}" sf-scroll-if-selected>
 			<span class="Media-item-info"
 						sf-popover-html
 						sf-popover-placement="right"
@@ -61,9 +61,13 @@
 
 			<div class="Media-file-wrapper">
 
-				<div class="sf{{item.Extension.substring(1).toLowerCase()}} sfext">
-                    <!-- File extension icon -->
-                    {{item.Title}}
+				<div class="Media-file-thumb">
+                    <div class="Media-file-thumb-holder">
+                        <i class="icon-file icon-txt">
+                            <span class="icon-txt-{{item.Extension.substring(1).toLowerCase()}}">{{item.Extension.substring(1)}}</span>
+                        </i>
+                        <div class="Media-item-title">{{item.Title}}</div>
+                    </div>
 				</div>
 
 				<div class="Media-item-title">

diff --git a/...k.Sitefinity.Frontend/client-components/selectors/media/documents/sf-document-selector.js b/...k.Sitefinity.Frontend/client-components/selectors/media/documents/sf-document-selector.js
@@ -234,13 +234,14 @@
                                         };
 
                                         // Remove unnecessary (non-numeric) characters from LastModified string
-                                        for (var key in response.Items) {
-                                            var item = response.Items[key];
+                                        for (var i = 0; i < response.Items.length; i++) {
+                                            var item = response.Items[i];
                                             if (item.LastModified) {
                                                 item.LastModified = removeNonNumeric(item.LastModified);
                                             }
                                             if (item.DocumentsCount) {
-                                                item.DocumentsCount = removeNonNumeric(item.DocumentsCount) + (item.DocumentsCount == 1 ? " document" : " documents");
+                                                var countStr = removeNonNumeric(item.DocumentsCount);
+                                                item.DocumentsCount = countStr + (countStr === '1' ? " document" : " documents");
                                             } else {
                                                 item.DocumentsCount = "No documents";
                                             }