From 13815d9b193f560ba66538b03da75e20be51a5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 7 Aug 2014 23:12:16 +0200 Subject: [PATCH] Improve some expresions of ng-class directives --- app/partials/issues-detail-edit.jade | 4 ++-- app/partials/task-detail-edit.jade | 2 +- app/partials/task-detail.jade | 2 +- app/partials/us-detail-edit.jade | 4 ++-- app/partials/us-detail.jade | 10 ++++++---- app/partials/views/components/backlog-row.jade | 9 ++++++--- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/partials/issues-detail-edit.jade b/app/partials/issues-detail-edit.jade index 68570d61..942cf5e9 100644 --- a/app/partials/issues-detail-edit.jade +++ b/app/partials/issues-detail-edit.jade @@ -36,8 +36,8 @@ block content section.watchers(tg-watchers, ng-model="issue", editable="true") section.us-detail-settings - a.button.button-gray.clickable(ng-show="!issue.is_blocked", ng-click="ctrl.block()") Block - a.button.button-red(tg-check-permission, permission="delete_issue", ng-click="ctrl.delete()", href="") Delete + a.button.button-gray.clickable(ng-show="!issue.is_blocked", ng-click="ctrl.block()") Block + a.button.button-red(tg-check-permission, permission="delete_issue", ng-click="ctrl.delete()", href="") Delete div.lightbox.lightbox_block.hidden(tg-lb-block, title="Blocking issue", ng-model="issue") div.lightbox.lightbox_select_user.hidden(tg-lb-assignedto) diff --git a/app/partials/task-detail-edit.jade b/app/partials/task-detail-edit.jade index 839e9393..43ec1abe 100644 --- a/app/partials/task-detail-edit.jade +++ b/app/partials/task-detail-edit.jade @@ -37,7 +37,7 @@ block content section.us-detail-settings fieldset - label.clickable.button.button-gray(for="is-iocaine", ng-class="{true:'active', false:''}[task.is_iocaine]") Iocaine + label.clickable.button.button-gray(for="is-iocaine", ng-class="{'active': task.is_iocaine}") Iocaine input(ng-model="task.is_iocaine", type="checkbox", id="is-iocaine", name="is-iocaine") a.button.button-gray.clickable(ng-show="!task.is_blocked", ng-click="ctrl.block()") Block diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index d79e63e0..d44bcbc6 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -53,4 +53,4 @@ block content section.watchers(tg-watchers, ng-model="task") section.us-detail-settings - span.button.button-gray(href="", title="Is iocaine", ng-class="task.is_iocaine ? 'active' : ''") Iocaine + span.button.button-gray(href="", title="Is iocaine", ng-class="{'active': task.is_iocaine }") Iocaine diff --git a/app/partials/us-detail-edit.jade b/app/partials/us-detail-edit.jade index 39329ee7..43be7a03 100644 --- a/app/partials/us-detail-edit.jade +++ b/app/partials/us-detail-edit.jade @@ -37,10 +37,10 @@ block content section.us-detail-settings fieldset - label.clickable.button.button-green(for="client-requirement", ng-class="{true:'active', false:''}[us.client_requirement]") Client requirement + label.clickable.button.button-green(for="client-requirement", ng-class="{'active': us.client_requirement}") Client requirement input(ng-model="us.client_requirement", type="checkbox", id="client-requirement", name="client-requirement") fieldset - label.clickable.button.button-green(for="team-requirement", ng-class="{true:'active', false:''}[us.team_requirement]") Team requirement + label.clickable.button.button-green(for="team-requirement", ng-class="{'active': us.team_requirement}") Team requirement input(ng-model="us.team_requirement", type="checkbox", id="team-requirement", name="team-requirement") a.button.button-gray.clickable(ng-show="!us.is_blocked", ng-click="ctrl.block()") Block diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index 4928763e..2770e3cd 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -22,8 +22,8 @@ block content span.block-description(tg-bind-html="us.blocked_note || 'This user story is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="nextUrl", href="{{ nextUrl }}", title="next user story") - a.icon.icon-arrow-right(ng-show="previousUrl",href="{{ previousUrl }}", title="previous user story") - + a.icon.icon-arrow-right(ng-show="previousUrl",href="{{ previousUrl }}", + title="previous user story") div.user-story-tags(tg-tag-line, ng-model="us.tags", ng-show="us.tags") @@ -55,5 +55,7 @@ block content section.watchers(tg-watchers, ng-model="us") section.us-detail-settings - span.button.button-gray(href="", title="Client requirement", ng-class="us.client_requirement ? 'active' : ''") Client requirement - span.button.button-gray(href="", title="Team requirement", ng-class="us.team_requirement ? 'active' : ''") Team requirement + span.button.button-gray(href="", title="Client requirement", + ng-class="{'active': us.client_requirement}") Client requirement + span.button.button-gray(href="", title="Team requirement", + ng-class="{'active': us.team_requirement}") Team requirement diff --git a/app/partials/views/components/backlog-row.jade b/app/partials/views/components/backlog-row.jade index bfb54e35..3a570302 100644 --- a/app/partials/views/components/backlog-row.jade +++ b/app/partials/views/components/backlog-row.jade @@ -4,10 +4,13 @@ div.row.us-item-row(ng-repeat="us in visibleUserstories|orderBy:order track by u span.tag(ng-repeat="tag in us.tags", tg-bind-html="tag", tg-colorize-tag-border-left="tag") div.user-story-name input(tg-check-permission, permission="modify_us", type="checkbox", name="") - a.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", title="{{ us.subject }}") {{ us.subject }} + a.clickable(tg-nav="project-userstories-detail:project=project.slug,ref=us.ref", + title="{{ us.subject }}") {{ us.subject }} span.us-settings - a.icon.icon-edit(tg-check-permission, permission="modify_us", href="", ng-click="ctrl.editUserStory(us)", title="Edit") - a.icon.icon-delete(tg-check-permission, permission="delete_us", href="", ng-click="ctrl.deleteUserStory(us)", title="Delete") + a.icon.icon-edit(tg-check-permission, permission="modify_us", href="", + ng-click="ctrl.editUserStory(us)", title="Edit") + a.icon.icon-delete(tg-check-permission, permission="delete_us", href="", + ng-click="ctrl.deleteUserStory(us)", title="Delete") div.status(tg-us-status="us" on-update="ctrl.loadProjectStats()") a.us-status(href="", title="Status Name")