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

Move revisions to new ui framework

Browse source
This commit is contained in:
sauls8t 2018-12-20 13:05:22 +00:00
parent 2042454e77
commit 3c81297fc6
19 changed files with 288 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,5 @@
<div class="no-print">
{{#ui/ui-toolbar dark=false light=true raised=true large=true bordered=true}}
{{ui/ui-toolbar-icon icon=constants.Icon.Print color=constants.Color.Gray
tooltip="Print" onClick=(action "onPrintDocument")}}
{{ui/ui-toolbar-icon icon=constants.Icon.Download color=constants.Color.Gray
tooltip="Export as complete HTML file" onClick=(action "onExport")}}
{{#if pinState.isPinned}}
{{ui/ui-toolbar-icon icon=constants.Icon.BookmarkDelete color=constants.Color.Yellow
tooltip="Remove from bookmarks" onClick=(action "onUnpin")}}
@ -19,6 +13,17 @@
tooltip="Save as template" onClick=(action "onShowTemplateModal")}}
{{/if}}
{{#if showRevisions}}
{{ui/ui-toolbar-icon icon=constants.Icon.TimeBack color=constants.Color.Gray
tooltip="Revisions and rollback" linkTo="document.revisions"}}
{{/if}}
{{ui/ui-toolbar-icon icon=constants.Icon.Download color=constants.Color.Gray
tooltip="Download as HTML file" onClick=(action "onExport")}}
{{ui/ui-toolbar-icon icon=constants.Icon.Print color=constants.Color.Gray
tooltip="Print" onClick=(action "onPrintDocument")}}
{{#if permissions.documentDelete}}
{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Gray
tooltip="Delete" onClick=(action "onShowDeleteModal")}}
@ -50,8 +55,8 @@
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" onclick={{action "onSaveTemplate"}}>Save</button>
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button color=constants.Color.Green light=true label=constants.Label.Delete onClick=(action "onSaveTemplate")}}
</div>
</div>
</div>
@ -65,8 +70,8 @@
<p>Are you sure you want to delete this document?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-danger" onclick={{action "onDocumentDelete"}}>Delete</button>
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button color=constants.Color.Red light=true label=constants.Label.Delete onClick=(action "onDocumentDelete")}}
</div>
</div>
</div>

24
gui/app/templates/components/document/view-content.hbs
View file

@ -39,23 +39,21 @@
{{/if}}
{{#if showLikes}}
<div class=" d-flex justify-content-center no-print">
<div class="vote-box">
{{#unless voteThanks}}
<div class="prompt">
{{folder.likes}}
</div>
<div class="vote-box no-print">
{{#if voteThanks}}
<div class="thanks">Thanks for the feedback!</div>
{{else}}
<div class="prompt">{{folder.likes}}</div>
{{ui/ui-spacer size=200}}
<div class="buttons">
<button type="button" class="btn btn-outline-success bold-700" {{action "onVote" 1}}>Yes, thanks!</button>&nbsp;&nbsp;
<button type="button" class="btn btn-outline-secondary bold-700" {{action "onVote" 2}}>Not really</button>
{{ui/ui-button color=constants.Color.Yellow light=true label="Yes, thanks!" onClick=(action "onVote" 1)}}
{{ui/ui-button-gap}}
{{ui/ui-button color=constants.Color.Yellow light=true label="Not really" onClick=(action "onVote" 2)}}
</div>
{{else}}
<div class="ack">Thanks for the feedback!</div>
{{/unless}}
</div>
{{/if}}
</div>
{{/if}}
{{else }}
{{else}}
{{#if canEdit}}
<div class="start-section">
<i class="dicon {{constants.Icon.Plus}}" {{action "onShowSectionWizard"}}>

52
gui/app/templates/components/document/view-revision.hbs
View file

@ -1,37 +1,23 @@
<div class="mt-5">
{{#unless hasRevisions}}
<p>No revisions made</p>
{{else}}
<div class="row">
<div class="col-12">
<div class="form-group">
{{ui/ui-select tagName="span" class="revision-picker" content=revisions action=(action "onSelectRevision") optionValuePath="id" optionLabelPath="label"}}
</div>
</div>
{{#unless revisions}}
<p>No revisions made</p>
{{/unless}}
<div class="view-revision">
{{#if hasDiff}}
<h1>{{revision.title}}</h1>
<h2>Changed by {{revision.firstname}} {{revision.lastname}}</h2>
{{ui/ui-spacer size=200}}
<div class="diff-zone wysiwyg">
{{{diff}}}
</div>
<div class="row">
<div class="col-12 view-revision">
<div class="diff-zone">
{{#if hasDiff}}
<div class="wysiwyg">
{{{diff}}}
</div>
{{/if}}
</div>
</div>
</div>
{{#if canRollback}}
<div class="row">
<div class="col-12">
<div class="form-group">
<div id="restore-history-button" class="btn btn-danger" data-toggle="modal" data-target="#document-rollback-modal" data-backdrop="static">Restore to this version</div>
</div>
</div>
</div>
{{/if}}
{{/unless}}
{{/if}}
</div>
{{#if canRollback}}
{{ui/ui-spacer size=400}}
{{ui/ui-button color=constants.Color.Red icon=constants.Icon.TimeBack light=true label=constants.Label.Restore onClick=(action "onShowModal")}}
{{/if}}
<div id="document-rollback-modal" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
@ -40,8 +26,8 @@
<p>Are you sure you want to restore this revision?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-success" onclick={{action "onRollback"}}>Restore</button>
{{ui/ui-button color=constants.Color.Gray light=true label=constants.Label.Cancel dismiss=true}}
{{ui/ui-button color=constants.Color.Red light=true label=constants.Label.Restore onClick=(action "onRollback")}}
</div>
</div>
</div>