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

Document => Content

Browse source 
We add content to a space — content that can be words, tables, commits,
contacts, tickets and more…
This commit is contained in:
Harvey Kandola 2016-06-24 13:55:30 -07:00
parent a213ff85b7
commit e03bb4d6ee
6 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -28,9 +28,9 @@
{{/dropdown-dialog}} {{/dropdown-dialog}}
{{else}} {{else}}
{{#if folderService.canEditCurrentFolder}} {{#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> <i class="material-icons">add</i>
<div class="name">Document</div> <div class="name">Content</div>
</div> </div>
{{/if}} {{/if}}
{{#if isFolderOwner}} {{#if isFolderOwner}}
@ -75,9 +75,9 @@
<div class="box"> <div class="box">
<div class="regular-button button-green"> <div class="regular-button button-green">
<i class="material-icons">add</i> <i class="material-icons">add</i>
<div class="name">document</div> <div class="name">content</div>
</div> </div>
<div class="message">Start a new document or <br/>import .doc .docx, .txt .md files</div> <div class="message">Start with a content template or <br/>import .doc .docx, .txt .md files</div>
</div> </div>
</div> </div>
{{/if}} {{/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')}} {{#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 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> </div>
<p class="heading">Or use a template:</p> <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) { function isAjaxAccessError(reason) {
console.log(reason);
if (typeof reason === "undefined") { if (typeof reason === "undefined") {
return false; return false;
} }

5
app/tests/index.html
View file

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