diff --git a/gui/app/pods/document/index/template.hbs b/gui/app/pods/document/index/template.hbs index 02d7398b..b6c8a276 100644 --- a/gui/app/pods/document/index/template.hbs +++ b/gui/app/pods/document/index/template.hbs @@ -70,6 +70,17 @@ + {{document/version-picker + roles=roles + pages=pages + space=folder + spaces=folders + document=document + versions=versions + permissions=permissions + contributionStatus=contributionStatus + approvalStatus=approvalStatus}} + {{document/document-meta tab=tab roles=roles @@ -82,22 +93,6 @@ contributionStatus=contributionStatus approvalStatus=approvalStatus}} - {{#if contributionStatus}} -
-
- {{contributionStatus}} -
-
- {{else}} - {{#if approvalStatus}} -
-
- {{approvalStatus}} -
-
- {{/if}} - {{/if}} -
diff --git a/gui/app/styles/core/view/document/meta.scss b/gui/app/styles/core/view/document/meta.scss index ad451efd..2aac0a9d 100644 --- a/gui/app/styles/core/view/document/meta.scss +++ b/gui/app/styles/core/view/document/meta.scss @@ -138,9 +138,9 @@ @extend .no-select; display: block; margin: 0; - font-size: 1.1rem; + font-size: 0.9rem; font-weight: 400; - color: map-get($yellow-shades, 700); + color: map-get($gray-shades, 700); } > .document-heading { diff --git a/gui/app/templates/components/document/document-meta.hbs b/gui/app/templates/components/document/document-meta.hbs index 94e5702d..20b90597 100644 --- a/gui/app/templates/components/document/document-meta.hbs +++ b/gui/app/templates/components/document/document-meta.hbs @@ -26,6 +26,18 @@
{{/if}} + {{#if contributionStatus}} +
+ {{contributionStatus}} +
+ {{else}} + {{#if approvalStatus}} +
+ {{approvalStatus}} +
+ {{/if}} + {{/if}} + {{#if document.template}}
Template diff --git a/gui/app/templates/components/document/document-toolbar.hbs b/gui/app/templates/components/document/document-toolbar.hbs index 0f583c4c..d19518e7 100644 --- a/gui/app/templates/components/document/document-toolbar.hbs +++ b/gui/app/templates/components/document/document-toolbar.hbs @@ -50,7 +50,7 @@ {{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}