diff --git a/app/coffee/modules/admin/memberships.coffee b/app/coffee/modules/admin/memberships.coffee index 3c660432..c337fbbe 100644 --- a/app/coffee/modules/admin/memberships.coffee +++ b/app/coffee/modules/admin/memberships.coffee @@ -115,11 +115,11 @@ paginatorTemplate = """ <% } %> <% _.each(pages, function(item) { %> -
  • +
  • <% if (item.type === "page") { %> - <%= item.num %> + <%- item.num %> <% } else if (item.type === "page-active") { %> - <%= item.num %> + <%- item.num %> <% } else { %> ... <% } %> @@ -233,7 +233,7 @@ module.directive("tgMemberships", MembershipsDirective) MembershipsRowAvatarDirective = ($log) -> template = _.template("""
    - <%- full_name %> + <%- full_name %>
    <%- full_name %> diff --git a/app/coffee/modules/auth.coffee b/app/coffee/modules/auth.coffee index 652b8aa3..42a8ce12 100644 --- a/app/coffee/modules/auth.coffee +++ b/app/coffee/modules/auth.coffee @@ -157,7 +157,7 @@ PublicRegisterMessageDirective = ($config, $navUrls) -> template = _.template(""" """) templateFn = -> diff --git a/app/coffee/modules/backlog/filters.coffee b/app/coffee/modules/backlog/filters.coffee index ed2422f7..d6445965 100644 --- a/app/coffee/modules/backlog/filters.coffee +++ b/app/coffee/modules/backlog/filters.coffee @@ -40,18 +40,18 @@ BacklogFiltersDirective = ($log, $location) -> <% _.each(filters, function(f) { %> <% if (f.selected) { %> - style="border-left: 3px solid <%= f.color %>;"<% } %>> + data-type="<%- f.type %>" + data-id="<%- f.id %>"> + style="border-left: 3px solid <%- f.color %>;"<% } %>> <%- f.name %> <%- f.count %> <% } else { %> - style="border-left: 3px solid <%= f.color %>;"<% } %>> + data-type="<%- f.type %>" + data-id="<%- f.id %>"> + style="border-left: 3px solid <%- f.color %>;"<% } %>> <%- f.name %> <%- f.count %> @@ -63,9 +63,9 @@ BacklogFiltersDirective = ($log, $location) -> templateSelected = _.template(""" <% _.each(filters, function(f) { %> - style="border-left: 3px solid <%= f.color %>;"<% } %>> + data-type="<%- f.type %>" + data-id="<%- f.id %>"> + style="border-left: 3px solid <%- f.color %>;"<% } %>> <%- f.name %> diff --git a/app/coffee/modules/common/components.coffee b/app/coffee/modules/common/components.coffee index 6d973390..96af3e44 100644 --- a/app/coffee/modules/common/components.coffee +++ b/app/coffee/modules/common/components.coffee @@ -121,7 +121,7 @@ CreatedByDisplayDirective = -> template = _.template("""
    - <%- owner.full_name_display %> + <%- owner.full_name_display %>
    @@ -178,7 +178,7 @@ WatchersDirective = ($rootscope, $confirm, $repo) ->
    - <%- watcher.full_name_display %> + <%- watcher.full_name_display %>
    @@ -186,7 +186,7 @@ WatchersDirective = ($rootscope, $confirm, $repo) -> <% if(isEditable){ %> + data-watcher-id="<%- watcher.id %>" href="" title="delete-watcher"> <% }; %>
    @@ -281,7 +281,7 @@ AssignedToDirective = ($rootscope, $confirm, $repo, $loading) -> template = _.template(""" <% if (assignedTo) { %>
    - <%- assignedTo.full_name_display %> + <%- assignedTo.full_name_display %>
    <% } %> @@ -681,7 +681,7 @@ ListItemUsStatusDirective = -> ListItemAssignedtoDirective = -> template = _.template("""
    - <%- name %> + <%- name %>
    <%- name %>
    """) diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee index 5918f71c..b0a52545 100644 --- a/app/coffee/modules/common/history.coffee +++ b/app/coffee/modules/common/history.coffee @@ -84,11 +84,11 @@ HistoryDirective = ($log, $loading) ->

    from
    - <%= point[0] %> + <%- point[0] %>

    to
    - <%= point[1] %> + <%- point[1] %>

    @@ -103,11 +103,11 @@ HistoryDirective = ($log, $loading) ->

    from
    - <%= from %> + <%- from %>

    to
    - <%= to %> + <%- to %>

    @@ -120,12 +120,12 @@ HistoryDirective = ($log, $loading) ->
    <% _.each(diff, function(change) { %>

    - <%= change.name %> from
    - <%= change.from %> + <%- change.name %> from
    + <%- change.from %>

    - <%= change.name %> to
    - <%= change.to %> + <%- change.name %> to
    + <%- change.to %>

    <% }) %>
    diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index 87711d4a..eb9f1512 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -390,7 +390,7 @@ usersTemplate = _.template("""
    @@ -404,7 +404,7 @@ usersTemplate = _.template("""
    diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index a18ee1b1..cb5f7aa4 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -164,8 +164,8 @@ IssueStatusDisplayDirective = -> Open <% } %> - - <%= status.name %> + + <%- status.name %> """) # TODO: i18n @@ -208,8 +208,8 @@ IssueStatusButtonDirective = ($rootScope, $repo, $confirm, $loading) -> template = _.template("""
    - - <%= status.name %> + + <%- status.name %> <% if(editable){ %><% }%> status @@ -302,8 +302,8 @@ IssueTypeButtonDirective = ($rootScope, $repo, $confirm, $loading) -> template = _.template("""
    - - <%= type.name %> + + <%- type.name %> <% if(editable){ %><% }%> type @@ -396,8 +396,8 @@ IssueSeverityButtonDirective = ($rootScope, $repo, $confirm, $loading) -> template = _.template("""
    - - <%= severity.name %> + + <%- severity.name %> <% if(editable){ %><% }%> severity @@ -490,8 +490,8 @@ IssuePriorityButtonDirective = ($rootScope, $repo, $confirm, $loading) -> template = _.template("""
    - - <%= priority.name %> + + <%- priority.name %> <% if(editable){ %><% }%> priority diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index 5ab0bca7..5b2ac3f7 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -319,11 +319,11 @@ paginatorTemplate = """ <% } %> <% _.each(pages, function(item) { %> -
  • +
  • <% if (item.type === "page") { %> - <%= item.num %> + <%- item.num %> <% } else if (item.type === "page-active") { %> - <%= item.num %> + <%- item.num %> <% } else { %> ... <% } %> @@ -469,8 +469,8 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm, $loading) -> <% _.each(filters, function(f) { %> <% if (!f.selected) { %> + data-type="<%- f.type %>" + data-id="<%- f.id %>"> style="border-left: 3px solid <%- f.color %>;"<% } %>> <%- f.name %> @@ -491,9 +491,9 @@ IssuesFiltersDirective = ($log, $location, $rs, $confirm, $loading) -> templateSelected = _.template(""" <% _.each(filters, function(f) { %> - style="border-left: 3px solid <%= f.color %>;"<% } %>> + data-type="<%- f.type %>" + data-id="<%- f.id %>"> + style="border-left: 3px solid <%- f.color %>;"<% } %>> <%- f.name %> @@ -786,7 +786,7 @@ module.directive("tgIssueStatusInlineEdition", ["$tgRepo", IssueStatusInlineEdit IssueAssignedToInlineEditionDirective = ($repo, $rootscope, popoverService) -> template = _.template(""" - <%- name %> + <%- name %>
    <%- name %>
    """) diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee index dda5460d..3ab7a514 100644 --- a/app/coffee/modules/kanban/main.coffee +++ b/app/coffee/modules/kanban/main.coffee @@ -392,7 +392,7 @@ KanbanUserDirective = ($log) -> template = _.template("""
    class="not-clickable"<% } %>> - <%- name %> + <%- name %>
    """) # TODO: i18n diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index b3e35b1a..6567f196 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -272,7 +272,7 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location, $
  • Logout
  • - <%= user.full_name_display %> + <%- user.full_name_display %>
    diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee index 66d38bef..c7acbffe 100644 --- a/app/coffee/modules/related-tasks.coffee +++ b/app/coffee/modules/related-tasks.coffee @@ -310,7 +310,7 @@ module.directive("tgRelatedTasks", ["$tgRepo", "$tgResources", "$rootScope", Rel RelatedTaskAssignedToInlineEditionDirective = ($repo, $rootscope, popoverService) -> template = _.template(""" - <%- name %> + <%- name %>
    <%- name %>
    """) diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee index bed2c3ba..331a69b2 100644 --- a/app/coffee/modules/taskboard/main.coffee +++ b/app/coffee/modules/taskboard/main.coffee @@ -316,7 +316,7 @@ TaskboardUserDirective = ($log) -> template = _.template("""
    class="not-clickable"<% } %>> - <%- name %> + <%- name %>
    """) # TODO: i18n diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee index 5598ccc5..0dfef32a 100644 --- a/app/coffee/modules/tasks/detail.coffee +++ b/app/coffee/modules/tasks/detail.coffee @@ -168,8 +168,8 @@ TaskStatusDisplayDirective = -> Open <% } %> - - <%= status.name %> + + <%- status.name %> """) # TODO: i18n @@ -212,8 +212,8 @@ TaskStatusButtonDirective = ($rootScope, $repo, $confirm, $loading) -> template = _.template("""
    - - <%= status.name %> + + <%- status.name %> <% if(editable){ %><% }%> status diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index 050679b4..71e7a8a7 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -177,8 +177,8 @@ UsStatusDisplayDirective = -> Open <% } %> - - <%= status.name %> + + <%- status.name %> """) # TODO: i18n @@ -441,8 +441,8 @@ UsStatusButtonDirective = ($rootScope, $repo, $confirm, $loading) -> template = _.template("""
    - - <%= status.name %> + + <%- status.name %> <% if(editable){ %><% }%> status diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee index 354822ef..3c6a1179 100644 --- a/app/coffee/modules/wiki/main.coffee +++ b/app/coffee/modules/wiki/main.coffee @@ -163,7 +163,7 @@ WikiSummaryDirective = ($log) ->
  • - <%- user.name %> + <%- user.name %>
    last modification <%- user.name %> diff --git a/app/partials/issues-detail.jade b/app/partials/issues-detail.jade index 5d717f1c..91448c44 100644 --- a/app/partials/issues-detail.jade +++ b/app/partials/issues-detail.jade @@ -25,7 +25,7 @@ block content p.block-desc-container(ng-show="issue.is_blocked") span.block-description-title Blocked - span.block-description(tg-bind-html="issue.blocked_note || 'This issue is blocked'") + span.block-description(ng-bind="issue.blocked_note || 'This issue is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="previousUrl", tg-bo-href="previousUrl", diff --git a/app/partials/task-detail.jade b/app/partials/task-detail.jade index 65fd4c63..f1bb79c6 100644 --- a/app/partials/task-detail.jade +++ b/app/partials/task-detail.jade @@ -29,7 +29,7 @@ block content span(tg-bo-bind="us.subject") p.block-desc-container(ng-show="task.is_blocked") span.block-description-title Blocked - span.block-description(tg-bind-html="task.blocked_note || 'This task is blocked'") + span.block-description(ng-bind="task.blocked_note || 'This task is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="previousUrl", tg-bo-href="previousUrl", title="previous task") diff --git a/app/partials/us-detail.jade b/app/partials/us-detail.jade index ab4931c9..14f05a05 100644 --- a/app/partials/us-detail.jade +++ b/app/partials/us-detail.jade @@ -30,7 +30,7 @@ block content p.block-desc-container(ng-show="us.is_blocked") span.block-description-title Blocked - span.block-description(tg-bind-html="us.blocked_note || 'This user story is blocked'") + span.block-description(ng-bind="us.blocked_note || 'This user story is blocked'") div.issue-nav a.icon.icon-arrow-left(ng-show="previousUrl", tg-bo-href="previousUrl", title="previous user story") diff --git a/app/partials/views/components/kanban-task.jade b/app/partials/views/components/kanban-task.jade index 55012439..522616b3 100644 --- a/app/partials/views/components/kanban-task.jade +++ b/app/partials/views/components/kanban-task.jade @@ -4,10 +4,10 @@ div.kanban-task-inner div.task-text a.task-assigned(href="", title="Assign User Story") span.task-num(tg-bo-ref="us.ref") - a.task-name(href="", tg-bo-title="us.subject", tg-bind-html="us.subject", + a.task-name(href="", tg-bo-title="us.subject", ng-bind="us.subject", tg-nav="project-userstories-detail:project=project.slug,ref=us.ref") a.task-points(href="", title="Total Us points") - span(tg-bind-html="us.total_points") -- + span(ng-bind="us.total_points") -- span points a.icon.icon-edit(tg-check-permission="modify_us", href="", title="Edit") a.icon.icon-drag-h(tg-check-permission="modify_us", href="", title="Drag&Drop") diff --git a/app/partials/views/components/sprint-summary.jade b/app/partials/views/components/sprint-summary.jade index 71c4e124..585f7b25 100644 --- a/app/partials/views/components/sprint-summary.jade +++ b/app/partials/views/components/sprint-summary.jade @@ -2,7 +2,7 @@ div.summary.large-summary div div.summary-progress-bar(tg-progress-bar="stats.completedPercentage") div.data - span.number(tg-bind-html="stats.completedPercentage + '%'") + span.number(ng-bind="stats.completedPercentage + '%'") ul li diff --git a/app/partials/views/components/summary.jade b/app/partials/views/components/summary.jade index f8031e8e..9af07112 100644 --- a/app/partials/views/components/summary.jade +++ b/app/partials/views/components/summary.jade @@ -2,17 +2,17 @@ div.summary div.summary-progress-bar(tg-backlog-progress-bar="stats") div.data - span.number(tg-bind-html="stats.completedPercentage + '%'") + span.number(ng-bind="stats.completedPercentage + '%'") ul li - span.number(tg-bind-html="stats.total_points") -- + span.number(ng-bind="stats.total_points") -- span.description project
    points li - span.number(tg-bind-html="stats.defined_points") -- + span.number(ng-bind="stats.defined_points") -- span.description defined
    points li - span.number(tg-bind-html="stats.closed_points") -- + span.number(ng-bind="stats.closed_points") -- span.description closed
    points li - span.number(tg-bind-html="stats.speed | number:0") -- + span.number(ng-bind="stats.speed | number:0") -- span.description points /
    sprint diff --git a/app/partials/views/modules/sprints.jade b/app/partials/views/modules/sprints.jade index 4a39c413..d850e14d 100644 --- a/app/partials/views/modules/sprints.jade +++ b/app/partials/views/modules/sprints.jade @@ -4,7 +4,7 @@ section.sprints div.summary ul li - span.number(tg-bind-html="sprintsCounter") -- + span.number(ng-bind="sprintsCounter") -- span.description
    sprints div.new-sprint a.button.button-green(href="", title="Add New sprint",