current progress

This commit is contained in:
Ryan Helsing 2017-03-18 16:01:22 -04:00
parent cf85c9c6cd
commit ec9498fa62
7 changed files with 46 additions and 29 deletions

View file

@ -8,7 +8,7 @@ template(name="cardDetails")
if currentUser.isBoardMember if currentUser.isBoardMember
a.fa.fa-navicon.card-details-menu.js-open-card-details-menu a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
h2.card-details-title.js-card-title( h2.card-details-title.js-card-title(
class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}") class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
= title = title
if isWatching if isWatching
i.fa.fa-eye.card-details-watch i.fa.fa-eye.card-details-watch
@ -22,7 +22,7 @@ template(name="cardDetails")
each members each members
+userAvatar(userId=this cardId=../_id) +userAvatar(userId=this cardId=../_id)
| {{! XXX Hack to hide syntaxic coloration /// }} | {{! XXX Hack to hide syntaxic coloration /// }}
if currentUser.isBoardMember if canModifyCard
a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}") a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}")
i.fa.fa-plus i.fa.fa-plus
@ -31,7 +31,7 @@ template(name="cardDetails")
a(class="{{#if currentUser.isBoardMember}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}") a(class="{{#if currentUser.isBoardMember}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
each labels each labels
span.card-label(class="card-label-{{color}}" title=name)= name span.card-label(class="card-label-{{color}}" title=name)= name
if currentUser.isBoardMember if canModifyCard
a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}") a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
i.fa.fa-plus i.fa.fa-plus
@ -47,7 +47,7 @@ template(name="cardDetails")
//- XXX We should use "editable" to avoid repetiting ourselves //- XXX We should use "editable" to avoid repetiting ourselves
if currentUser.isBoardMember if canModifyCard
h3.card-details-item-title {{_ 'description'}} h3.card-details-item-title {{_ 'description'}}
+inlinedCardDescription(classNames="card-description js-card-description") +inlinedCardDescription(classNames="card-description js-card-description")
+editor(autofocus=true) +editor(autofocus=true)
@ -101,23 +101,24 @@ template(name="editCardTitleForm")
template(name="cardDetailsActionsPopup") template(name="cardDetailsActionsPopup")
ul.pop-over-list ul.pop-over-list
li: a.js-toggle-watch-card {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}} li: a.js-toggle-watch-card {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
hr if canModifyCard
ul.pop-over-list hr
li: a.js-members {{_ 'card-edit-members'}} ul.pop-over-list
li: a.js-labels {{_ 'card-edit-labels'}} li: a.js-members {{_ 'card-edit-members'}}
li: a.js-attachments {{_ 'card-edit-attachments'}} li: a.js-labels {{_ 'card-edit-labels'}}
li: a.js-start-date {{_ 'editCardStartDatePopup-title'}} li: a.js-attachments {{_ 'card-edit-attachments'}}
li: a.js-due-date {{_ 'editCardDueDatePopup-title'}} li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
hr li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
ul.pop-over-list hr
li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}} ul.pop-over-list
li: a.js-move-card-to-bottom {{_ 'moveCardToBottom-title'}} li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
hr li: a.js-move-card-to-bottom {{_ 'moveCardToBottom-title'}}
ul.pop-over-list hr
li: a.js-move-card {{_ 'moveCardPopup-title'}} ul.pop-over-list
unless archived li: a.js-move-card {{_ 'moveCardPopup-title'}}
li: a.js-archive {{_ 'archive-card'}} unless archived
li: a.js-more {{_ 'cardMorePopup-title'}} li: a.js-archive {{_ 'archive-card'}}
li: a.js-more {{_ 'cardMorePopup-title'}}
template(name="moveCardPopup") template(name="moveCardPopup")
+boardLists +boardLists

View file

@ -28,6 +28,10 @@ BlazeComponent.extendComponent({
return card.findWatcher(Meteor.userId()); return card.findWatcher(Meteor.userId());
}, },
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
},
scrollParentContainer() { scrollParentContainer() {
const cardPanelWidth = 510; const cardPanelWidth = 510;
const bodyBoardComponent = this.parentComponent(); const bodyBoardComponent = this.parentComponent();

View file

@ -3,12 +3,13 @@ template(name="checklists")
.card-checklist-items .card-checklist-items
each checklist in currentCard.checklists each checklist in currentCard.checklists
+checklistDetail(checklist = checklist) +checklistDetail(checklist = checklist)
+inlinedForm(classNames="js-add-checklist" cardId = cardId) if canModifyCard
+addChecklistItemForm +inlinedForm(classNames="js-add-checklist" cardId = cardId)
else +addChecklistItemForm
a.js-open-inlined-form else
i.fa.fa-plus a.js-open-inlined-form
| {{_ 'add-checklist'}}... i.fa.fa-plus
| {{_ 'add-checklist'}}...
template(name="checklistDetail") template(name="checklistDetail")
+inlinedForm(classNames="js-edit-checklist-title" checklist = checklist) +inlinedForm(classNames="js-edit-checklist-title" checklist = checklist)

View file

@ -26,6 +26,10 @@ BlazeComponent.extendComponent({
checklist.setTitle(title); checklist.setTitle(title);
}, },
canModifyCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
},
editChecklistItem(event) { editChecklistItem(event) {
event.preventDefault(); event.preventDefault();

View file

@ -12,7 +12,7 @@ template(name="listBody")
.materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection( .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection(
class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
+minicard(this) +minicard(this)
if currentUser.isBoardMember if canSeeAddCard
+inlinedForm(autoclose=false position="bottom") +inlinedForm(autoclose=false position="bottom")
+addCardForm(listId=_id position="bottom") +addCardForm(listId=_id position="bottom")
else else

View file

@ -239,3 +239,10 @@ BlazeComponent.extendComponent({
}); });
}, },
}).register('addCardForm'); }).register('addCardForm');
Template.listBody.helpers({
canSeeAddCard() {
return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
},
});

View file

@ -25,8 +25,8 @@ template(name="editListTitleForm")
template(name="listActionPopup") template(name="listActionPopup")
ul.pop-over-list ul.pop-over-list
li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}} li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
hr
unless currentUser.isCommentOnly unless currentUser.isCommentOnly
hr
ul.pop-over-list ul.pop-over-list
li: a.js-add-card {{_ 'add-card'}} li: a.js-add-card {{_ 'add-card'}}
if cards.count if cards.count