diff options
Diffstat (limited to 'client/components')
-rw-r--r-- | client/components/activities/activities.jade | 3 | ||||
-rw-r--r-- | client/components/activities/activities.js | 5 | ||||
-rw-r--r-- | client/components/boards/boardHeader.jade | 1 | ||||
-rw-r--r-- | client/components/boards/boardHeader.js | 4 | ||||
-rw-r--r-- | client/components/main/popup.styl | 3 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.js | 1 | ||||
-rw-r--r-- | client/components/sidebar/sidebarCustomFields.jade | 31 | ||||
-rw-r--r-- | client/components/sidebar/sidebarCustomFields.js | 55 |
8 files changed, 103 insertions, 0 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index be12a728..b52a2981 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -50,6 +50,9 @@ template(name="boardActivities") if($eq activityType 'createCard') | {{{_ 'activity-added' cardLink boardLabel}}}. + if($eq activityType 'createCustomField') + | {{_ 'activity-customfield-created' customField}}. + if($eq activityType 'createList') | {{_ 'activity-added' list.title boardLabel}}. diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index ccb064f3..81645a51 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -91,6 +91,11 @@ BlazeComponent.extendComponent({ }, attachment.name())); }, + customField() { + const customField = this.currentData().customFieldId; + return customField; + }, + events() { return [{ // XXX We should use Popup.afterConfirmation here diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index ffb8eb27..67acdc9e 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -103,6 +103,7 @@ template(name="boardHeaderBar") template(name="boardMenuPopup") ul.pop-over-list + li: a.js-custom-fields {{_ 'custom-fields'}} li: a.js-open-archives {{_ 'archived-items'}} if currentUser.isBoardAdmin li: a.js-change-board-color {{_ 'board-change-color'}} diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index b7807ca9..8983c722 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -1,5 +1,9 @@ Template.boardMenuPopup.events({ 'click .js-rename-board': Popup.open('boardChangeTitle'), + 'click .js-custom-fields'() { + Sidebar.setView('customFields'); + Popup.close(); + }, 'click .js-open-archives'() { Sidebar.setView('archives'); Popup.close(); diff --git a/client/components/main/popup.styl b/client/components/main/popup.styl index b7c9e264..ff00eef3 100644 --- a/client/components/main/popup.styl +++ b/client/components/main/popup.styl @@ -33,6 +33,9 @@ $popupWidth = 300px textarea height: 72px + form a span + padding: 0 0.5rem + .header height: 36px position: relative diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 1290fd13..59a2b42c 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -5,6 +5,7 @@ const defaultView = 'home'; const viewTitles = { filter: 'filter-cards', multiselection: 'multi-selection', + customFields: 'custom-fields', archives: 'archives', }; diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade new file mode 100644 index 00000000..33688441 --- /dev/null +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -0,0 +1,31 @@ +template(name="customFieldsSidebar") + ul.sidebar-list + each customsFields + li + a.name + span.sidebar-list-item-description + {{_ 'some name'}} + if currentUser.isBoardMember + hr + a.sidebar-btn.js-open-create-custom-field + i.fa.fa-plus + span {{_ 'Create Custom Field'}} + +template(name="createCustomFieldPopup") + form + label + | {{_ 'name'}} + input.js-field-name(type="text" name="field-name" autofocus) + label + | {{_ 'type'}} + select.js-field-type(name="field-type") + option(value="string") String + option(value="number") Number + option(value="checkbox") Checkbox + option(value="date") Date + option(value="DropdownList") Dropdown List + a.flex.js-field-show-on-card + .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}") + + span {{_ 'show-field-on-card'}} + input.primary.wide(type="submit" value="{{_ 'save'}}")
\ No newline at end of file diff --git a/client/components/sidebar/sidebarCustomFields.js b/client/components/sidebar/sidebarCustomFields.js new file mode 100644 index 00000000..da03f484 --- /dev/null +++ b/client/components/sidebar/sidebarCustomFields.js @@ -0,0 +1,55 @@ +BlazeComponent.extendComponent({ + + customFields() { + return CustomFields.find({ + boardId: Session.get('currentBoard'), + }); + }, + + events() { + return [{ + 'click .js-open-create-custom-field': Popup.open('createCustomField'), + 'click .js-edit-custom-field'() { + // todo + }, + 'click .js-delete-custom-field': Popup.afterConfirm('customFieldDelete', function() { + const customFieldId = this._id; + CustomFields.remove(customFieldId); + Popup.close(); + }), + }]; + }, + +}).register('customFieldsSidebar'); + +Template.createCustomFieldPopup.helpers({ + +}); + +Template.createCustomFieldPopup.events({ + 'click .js-field-show-on-card'(event) { + let $target = $(event.target); + if(!$target.hasClass('js-field-show-on-card')){ + $target = $target.parent(); + } + $target.find('.materialCheckBox').toggleClass('is-checked'); + $target.toggleClass('is-checked'); + }, + 'submit'(evt, tpl) { + evt.preventDefault(); + + const name = tpl.find('.js-field-name').value.trim(); + const type = tpl.find('.js-field-type').value.trim(); + const showOnCard = tpl.find('.js-field-show-on-card.is-checked') != null; + //console.log("Create",name,type,showOnCard); + + CustomFields.insert({ + boardId: Session.get('currentBoard'), + name: name, + type: type, + showOnCard: showOnCard + }); + + Popup.back(); + }, +});
\ No newline at end of file |