Skip to content
This repository was archived by the owner on Jan 7, 2020. It is now read-only.

Commit 2482ceb

Browse files
marklisemarklise
authored
Merge pull request #279 from RandyInVictoria/collections
EPIC-1185 Collections: Show uploaded doc date field in Link Documents…
2 parents 5b09707 + 4664234 commit 2482ceb

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

‎modules/core/client/scss/components/file-browser.scss‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ a.icon-btn {
121121
.fb-path:first-child:nth-last-child(#{$i}),
122122
.fb-path:first-child:nth-last-child(#{$i}) ~ .fb-path:not(:last-child) {
123123
max-width: 15rem; }
124-
}
124+
}
125125

126126
.file-browser {
127127
@include flexbox();
@@ -314,7 +314,7 @@ a.icon-btn {
314314

315315
.fb-list-item {
316316
@include flexbox();
317-
@include flexdirection(row);
317+
@include flexdirection(row);
318318
border-bottom: $file-browser-row-border;
319319

320320
.row-actions {
@@ -401,7 +401,7 @@ a.icon-btn {
401401
height: 0;
402402
border-style: solid;
403403
border-width: 5px 5px 0 5px;
404-
border-color: #494949 transparent transparent transparent;
404+
border-color: #494949 transparent transparent transparent;
405405
vertical-align: middle;
406406
}
407407

@@ -442,9 +442,9 @@ a.icon-btn {
442442
}
443443
}
444444

445-
@media only screen
445+
@media only screen
446446
and (max-device-width: 1024px) {
447-
447+
448448
.scroll-container {
449449
.scroll-container-inner {
450450
margin-right: 0;
@@ -517,7 +517,7 @@ a.icon-btn {
517517
}
518518
}
519519

520-
520+
521521
.col {
522522
&.first-col {
523523
padding-left: 1.5rem;
@@ -561,7 +561,7 @@ a.icon-btn {
561561
}
562562
}
563563

564-
@media only screen
564+
@media only screen
565565
and (max-device-width: 1024px) {
566566
.fb-list {
567567
.fb-col-group {
@@ -583,7 +583,7 @@ span.avatar {
583583

584584
.col {
585585
&.author-col {
586-
@include flex(0 0 18%);
586+
@include flex(0 0 18%);
587587
}
588588

589589
&.name-col {
@@ -620,6 +620,10 @@ span.avatar {
620620
@include flex(0 0 13%)
621621
}
622622

623+
.col.date-col {
624+
@include flex(0 0 13%);
625+
}
626+
623627
.col.status-col {
624628
@include flex(0 0 26%);
625629
}
@@ -653,7 +657,7 @@ span.avatar {
653657
right: 0;
654658
bottom: 0;
655659
left: 0;
656-
margin: 0;
660+
margin: 0;
657661
width: 100%;
658662
height: 100%;
659663
}
@@ -1106,4 +1110,4 @@ $fb-upload-target-border: 2px dashed #BBB;
11061110
background: transparent;
11071111
}
11081112
}
1109-
}
1113+
}

‎modules/documents/client/views/document-manager-link.html‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<label>Select one or more files to link to this content</label>
55
<div class="fb-header">
66
<div class="fb-header-path">
7-
<div class="fb-path"
8-
ng-class="{'root':node.model.name == 'ROOT'}"
7+
<div class="fb-path"
8+
ng-class="{'root':node.model.name == 'ROOT'}"
99
ng-repeat="node in documentMgr.currentPath">
1010
<span class="fb-path-arrow" ng-if="node.model.name != 'ROOT'">&rsaquo;</span>
11-
<button class="btn icon-btn" title="{{ node.model.name }}"
11+
<button class="btn icon-btn" title="{{ node.model.name }}"
1212
ng-click="documentMgr.selectNode(node.model.id)">
1313
<i class="glyphicon glyphicon glyphicon-home" ng-if="node.model.name == 'ROOT'"></i>
1414
<span class="btn-txt" ng-if="node.model.name != 'ROOT'">{{ node.model.name }}</span>
@@ -26,7 +26,7 @@
2626
<div class="spinner-container" ng-show="documentMgr.busy">
2727
<div class="spinner-new rotating"></div>
2828
</div>
29-
29+
3030
<!-- Column Header -->
3131
<div class="column-header">
3232
<span class="col checkbox-col" ng-if="authentication.user">
@@ -41,9 +41,9 @@
4141
<span>Name</span>
4242
<span class="sort-icon" ng-show="documentMgr.sorting.column === 'name'"></span>
4343
</div>
44-
<div class="col type-col sortable" ng-class="{'descending': !documentMgr.sorting.ascending}" ng-click="documentMgr.sortBy('type')">
45-
<span>Type</span>
46-
<span class="sort-icon" ng-show="documentMgr.sorting.column === 'type'"></span>
44+
<div class="col date-col sortable" ng-class="{'descending': !documentMgr.sorting.ascending}" ng-click="documentMgr.sortBy('date')">
45+
<span>Uploaded</span>
46+
<span class="sort-icon" ng-show="documentMgr.sorting.column === 'date'"></span>
4747
</div>
4848
<div class="col size-col sortable" ng-class="{'descending': !documentMgr.sorting.ascending}" ng-click="documentMgr.sortBy('size')">
4949
<span>Size</span>
@@ -76,7 +76,7 @@
7676
{{ doc.model.name }}
7777
</span>
7878
</span>
79-
<span class="col type-col">---</span>
79+
<span class="col date-col">---</span>
8080
<span class="col size-col">---</span>
8181
<span class="col status-col last-col" ng-if="authentication.user && publishedOnly !== 'true'">---</span>
8282
<div class="row-actions"></div>
@@ -102,10 +102,11 @@
102102
{{ doc.displayName | removeExtension }}
103103
</span>
104104
</span>
105-
<span class="col type-col">{{ doc.internalExt}}</span>
105+
<span class="col date-col">{{ doc.dateUploaded | date }}</span>
106106
<span class="col size-col">{{ doc.internalSize | bytes:2 }}</span>
107107
<span class="col status-col last-col" ng-if="authentication.user && publishedOnly !== 'true'">
108-
<span ng-if="doc.isPublished" title="Published"><span class="glyphicon glyphicon-ok-circle"></span></span>
108+
<span class="label label-success" ng-if="doc.isPublished == true">PUBLISHED</span>
109+
<span class="label label-unpublished" ng-if="doc.isPublished == false">UNPUBLISHED</span>
109110
</span>
110111
</span>
111112
</li>
@@ -150,4 +151,4 @@
150151
</ul>
151152
</div>
152153
</div>
153-
</section><!-- / Linked Files Section -->
154+
</section><!-- / Linked Files Section -->

0 commit comments

Comments
 (0)