add category to document

gui/app/templates/components/document/document-attachments.hbs

@@ -1,4 +1,5 @@
 <div class="document-attachments">
+	<h2>Attachments</h2>
 	{{#if hasAttachments}}
 		<ul class="list">
 			{{#each files key="id" as |a index|}}

gui/app/templates/components/document/document-view.hbs

@@ -1,5 +1,3 @@
-{{document/document-attachments document=document permissions=permissions}}
-
 <div class="document-view {{if (is-equal document.layout 'doc') 'document-view-unified'}}">
 
 	{{#if hasPages}}
@@ -103,3 +101,5 @@
 	</div>
 
 </div>
+
+{{document/document-attachments document=document permissions=permissions}}

gui/app/templates/components/document/space-category.hbs

@@ -1,4 +1,5 @@
-<div class="back-to-space">
+<div class="back-to-space document-space">
+	<div class="caption">Space</div>
 	{{#link-to 'folder' folder.id folder.slug}}
 		<div class="regular-button button-gray">
 			<i class="material-icons">arrow_back</i>
@@ -7,8 +8,23 @@
 	{{/link-to}}
 </div>
 
-<div class="document-category hide">
-	<div class="chip chip-action">
-		<span id="upload-document-files" class="chip-text">+ category</span>
-	</div>
+<div class="document-category">
+	<div class="caption">Category</div>
+
+	{{#each selectedCategories as |cat|}}
+		<div class="regular-button button-blue">{{cat.category}}</div>
+	{{/each}}
+
+	{{#if hasCategories}}
+		<div class="regular-button button-white" id="document-category-button">
+			<i class="material-icons">add</i>
+		</div>
+
+		{{#dropdown-dialog target="document-category-button" position="bottom left" button="set" color="flat-green" onAction=(action 'onSave')}}
+			<p class="heading">Select categories for document</p>
+			{{ui/ui-list-picker items=categories nameField='category'}}
+		{{/dropdown-dialog}}
+	{{else}}
+		<p>&nbsp;</p>
+	{{/if}}
 </div>

gui/app/templates/components/document/tag-editor.hbs

@@ -1,15 +1,11 @@
 <div class="document-tags">
+	<div class="caption">Tag</div>
     {{#each tagz as |tg|}}
-        <div class="chip">
-			<span class="chip-text">#{{tg}}</span>
-            {{#if permissions.documentEdit}}
-                <i class="material-icons pull-right" {{action 'removeTag' tg}}>close</i>
-            {{/if}}
-        </div>
+		<div class="regular-button button-chip">{{concat '#' tg}}</div>
     {{/each}}
     {{#if canAdd}}
 		<div class="chip-action">
-			<span id="add-tag-button" class="chip-text">+ tag</span>
+			<span id="add-tag-button" class="chip-text">+</span>
 		</div>
 		{{#dropdown-dialog target="add-tag-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addTag') focusOn="add-tag-field" onOpenCallback=(action 'onTagEditor') targetOffset="20px 0"}}
 			<div class="input-control">