Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 13:19:43 +02:00
Code Releases Activity

accept .markdown files and trap fro no spaces on space admin screen

Browse source
This commit is contained in:
Harvey Kandola 2017-06-11 15:20:48 -04:00
parent bbcba8eb18
commit 86dcbbd684
5 changed files with 56 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/app/components/folder/start-document.js
View file

@ -74,7 +74,7 @@ export default Ember.Component.extend(NotifierMixin, {
url: importUrl, url: importUrl,
method: "post", method: "post",
paramName: 'attachment', paramName: 'attachment',
acceptedFiles: ".doc,.docx,.txt,.md,.markdown", acceptedFiles: ".doc,.docx,.md,.markdown,.htm,.html",
clickable: true, clickable: true,
maxFilesize: 10, maxFilesize: 10,
parallelUploads: 3, parallelUploads: 3,

5
app/app/pods/customize/folders/route.js
View file

@ -27,6 +27,9 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
setupController(controller, model) { setupController(controller, model) {
let nonPrivateFolders = model.rejectBy('folderType', 2); let nonPrivateFolders = model.rejectBy('folderType', 2);
if (is.empty(nonPrivateFolders) || is.null(model) || is.undefined(model)) {
nonPrivateFolders = [];
}
controller.set('folders', nonPrivateFolders); controller.set('folders', nonPrivateFolders);
this.get('folderService').getProtectedFolderInfo().then((people) => { this.get('folderService').getProtectedFolderInfo().then((people) => {
@ -48,7 +51,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
}, },
activate() { activate() {
document.title = "Folders | Documize"; document.title = "Spaces | Documize";
}, },
actions: { actions: {

89
app/app/pods/customize/folders/template.hbs
View file

@ -1,41 +1,50 @@
<div class="global-folder-settings"> {{#if folders}}
<div class="form-header"> <div class="global-folder-settings">
<div class="title">{{folders.length}} shared {{label}}</div> <div class="form-header">
<div class="tip">View and change shared space ownership</div> <div class="title">{{folders.length}} shared {{label}}</div>
</div> <div class="tip">View and change shared space ownership</div>
<div class="input-control"> </div>
<table class="basic-table"> <div class="input-control">
<thead> <table class="basic-table">
<tr> <thead>
<th class="bordered">Space</th> <tr>
<th class="bordered">Participants</th> <th class="bordered">Space</th>
</tr> <th class="bordered">Participants</th>
</thead> </tr>
<tbody> </thead>
{{#each folders as |folder|}} <tbody>
<tr> {{#each folders as |folder|}}
<td class="bordered"> <tr>
{{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}} <td class="bordered">
</td> {{#link-to 'folder' folder.id folder.slug class="alt"}}{{folder.name}}{{/link-to}}
<td class="bordered"> </td>
{{#each folder.sharedWith as |person|}} <td class="bordered">
{{#if person.isEveryone}} {{#each folder.sharedWith as |person|}}
Everyone {{#if person.isEveryone}}
{{else}} Everyone
{{else}}
{{#if person.isOwner}} {{#if person.isOwner}}
<span class="bold">{{person.firstname}} {{person.lastname}} (owner)</span> <span class="bold">{{person.firstname}} {{person.lastname}} (owner)</span>
{{else}} {{else}}
{{person.firstname}} {{person.lastname}} {{person.firstname}} {{person.lastname}}
<a class="action-link" {{action "changeOwner" folder.id person.userId}}>make owner</a> <a class="action-link" {{action "changeOwner" folder.id person.userId}}>make owner</a>
{{/if}} {{/if}}
{{/if}} {{/if}}
<br/> <br/>
{{/each}} {{/each}}
</td> </td>
</tr> </tr>
{{/each}} {{/each}}
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
{{else}}
<div class="global-folder-settings">
<div class="form-header">
<div class="title">{{folders.length}} shared {{label}}</div>
<div class="tip">There are no spaces to maintain</div>
</div>
</div>
{{/if}}

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

@ -9,7 +9,7 @@
<div class="clearfix" /> <div class="clearfix" />
<div id="import-document-button" class="import-document-button"> <div id="import-document-button" class="import-document-button">
Drag-drop or click to select .doc, .docx, .txt, .md, .markdown files Drag-drop or click to select .doc, .docx, .md, .markdown files
</div> </div>
<div class="list-wrapper"> <div class="list-wrapper">

2
core/api/plugins/glick.go
View file

@ -81,7 +81,7 @@ func LibSetup() error {
} }
} }
for _, xtn := range []string{"md"} { for _, xtn := range []string{"md", "markdown"} {
err = Lib.RegPlugin("Convert", xtn, md.Convert, nil) err = Lib.RegPlugin("Convert", xtn, md.Convert, nil)
if err != nil { if err != nil {
return err return err