Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-05 05:25:27 +02:00
Code Releases Activity

Move space label to main view from sidebar

Browse source 
Solves long-standing debate about removing meta from sidebar, and keeping sidebat for navigation/filtering.
This commit is contained in:
McMatts 2019-03-08 15:45:12 +00:00
parent e6e5f75ee7
commit 0bfde82040
7 changed files with 55 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gui/app/pods/folder/index/route.js
View file

@ -11,8 +11,8 @@
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, {
categoryService: service('category'),
@ -37,22 +37,25 @@ export default Route.extend(AuthenticatedRouteMixin, {
let folders = this.modelFor('folder').folders;
folders.forEach(f => {
f.set('selected', false);
})
});
let documents = this.modelFor('folder').documents;
documents.forEach(d => {
d.set('selected', false);
})
});
return hash({
folder: this.modelFor('folder').folder,
permissions: this.modelFor('folder').permissions,
label: _.find(this.modelFor('folder').labels, {id: this.modelFor('folder').folder.get('labelId')}),
labels: this.modelFor('folder').labels,
folders: folders,
documents: documents,
documentsDraft: _.filter(documents, function(d) { return d.get('lifecycle') === constants.Lifecycle.Draft; }),
documentsLive: _.filter(documents, function(d) { return d.get('lifecycle') === constants.Lifecycle.Live; }),
templates: this.modelFor('folder').templates,
recentAdd: _.filter(documents, function(d) { return d.get('addRecent'); }),
recentUpdate: _.filter(documents, function(d) { return d.get('updateRecent'); }),
showStartDocument: false,
rootDocCount: 0,
categories: this.get('categories'),

7
gui/app/pods/folder/index/template.hbs
View file

@ -8,6 +8,8 @@
documents=model.documents
documentsDraft=model.documentsDraft
documentsLive=model.documentsLive
recentAdd=model.recentAdd
recentUpdate=model.recentUpdate
categories=model.categories
categorySummary=model.categorySummary
categoryMembers=model.categoryMembers
@ -20,6 +22,11 @@
{{#layout/master-content}}
<div class="grid-container-6-4">
<div class="grid-cell-1">
{{#if (eq model.folder.labelId "")}}
<div class="space-label">Unclassified</div>
{{else}}
<div class="space-label" style={{{model.label.bgColor}}}>{{model.label.name}}</div>
{{/if}}
{{layout/logo-heading
title=model.folder.name
desc=model.folder.desc