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

Commit

Permalink
Merge pull request #279 from RandyInVictoria/collections
Browse files Browse the repository at this point in the history 
EPIC-1185 Collections: Show uploaded doc date field in Link Documents…
  • Loading branch information
@marklise
marklise authored Oct 6, 2017
2 parents 5b09707 + 4664234 commit 2482ceb
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 21 deletions.
24 changes: 14 additions & 10 deletions modules/core/client/scss/components/file-browser.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -517,7 +517,7 @@ a.icon-btn {
}
}


.col {
&.first-col {
padding-left: 1.5rem;
Expand Down Expand Up @@ -561,7 +561,7 @@ a.icon-btn {
}
}

@media only screen
@media only screen
and (max-device-width: 1024px) {
.fb-list {
.fb-col-group {
Expand All @@ -583,7 +583,7 @@ span.avatar {

.col {
&.author-col {
@include flex(0 0 18%);
@include flex(0 0 18%);
}

&.name-col {
Expand Down Expand Up @@ -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%);
}
Expand Down Expand Up @@ -653,7 +657,7 @@ span.avatar {
right: 0;
bottom: 0;
left: 0;
margin: 0;
margin: 0;
width: 100%;
height: 100%;
}
Expand Down Expand Up @@ -1106,4 +1110,4 @@ $fb-upload-target-border: 2px dashed #BBB;
background: transparent;
}
}
}
}
23 changes: 12 additions & 11 deletions modules/documents/client/views/document-manager-link.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -150,4 +151,4 @@
</ul>
</div>
</div>
</section><!-- / Linked Files Section -->
</section><!-- / Linked Files Section -->

0 comments on commit 2482ceb

Please sign in to comment.