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

Epic 1117 2 #192

Merged
merged 1 commit into from
Jul 5, 2017
Merged

Epic 1117 2 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/core/client/scss/components/file-browser.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ a.icon-btn {

span.name {
width: 15rem;
min-width: 15rem;
}

span.value {
Expand Down
1 change: 1 addition & 0 deletions modules/core/client/scss/core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4387,6 +4387,7 @@ tmpl-template-render {
@import "modules/core/client/scss/components/file-browser.scss";
@import "modules/core/client/scss/components/panel.scss";
@import "modules/core/client/scss/components/misc.scss";
@import "modules/core/client/scss/components/pdf-viewer.scss";
@import "modules/core/client/scss/components/recipient-manager.scss";
@import "modules/core/client/scss/components/spinner.scss";
@import "modules/core/client/scss/components/table.scss";
Expand Down
8 changes: 4 additions & 4 deletions modules/core/client/views/dialogs/confirm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<h3 class="modal-title">{{confirmDlg.titleText}}</h3>
</div>

<div class="modal-body" ng-if="confirmDlg.warnText">
{{confirmDlg.warnText}}
</div>

<div ng-show="confirmDlg.errorMsg">{{confirmDlg.errorMsg}}</div>

<div class="modal-body">
<div class="alert alert-warning" ng-if="confirmDlg.warnText">
{{confirmDlg.warnText}}
</div>

{{confirmDlg.confirmText}}
<ul class="confirm-list">
<li ng-repeat="t in confirmDlg.confirmItems">{{t.value}}</li>
Expand Down
2 changes: 1 addition & 1 deletion modules/documents/client/directives/documents.manager.directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ angular.module('documents')
self.currentPath = pathArray || [];
// path is published IFF all nodes are not unpublished. This find returns first unpublished element.
self.currentPathIsPublished = (undefined === _.find(self.currentPath, function(p) { return ! p.model.published; }));
self.currentPathIsPublishedWarning = self.currentPathIsPublished ? null : "Warning. You will need to publish all parent folders to fully publish these document(s).";
self.currentPathIsPublishedWarning = self.currentPathIsPublished ? null : "You will need to publish all parent folders to fully publish these document(s).";

//$log.debug('currentNode (' + self.currentNode.model.name + ') get documents...');
DocumentMgrService.getDirectoryDocuments($scope.project, self.currentNode.model.id)
Expand Down
22 changes: 7 additions & 15 deletions modules/documents/client/views/document-manager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<span class="col date-added-col">---</span>
<span class="col status-col last-col" ng-if="authentication.user">
<span class="label label-success" ng-if="doc.model.published" title="Published">Published</span>
<span class="label label-unpublished" ng-if="!doc.model.published">Unpublished</span>
<span class="label label-unpublished" ng-if="!doc.model.published" title="Unpublished">Unpublished</span>
</span>
<div class="row-actions">

Expand Down Expand Up @@ -267,7 +267,7 @@
<span class="col status-col last-col" ng-if="authentication.user">
<span class="label label-success" ng-if="doc.isPublished && documentMgr.currentPathIsPublished" title="Published">Published</span>
<span class="label label-unpublished" ng-if="doc.isPublished && !documentMgr.currentPathIsPublished" title="Published">Published</span>
<span class="label label-unpublished" ng-if="!doc.isPublished">Unpublished</span>
<span class="label label-unpublished" ng-if="!doc.isPublished" title="Unpublished">Unpublished</span>
</span>
<div class="row-actions">

Expand Down Expand Up @@ -296,8 +296,7 @@
data-clipboard-text="{{ doc.link }}"
data-doc-name="{{ doc.displayName }}"
ngclipboard-success="copyClipboardSuccess(e);"
ngclipboard-error="copyClipboardError(e);"
>
ngclipboard-error="copyClipboardError(e);">
<span class="glyphicon glyphicon-copy"></span>
</button>
</li>
Expand Down Expand Up @@ -389,20 +388,14 @@ <h2 title="{{documentMgr.infoPanel.data.displayName | removeExtension}}">{{docum
data-doc-name="documentMgr.infoPanel.data.displayName"
data-clipboard-text="{{ documentMgr.infoPanel.data.link }}"
ngclipboard-success="copyClipboardSuccess(e);"
ngclipboard-error="copyClipboardError(e);"
>
ngclipboard-error="copyClipboardError(e);">
<span class="glyphicon glyphicon-copy"></span>
</button>
<a ng-if="documentMgr.infoPanel.data.userCan.read"
class="btn btn-sm btn-default"
href="/api/document/{{ documentMgr.infoPanel.data._id }}/fetch"
target="_blank"
title="Download File"><span class="glyphicon glyphicon-download-alt"></span></a>
<button ng-if="documentMgr.infoPanel.data.userCan.read && documentMgr.infoPanel.data.internalMime === 'application/pdf'"
x-modal-pdf-viewer
x-pdfobject="documentMgr.infoPanel.data"
title="View File"
class="btn btn-sm btn-default">View</button>
<button class="btn btn-sm btn-default" ng-if="documentMgr.infoPanel.data.userCan.write"
x-document-mgr-edit
x-project="project"
Expand Down Expand Up @@ -472,9 +465,9 @@ <h3>Properties</h3>
<li ng-if="authentication.user">
<span class="name">Status:</span>
<span class="value">
<span class="label label-success" ng-if="documentMgr.infoPanel.data.isPublished && documentMgr.currentPathIsPublished">Published</span>
<span class="label label-unpublished" ng-if="documentMgr.infoPanel.data.isPublished && !documentMgr.currentPathIsPublished">Published</span>
<span class="label label-unpublished" ng-if="!documentMgr.infoPanel.data.isPublished">Unpublished</span>
<span class="label label-success" ng-if="documentMgr.infoPanel.data.isPublished && documentMgr.currentPathIsPublished" title="Published">Published</span>
<span class="label label-unpublished" ng-if="documentMgr.infoPanel.data.isPublished && !documentMgr.currentPathIsPublished" title="Published">Published</span>
<span class="label label-unpublished" ng-if="!documentMgr.infoPanel.data.isPublished" title="Unpublished">Unpublished</span>
</span>
</li>
<li>
Expand Down Expand Up @@ -509,7 +502,6 @@ <h3>Properties</h3>
<span class="name">Follow up:</span>
<span class="value">{{ documentMgr.infoPanel.data.inspectionReport.followup }}</span>
</li>

</ul>
</section>

Expand Down