Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00
Code Releases Activity

Sync doc meta layout with Enterprise edition

Browse source
This commit is contained in:
McMatts 2019-05-29 14:58:00 +01:00
parent 1e1cbdd843
commit ca4a9a74ee
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gui/app/pods/document/index/template.hbs
View file

@ -70,6 +70,17 @@
</Layout::Grid::Sidebar>
<Layout::Grid::Content>
{{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}}
<div class="document-meta">
<div class="label-workflow-status">
{{contributionStatus}}
</div>
</div>
{{else}}
{{#if approvalStatus}}
<div class="document-meta">
<div class="label-workflow-status">
{{approvalStatus}}
</div>
</div>
{{/if}}
{{/if}}
<Ui::UiSpacer @size="300" />
<div class="document-meta {{if permissions.documentEdit "cursor-pointer"}}" {{action "onEditMeta"}}>

4
gui/app/styles/core/view/document/meta.scss
View file

@ -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 {

12
gui/app/templates/components/document/document-meta.hbs
View file

@ -26,6 +26,18 @@
</div>
{{/if}}
{{#if contributionStatus}}
<div class="label-workflow-status">
{{contributionStatus}}
</div>
{{else}}
{{#if approvalStatus}}
<div class="label-workflow-status">
{{approvalStatus}}
</div>
{{/if}}
{{/if}}
{{#if document.template}}
<div class="label-template">
Template

2
gui/app/templates/components/document/document-toolbar.hbs
View file

@ -50,7 +50,7 @@
{{#attach-popover class="ember-attacher-popper" hideOn="click clickout" showOn="click" isShown=false}}
<ul class="menu">
{{#if showActivity}}
{{#link-to "document.activity" class="item"}}Activity summary{{/link-to}}
{{#link-to "document.activity" class="item"}}Activity{{/link-to}}
{{/if}}
{{#if showRevisions}}
{{#link-to "document.revisions" class="item"}}Revisions{{/link-to}}