From 466423407eebc37359093ba640c1d833548778be Mon Sep 17 00:00:00 2001
From: Randy Posynick <randy.posynick@gmail.com>
Date: Fri, 6 Oct 2017 11:23:51 -0700
Subject: [PATCH] EPIC-1185 Collections: Show uploaded doc date field in Link
 Documents modal

---
 .../client/scss/components/file-browser.scss  | 24 +++++++++++--------
 .../client/views/document-manager-link.html   | 23 +++++++++---------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/modules/core/client/scss/components/file-browser.scss b/modules/core/client/scss/components/file-browser.scss
index fe6b77f24..84bf441ad 100644
--- a/modules/core/client/scss/components/file-browser.scss
+++ b/modules/core/client/scss/components/file-browser.scss
@@ -121,7 +121,7 @@ a.icon-btn {
   .fb-path:first-child:nth-last-child(#{$i}),
   .fb-path:first-child:nth-last-child(#{$i}) ~ .fb-path:not(:last-child) {
     max-width: 15rem; }
- } 
+ }
 
 .file-browser {
     @include flexbox();
@@ -314,7 +314,7 @@ a.icon-btn {
 
     .fb-list-item {
         @include flexbox();
-        @include flexdirection(row); 
+        @include flexdirection(row);
         border-bottom: $file-browser-row-border;
 
         .row-actions {
@@ -401,7 +401,7 @@ a.icon-btn {
                 height: 0;
                 border-style: solid;
                 border-width: 5px 5px 0 5px;
-                border-color: #494949 transparent transparent transparent; 
+                border-color: #494949 transparent transparent transparent;
                 vertical-align: middle;
             }
 
@@ -442,9 +442,9 @@ a.icon-btn {
         }
     }
 
-    @media only screen 
+    @media only screen
         and (max-device-width: 1024px) {
-        
+
         .scroll-container {
             .scroll-container-inner {
                 margin-right: 0;
@@ -517,7 +517,7 @@ a.icon-btn {
         }
     }
 
-    
+
     .col {
         &.first-col {
             padding-left: 1.5rem;
@@ -561,7 +561,7 @@ a.icon-btn {
     }
 }
 
-@media only screen 
+@media only screen
     and (max-device-width: 1024px) {
     .fb-list {
         .fb-col-group {
@@ -583,7 +583,7 @@ span.avatar {
 
 .col {
     &.author-col {
-        @include flex(0 0 18%); 
+        @include flex(0 0 18%);
     }
 
     &.name-col {
@@ -620,6 +620,10 @@ span.avatar {
     @include flex(0 0 13%)
 }
 
+.col.date-col {
+    @include flex(0 0 13%);
+}
+
 .col.status-col {
     @include flex(0 0 26%);
 }
@@ -653,7 +657,7 @@ span.avatar {
         right: 0;
         bottom: 0;
         left: 0;
-        margin: 0; 
+        margin: 0;
         width: 100%;
         height: 100%;
     }
@@ -1106,4 +1110,4 @@ $fb-upload-target-border: 2px dashed #BBB;
             background: transparent;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/documents/client/views/document-manager-link.html b/modules/documents/client/views/document-manager-link.html
index b1e06dc10..e38b0644f 100644
--- a/modules/documents/client/views/document-manager-link.html
+++ b/modules/documents/client/views/document-manager-link.html
@@ -4,11 +4,11 @@
         <label>Select one or more files to link to this content</label>
         <div class="fb-header">
             <div class="fb-header-path">
-                <div class="fb-path" 
-					ng-class="{'root':node.model.name == 'ROOT'}" 
+                <div class="fb-path"
+					ng-class="{'root':node.model.name == 'ROOT'}"
 					ng-repeat="node in documentMgr.currentPath">
 					<span class="fb-path-arrow" ng-if="node.model.name != 'ROOT'">&rsaquo;</span>
-					<button class="btn icon-btn" title="{{ node.model.name }}" 
+					<button class="btn icon-btn" title="{{ node.model.name }}"
 						ng-click="documentMgr.selectNode(node.model.id)">
 						<i class="glyphicon glyphicon glyphicon-home" ng-if="node.model.name == 'ROOT'"></i>
 						<span class="btn-txt" ng-if="node.model.name != 'ROOT'">{{ node.model.name }}</span>
@@ -26,7 +26,7 @@
                 <div class="spinner-container" ng-show="documentMgr.busy">
 			        <div class="spinner-new rotating"></div>
                 </div>
-                
+
                 <!-- Column Header -->
                 <div class="column-header">
                     <span class="col checkbox-col" ng-if="authentication.user">
@@ -41,9 +41,9 @@
                             <span>Name</span>
                             <span class="sort-icon" ng-show="documentMgr.sorting.column === 'name'"></span>
                         </div>
-                        <div class="col type-col sortable" ng-class="{'descending': !documentMgr.sorting.ascending}" ng-click="documentMgr.sortBy('type')">
-                            <span>Type</span>
-                            <span class="sort-icon" ng-show="documentMgr.sorting.column === 'type'"></span>
+                        <div class="col date-col sortable" ng-class="{'descending': !documentMgr.sorting.ascending}" ng-click="documentMgr.sortBy('date')">
+                            <span>Uploaded</span>
+                            <span class="sort-icon" ng-show="documentMgr.sorting.column === 'date'"></span>
                         </div>
                         <div class="col size-col sortable" ng-class="{'descending': !documentMgr.sorting.ascending}" ng-click="documentMgr.sortBy('size')">
                             <span>Size</span>
@@ -76,7 +76,7 @@
                                             {{ doc.model.name }}
                                         </span>
                                     </span>
-                                    <span class="col type-col">---</span>
+                                    <span class="col date-col">---</span>
                                     <span class="col size-col">---</span>
                                     <span class="col status-col last-col" ng-if="authentication.user && publishedOnly !== 'true'">---</span>
                                     <div class="row-actions"></div>
@@ -102,10 +102,11 @@
                                             {{ doc.displayName | removeExtension }}
                                         </span>
                                     </span>
-                                    <span class="col type-col">{{ doc.internalExt}}</span>
+                                    <span class="col date-col">{{ doc.dateUploaded | date }}</span>
                                     <span class="col size-col">{{ doc.internalSize | bytes:2 }}</span>
                                     <span class="col status-col last-col" ng-if="authentication.user && publishedOnly !== 'true'">
-                                        <span ng-if="doc.isPublished" title="Published"><span class="glyphicon glyphicon-ok-circle"></span></span>
+                                        <span class="label label-success" ng-if="doc.isPublished == true">PUBLISHED</span>
+                                        <span class="label label-unpublished" ng-if="doc.isPublished == false">UNPUBLISHED</span>
                                     </span>
                                 </span>
                             </li>
@@ -150,4 +151,4 @@
             </ul>
         </div>
     </div>
-</section><!-- / Linked Files Section -->
\ No newline at end of file
+</section><!-- / Linked Files Section -->