mirror of
https://github.com/documize/community.git
synced 2025-07-25 08:09:43 +02:00
Per space label, icon, description
Labels introduce visual grouping and filtering of spaces.
This commit is contained in:
parent
fe8068965c
commit
a211ba051a
106 changed files with 3280 additions and 1008 deletions
|
@ -47,6 +47,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
|
|||
return hash({
|
||||
folder: this.modelFor('folder').folder,
|
||||
permissions: this.modelFor('folder').permissions,
|
||||
labels: this.modelFor('folder').labels,
|
||||
folders: folders,
|
||||
documents: documents,
|
||||
documentsDraft: _.filter(documents, function(d) { return d.get('lifecycle') === constants.Lifecycle.Draft; }),
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
{{folder/space-sidebar
|
||||
spaces=model.folders
|
||||
space=model.folder
|
||||
labels=model.labels
|
||||
templates=model.templates
|
||||
permissions=model.permissions
|
||||
documents=model.documents
|
||||
|
@ -19,8 +20,10 @@
|
|||
{{#layout/master-content}}
|
||||
<div class="grid-container-6-4">
|
||||
<div class="grid-cell-1">
|
||||
{{layout/page-heading title=model.folder.name}}
|
||||
{{layout/page-desc desc="some space desc"}}
|
||||
{{layout/logo-heading
|
||||
title=model.folder.name
|
||||
desc=model.folder.desc
|
||||
meta=model.folder.icon}}
|
||||
</div>
|
||||
<div class="grid-cell-2 grid-cell-right">
|
||||
{{folder/space-toolbar
|
||||
|
@ -35,8 +38,6 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{{ui/ui-spacer size=400}}
|
||||
|
||||
{{folder/documents-list
|
||||
documents=filteredDocs
|
||||
spaces=model.folders
|
||||
|
|
|
@ -11,14 +11,15 @@
|
|||
|
||||
import { Promise as EmberPromise, 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';
|
||||
import Route from '@ember/routing/route';
|
||||
|
||||
export default Route.extend(AuthenticatedRouteMixin, {
|
||||
documentService: service('document'),
|
||||
folderService: service('folder'),
|
||||
templateService: service('template'),
|
||||
session: service(''),
|
||||
labelSvc: service('label'),
|
||||
|
||||
beforeModel() {
|
||||
this.set('folderId', this.paramsFor('folder').folder_id)
|
||||
|
@ -41,7 +42,8 @@ export default Route.extend(AuthenticatedRouteMixin, {
|
|||
permissions: this.get('permissions'),
|
||||
folders: this.get('folderService').getAll(),
|
||||
documents: this.get('documentService').getAllBySpace(params.folder_id),
|
||||
templates: this.get('templateService').getSavedTemplates(params.folder_id)
|
||||
templates: this.get('templateService').getSavedTemplates(params.folder_id),
|
||||
labels: this.get('labelSvc').getAll()
|
||||
});
|
||||
},
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
|
|||
import Route from '@ember/routing/route';
|
||||
|
||||
export default Route.extend(AuthenticatedRouteMixin, {
|
||||
|
||||
model() {
|
||||
this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
|
||||
|
||||
|
@ -23,6 +22,7 @@ export default Route.extend(AuthenticatedRouteMixin, {
|
|||
folders: this.modelFor('folder').folders,
|
||||
permissions: this.modelFor('folder').permissions,
|
||||
templates: this.modelFor('folder').templates,
|
||||
labels: this.modelFor('folder').labels,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<div class="list">
|
||||
<div class="item {{if (eq tab "general") "selected"}}" {{action "onTab" "general"}}>
|
||||
<i class={{concat "dicon " constants.Icon.Settings}} />
|
||||
<div class="name">Options</div>
|
||||
<div class="name">Meta</div>
|
||||
</div>
|
||||
<div class="item {{if (eq tab "categories") "selected"}}" {{action "onTab" "categories"}}>
|
||||
<i class={{concat "dicon " constants.Icon.Category}} />
|
||||
|
@ -44,7 +44,7 @@
|
|||
|
||||
{{#layout/master-content}}
|
||||
{{#if (eq tab "general")}}
|
||||
{{folder/settings-general permissions=model.permissions space=model.folder}}
|
||||
{{folder/settings-general permissions=model.permissions space=model.folder labels=model.labels}}
|
||||
{{/if}}
|
||||
|
||||
{{#if (eq tab "permissions")}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue