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

Merge branch 'master' into github-extension

Browse source
This commit is contained in:
Elliott Stoneham 2016-06-24 22:26:15 +01:00
commit 8208bdd222
10 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/app/components/document/document-sidebar-toc.js
View file

@ -67,6 +67,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
willDestroyElement() {
this.eventBus.unsubscribe('documentPageAdded');
this.destroyTooltips();
},
onDocumentPageAdded(pageId) {
@ -409,4 +410,4 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
this.attrs.gotoPage(id);
},
},
});
});

10
app/app/components/document/page-heading.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
//
// This software (Documize Community Edition) is licensed under
// 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>.
// by contacting <sales@documize.com>.
//
// https://documize.com
@ -22,6 +22,10 @@ export default Ember.Component.extend(TooltipMixin, {
}
},
willDestroyElement() {
this.destroyTooltips();
},
actions: {
editPage(id) {
this.attrs.onEditPage(id);
@ -31,4 +35,4 @@ export default Ember.Component.extend(TooltipMixin, {
this.attrs.onDeletePage(id);
},
}
});
});

3
app/app/components/dropdown-dialog.js
View file

@ -54,6 +54,9 @@ export default Ember.Component.extend({
tetherOptions: {
offset: self.offset,
targetOffset: self.targetOffset
// optimizations: {
// moveElement: false
// }
},
remove: true
});

1
app/app/pods/document/index/controller.js
View file

@ -197,7 +197,6 @@ export default Ember.Controller.extend(NotifierMixin, {
},
onDocumentDelete() {
console.log("deleting " + this.get('model.id'));
let self = this;
this.get('documentService').deleteDocument(this.get('model.id')).then(function() {

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

@ -7,11 +7,9 @@
<i class="material-icons">mode_edit</i>
</div>
{{/link-to}}
{{#unless page.firstPage}}
<div class="round-button-mono page-delete-button" data-tooltip="Delete" data-tooltip-position="top center" {{action 'deletePage' page.id}}>
<i class="material-icons">delete</i>
</div>
{{/unless}}
<div class="round-button-mono page-delete-button" data-tooltip="Delete" data-tooltip-position="top center" {{action 'deletePage' page.id}}>
<i class="material-icons">delete</i>
</div>
{{/if}}
</div>
</div>

2
app/app/templates/components/dropdown-dialog.hbs
View file

@ -14,7 +14,7 @@
{{button2}}
</div>
{{/if}}
<div class="flat-button {{color}}" {{action 'onAction'}}>
<div class="flat-button {{color}} dropdown-dialog-action-button" {{action 'onAction'}}>
{{button}}
</div>
</div>

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

@ -28,9 +28,9 @@
{{/dropdown-dialog}}
{{else}}
{{#if folderService.canEditCurrentFolder}}
<div class="regular-button button-green" id="start-document-button" data-tooltip="Add or import document" data-tooltip-position="top center">
<div class="regular-button button-green" id="start-document-button" data-tooltip="Add new content" data-tooltip-position="top center">
<i class="material-icons">add</i>
<div class="name">Document</div>
<div class="name">Content</div>
</div>
{{/if}}
{{#if isFolderOwner}}
@ -69,15 +69,15 @@
<div class="regular-button button-transparent">
<i class="material-icons">add</i>
<div class="name">space</div>
</div>
</div>
<div class="message">Create a new space for<br/>all your documentation</div>
</div>
<div class="box">
<div class="regular-button button-green">
<i class="material-icons">add</i>
<div class="name">document</div>
</div>
<div class="message">Start a new document or <br/>import .doc .docx, .txt .md files</div>
<div class="name">content</div>
</div>
<div class="message">Start with a content template or <br/>import .doc .docx, .txt .md files</div>
</div>
</div>
{{/if}}

2
app/app/templates/components/folder/start-document.hbs
View file

@ -1,6 +1,6 @@
{{#dropdown-dialog target="start-document-button" position="bottom right" button="Add" color="flat-green" onAction=(action 'startDocument') button2=canEditTemplate color2="flat-blue" onAction2=(action 'editTemplate') onOpenCallback=(action 'onOpenCallback')}}
<div class="upload-container">
<div id="upload-documents" class="regular-button button-green">Import Files</div>
<div id="upload-documents" class="regular-button button-green">Import Word / Markdown</div>
</div>
<p class="heading">Or use a template:</p>

1
app/app/utils/net.js
View file

@ -40,7 +40,6 @@ function getAppUrl(domain) {
}
function isAjaxAccessError(reason) {
console.log(reason);
if (typeof reason === "undefined") {
return false;
}

5
app/tests/index.html
View file

@ -12,11 +12,14 @@
<meta name="author" content="Documize" />
<style>
#ember-testing-container {
#ember-testing-container, #ember-testing-container * {
/* Set position static to short-circuit Hubspot Tether's positioning */
/* https://github.com/HubSpot/tether/pull/98/ */
position: static !important;
}
.tether-container * {
z-index: 9999;
}
</style>
{{content-for "head"}}