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

Merge branch 'master' into github-config

Browse source
This commit is contained in:
Elliott Stoneham 2016-06-02 11:22:16 +01:00
commit 09354a0d9d
7 changed files with 22 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/app/styles/app.scss
View file

@ -28,3 +28,4 @@
@import "view/document/editor.scss";
@import "view/document/wizard.scss";
@import "vendor.scss";
@import "responsive.scss";

0
app/app/styles/responsive.scss Normal file
View file

4
app/app/templates/components/document/document-sidebar-toc.hbs
View file

@ -1,5 +1,4 @@
<div class="document-structure">
<div class="document-structure hidden-xs hidden-sm">
{{#if this.session.authenticated}}
<div id="tocToolbar" class="toc-controls {{if actionablePage 'current-page' ''}}">
<div id="toc-up-button" class="round-button-mono {{if upDisabled 'disabled'}}" data-tooltip="Move up" data-tooltip-position="top center" {{action 'pageUp'}}>
@ -28,5 +27,4 @@
</li>
{{/each}}
</ul>
</div>

40
app/app/templates/components/document/document-toolbar.hbs
View file

@ -4,7 +4,7 @@
<div class="toolbar">
{{#if session.authenticated}}
<div class="meta-data pull-left">
<div class="meta-data pull-left hidden-xs hidden-sm">
<ul class="items">
<li class="item">
<div id="owner-avatar" class="avatar" data-tooltip="{{owner.fullname}}" data-tooltip-position="right middle">{{owner.initials}}</div>
@ -37,7 +37,7 @@
</div>
{{/if}}
<div class="actions pull-right hidden-xs">
<div class="actions pull-right hidden-xs hidden-sm">
{{#if isEditor}}
{{#link-to 'document.wizard' folder.id folder.slug document.id document.slug}}
<div class="square-button button-green" id="add-section-button" data-tooltip="Add section" data-tooltip-position="top center">
@ -102,39 +102,3 @@
</div>
</div>
</div>
<!--
{{#if normalMode}}
<div class="edit-toolbox in-edit-toolbar">
<ul>
{{#if isEditor}}
<li class="tooltipped in-edit-toolbar" data-tooltip="Edit section" {{action 'editPage' editModePageId }}>
<i class="material-icons in-edit-toolbar">create</i>
</li>
{{#if editModeHasHistory}}
<li class="tooltipped in-edit-toolbar" data-tooltip="View changes" {{action 'viewHistory' editModePageId }}>
<i class="material-icons in-edit-toolbar">history</i>
</li>
{{/if}}
{{#if editModeCanDelete}}
<li class="tooltipped in-edit-toolbar" data-tooltip="Delete section" {{action 'askDeletePage' editModePageId }}>
<i class="material-icons in-edit-toolbar">delete</i>
</li>
{{/if}}
<li class="tooltipped in-edit-toolbar dropdown-content-type-trigger" data-tooltip="Insert section" data-activates="dropdown-content-type" data-alignment="right">
<i class="material-icons in-edit-toolbar">add</i>
</li>
{{/if}}
</ul>
</div>
<ul id="dropdown-content-type" class="dropdown-content">
<li><a {{action 'addPage' editModePageId "wysiwyg"}}>Text</a></li>
<li><a {{action 'addPage' editModePageId "table"}}>Table</a></li>
<li><a {{action 'addPage' editModePageId "code"}}>Code</a></li>
</ul>
{{/if}}
<div id="modal-history" class="modal bottom-sheet bottom-dialog">
{{document/editor-history model=historyModel editorClose=(action 'onEditorHistoryClose') editorAction=(action 'onEditorHistoryAction') }}
</div>
-->

2
app/app/templates/components/document/page-heading.hbs
View file

@ -1,6 +1,6 @@
<div class="page-title">
<span id="page-title-{{ page.id }}">{{ page.title }}</span>
<div id="page-toolbar-{{ page.id }}" class="pull-right page-toolbar">
<div id="page-toolbar-{{ page.id }}" class="pull-right page-toolbar hidden-xs hidden-sm">
{{#if isEditor}}
{{#link-to 'document.edit' folder.id folder.slug document.id document.slug page.id}}
<div class="round-button-mono page-edit-button" data-tooltip="Edit" data-tooltip-position="top center">

2
app/app/templates/components/folder/folder-dashboard.hbs
View file

@ -1,4 +1,4 @@
<div class="pull-right">
<div class="pull-right hidden-xs hidden-sm">
{{#if hasSelectedDocuments}}
<div class="square-button button-blue" id="move-documents-button" data-tooltip="Move documents" data-tooltip-position="top center">
<i class="material-icons">folder</i>

30
app/app/templates/components/folder/folders-list.hbs
View file

@ -1,17 +1,19 @@
{{#if session.isEditor}}
<div class="round-button-mono" id="add-folder-button" data-tooltip="New space" data-tooltip-position="top center">
<i class="material-icons">add</i>
</div>
{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
<div>
<div class="input-control">
<label>New space</label>
<div class="tip">A repository for related documentation</div>
{{input type='text' id="new-folder-name" value=newFolder}}
</div>
<span class="hidden-xs hidden-sm">
{{#if session.isEditor}}
<div class="round-button-mono" id="add-folder-button" data-tooltip="New space" data-tooltip-position="top center">
<i class="material-icons">add</i>
</div>
{{/dropdown-dialog}}
{{/if}}
{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
<div>
<div class="input-control">
<label>New space</label>
<div class="tip">A repository for related documentation</div>
{{input type='text' id="new-folder-name" value=newFolder}}
</div>
</div>
{{/dropdown-dialog}}
{{/if}}
</span>
<div class="folders-list">
<div class="section">
@ -59,6 +61,6 @@
{{/if}}
</div>
<div class="copyright">
<div class="copyright hidden-xs hidden-sm">
<a href="https://documize.com?ref=app-footer" target="_blank">Copyright&nbsp;&copy;&nbsp;2016 Documize</a>
</div>