mirror of
https://github.com/documize/community.git
synced 2025-08-02 20:15:26 +02:00
Streamline document meta view and editing experience
Meta data: 1. Condensed layout. 2. Unified editing. Co-Authored-By: Saul S <sauls8t@users.noreply.github.com>
This commit is contained in:
McMatts
parent
f70d4b33a3
commit
27fde0dac8
26 changed files with 2389 additions and 1956 deletions
|
|
@ -11,6 +11,7 @@
|
|||
|
||||
import { Promise as EmberPromise } from 'rsvp';
|
||||
import { inject as service } from '@ember/service';
|
||||
import { computed } from '@ember/object';
|
||||
import Tooltips from '../../../mixins/tooltip';
|
||||
import Notifier from '../../../mixins/notifier';
|
||||
import Controller from '@ember/controller';
|
||||
|
|
@ -22,6 +23,12 @@ export default Controller.extend(Tooltips, Notifier, {
|
|||
linkService: service('link'),
|
||||
tab: 'content',
|
||||
queryParams: ['currentPageId'],
|
||||
showRevisions: computed('permissions', 'document.protection', function() {
|
||||
if (this.get('document.protection') === this.get('constants').ProtectionType.None) return true;
|
||||
if (this.get('document.protection') === this.get('constants').ProtectionType.Review && this.get('permissions.documentApprove')) return true;
|
||||
|
||||
return false;
|
||||
}),
|
||||
|
||||
actions: {
|
||||
onTabChange(tab) {
|
||||
|
|
@ -229,7 +236,7 @@ export default Controller.extend(Tooltips, Notifier, {
|
|||
});
|
||||
},
|
||||
|
||||
refresh() {
|
||||
refresh(reloadPage) {
|
||||
return new EmberPromise((resolve) => {
|
||||
this.get('documentService').fetchDocumentData(this.get('document.id')).then((data) => {
|
||||
this.set('document', data.document);
|
||||
|
|
@ -247,7 +254,11 @@ export default Controller.extend(Tooltips, Notifier, {
|
|||
this.set('blocks', data);
|
||||
});
|
||||
|
||||
if (reloadPage) {
|
||||
window.location.reload();
|
||||
} else {
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -32,16 +32,24 @@
|
|||
<ul class="tabnav-control">
|
||||
<li class="tab {{if (eq tab 'content') 'selected'}}" {{action 'onTabChange' 'content'}}>Content</li>
|
||||
{{#if session.authenticated}}
|
||||
<li class="tab {{if (eq tab 'revision') 'selected'}}" {{action 'onTabChange' 'revision'}}>Revisions</li>
|
||||
{{#if showRevisions}}
|
||||
<li class="tab {{if (eq tab 'revision') 'selected'}}" {{action 'onTabChange' 'revision'}}>Revisions</li>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
{{document/document-heading
|
||||
document=document
|
||||
versions=versions
|
||||
permissions=permissions
|
||||
onSaveDocument=(action 'onSaveDocument')}}
|
||||
<div class="view-document">
|
||||
<div class="document-heading">
|
||||
<h1 class="doc-title">
|
||||
{{#if document.template}}
|
||||
<span class="bg-warning p-1 pr-2 pl-2">Template</span>
|
||||
{{/if}}
|
||||
{{document.name}}
|
||||
</h1>
|
||||
<div class="doc-excerpt">{{document.excerpt}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{document/document-meta
|
||||
pages=pages
|
||||
|
|
@ -76,12 +84,14 @@
|
|||
{{/if}}
|
||||
|
||||
{{#if (eq tab 'revision')}}
|
||||
{{document/view-revision
|
||||
pages=pages
|
||||
folder=folder
|
||||
document=document
|
||||
permissions=permissions
|
||||
onRollback=(action 'onRollback')}}
|
||||
{{#if showRevisions}}
|
||||
{{document/view-revision
|
||||
pages=pages
|
||||
folder=folder
|
||||
document=document
|
||||
permissions=permissions
|
||||
onRollback=(action 'onRollback')}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{/layout/middle-zone-content}}
|
||||
|
|
|
|||
42
gui/app/pods/document/settings/controller.js
Normal file
42
gui/app/pods/document/settings/controller.js
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
|
||||
//
|
||||
// This software (Documize Community Edition) is licensed under
|
||||
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
|
||||
//
|
||||
// You can operate outside the AGPL restrictions by purchasing
|
||||
// Documize Enterprise Edition and obtaining a commercial license
|
||||
// by contacting <sales@documize.com>.
|
||||
//
|
||||
// https://documize.com
|
||||
|
||||
import { inject as service } from '@ember/service';
|
||||
import Notifier from '../../../mixins/notifier';
|
||||
import Controller from '@ember/controller';
|
||||
|
||||
export default Controller.extend(Notifier, {
|
||||
router: service(),
|
||||
folderService: service('folder'),
|
||||
documentService: service('document'),
|
||||
localStorage: service('localStorage'),
|
||||
tab: 'general',
|
||||
|
||||
actions: {
|
||||
onTab(view) {
|
||||
this.set('tab', view);
|
||||
},
|
||||
|
||||
onSaveDocument(doc) {
|
||||
this.showWait();
|
||||
this.get('documentService').save(doc).then(() => {
|
||||
this.showDone();
|
||||
});
|
||||
|
||||
this.get('browser').setTitle(doc.get('name'));
|
||||
this.get('browser').setMetaDescription(doc.get('excerpt'));
|
||||
},
|
||||
|
||||
onRefresh() {
|
||||
this.get('target._routerMicrolib').refresh();
|
||||
}
|
||||
}
|
||||
});
|
||||
35
gui/app/pods/document/settings/route.js
Normal file
35
gui/app/pods/document/settings/route.js
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
|
||||
//
|
||||
// This software (Documize Community Edition) is licensed under
|
||||
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
|
||||
//
|
||||
// You can operate outside the AGPL restrictions by purchasing
|
||||
// Documize Enterprise Edition and obtaining a commercial license
|
||||
// by contacting <sales@documize.com>.
|
||||
//
|
||||
// https://documize.com
|
||||
|
||||
import { hash } from 'rsvp';
|
||||
import { inject as service } from '@ember/service';
|
||||
import Route from '@ember/routing/route';
|
||||
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
|
||||
|
||||
export default Route.extend(AuthenticatedRouteMixin, {
|
||||
documentService: service('document'),
|
||||
folderService: service('folder'),
|
||||
userService: service('user'),
|
||||
|
||||
model(/*params*/) {
|
||||
return hash({
|
||||
folders: this.modelFor('document').folders,
|
||||
folder: this.modelFor('document').folder,
|
||||
document: this.modelFor('document').document,
|
||||
links: this.modelFor('document').links,
|
||||
sections: this.modelFor('document').sections,
|
||||
permissions: this.modelFor('document').permissions,
|
||||
roles: this.modelFor('document').roles,
|
||||
blocks: this.modelFor('document').blocks,
|
||||
versions: this.modelFor('document').versions
|
||||
});
|
||||
}
|
||||
});
|
||||
49
gui/app/pods/document/settings/template.hbs
Normal file
49
gui/app/pods/document/settings/template.hbs
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{{#layout/top-bar}}
|
||||
<li class="item">
|
||||
{{#link-to "folder.index" model.folder.id model.folder.slug class='link'}}
|
||||
{{model.folder.name}}
|
||||
{{/link-to}}
|
||||
</li>
|
||||
<li class="item">
|
||||
{{#link-to 'document.index' model.folder.id model.folder.slug model.document.id model.document.slug class="link"}}
|
||||
{{model.document.name}}
|
||||
{{/link-to}}
|
||||
</li>
|
||||
<li class="item">
|
||||
{{#link-to "document.settings" model.folder.id model.folder.slug class='link selected'}}
|
||||
Settings
|
||||
{{/link-to}}
|
||||
</li>
|
||||
{{/layout/top-bar}}
|
||||
|
||||
{{#layout/middle-zone}}
|
||||
{{#layout/middle-zone-content}}
|
||||
{{#if (eq tab 'general')}}
|
||||
{{document/settings-general
|
||||
space=model.folder
|
||||
document=model.document
|
||||
permissions=model.permissions
|
||||
onSaveDocument=(action 'onSaveDocument')}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq tab 'meta')}}
|
||||
{{document/settings-meta
|
||||
space=model.folder
|
||||
document=model.document
|
||||
permissions=model.permissions
|
||||
onSaveDocument=(action 'onSaveDocument')}}
|
||||
{{/if}}
|
||||
{{/layout/middle-zone-content}}
|
||||
|
||||
{{#layout/middle-zone-sidebar}}
|
||||
<div id="sidebar" class="sidebar">
|
||||
<ul class="tabnav-control tabnav-control-centered w-75">
|
||||
<li class="tab tab-vertical {{if (eq tab 'general') 'selected'}}" {{action 'onTab' 'general'}}>General</li>
|
||||
<li class="tab tab-vertical {{if (eq tab 'permissions') 'selected'}}" {{action 'onTab' 'meta'}}>Categories & Tags</li>
|
||||
</ul>
|
||||
</div>
|
||||
{{/layout/middle-zone-sidebar}}
|
||||
{{/layout/middle-zone}}
|
||||
|
||||
{{#layout/bottom-bar}}
|
||||
{{/layout/bottom-bar}}
|
||||
Loading…
Add table
Add a link
Reference in a new issue