taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert span.task-assigned to a.task-assigned

stable
David Barragán Merino 2014-08-07 14:27:26 +02:00
parent f4575e0f11
commit ccb2c5cacb
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/coffee/modules/kanban/main.coffee
View File

@ -281,11 +281,11 @@ module.directive("tgKanbanWipLimit", KanbanWipLimitDirective)
KanbanUserDirective = ($log) -> KanbanUserDirective = ($log) ->
template = _.template(""" template = _.template("""
<figure class="avatar"> <figure class="avatar">
<a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>> <a href="#" title="Change assignation" <% if (!clickable) {%>class="not-clickable"<% } %>>
<img src="<%= imgurl %>" alt="<%- name %>" class="avatar"> <img src="<%= imgurl %>" alt="<%- name %>" class="avatar">
</a> </a>
</figure> </figure>
""") """) # TODO: i18n
clickable = false clickable = false
@ -309,7 +309,7 @@ KanbanUserDirective = ($log) ->
html = template(ctx) html = template(ctx)
$el.html(html) $el.html(html)
$el.parent().find("span.task-assigned").html(ctx.name) $el.parent().find("a.task-assigned").html(ctx.name)
bindOnce $scope, "project", (project) -> bindOnce $scope, "project", (project) ->
if project.my_permissions.indexOf("modify_us") > -1 if project.my_permissions.indexOf("modify_us") > -1

7
app/coffee/modules/taskboard/main.coffee
View File

@ -230,11 +230,11 @@ module.directive("tgTaskboardRowSizeFixer", TaskboardRowSizeFixer)
TaskboardUserDirective = ($log) -> TaskboardUserDirective = ($log) ->
template = _.template(""" template = _.template("""
<figure class="avatar"> <figure class="avatar">
<a href="#" title="<%- name %>" <% if (!clickable) {%>class="not-clickable"<% } %>> <a href="#" title="Change assignation" <% if (!clickable) {%>class="not-clickable"<% } %>>
<img src="<%= imgurl %>" alt="<%- name %>"> <img src="<%= imgurl %>" alt="<%- name %>">
</a> </a>
</figure> </figure>
""") """) # TODO: i18n
clickable = false clickable = false
@ -258,7 +258,8 @@ TaskboardUserDirective = ($log) ->
html = template(ctx) html = template(ctx)
$el.html(html) $el.html(html)
$el.parent().find("span.task-assigned").html(ctx.name)
$el.parent().find("a.task-assigned").html(ctx.name)
bindOnce $scope, "project", (project) -> bindOnce $scope, "project", (project) ->
if project.my_permissions.indexOf("modify_task") > -1 if project.my_permissions.indexOf("modify_task") > -1

2
app/partials/views/components/kanban-task.jade
View File

@ -3,7 +3,7 @@ div.kanban-tagline
div.kanban-task-inner div.kanban-task-inner
div(tg-kanban-user-avatar="us.assigned_to", ng-model="us", click="ctrl.editUsAssignedTo(task)") div(tg-kanban-user-avatar="us.assigned_to", ng-model="us", click="ctrl.editUsAssignedTo(task)")
div.task-text div.task-text
span.task-assigned a.task-assigned(href="", ng-click="ctrl.editUsAssignedTo(task)", title="Change assignation")
span.task-num(tg-bo-ref="us.ref") span.task-num(tg-bo-ref="us.ref")
a.task-name(href="", title="", tg-bind-html="us.subject", a.task-name(href="", title="", tg-bind-html="us.subject",
tg-nav="project-userstories-detail:project=project.slug,ref=us.ref") tg-nav="project-userstories-detail:project=project.slug,ref=us.ref")

2
app/partials/views/components/taskboard-task.jade
View File

@ -3,7 +3,7 @@ div.taskboard-tagline
div.taskboard-task-inner div.taskboard-task-inner
div(tg-taskboard-user-avatar="task.assigned_to", ng-model="task", click="ctrl.editTaskAssignedTo(task)") div(tg-taskboard-user-avatar="task.assigned_to", ng-model="task", click="ctrl.editTaskAssignedTo(task)")
p.taskboard-text p.taskboard-text
span.task-assigned a.task-assigned(href="", ng-click="ctrl.editTaskAssignedTo(task)", title="Change assignation")
span.task-num(tg-bo-ref="task.ref") span.task-num(tg-bo-ref="task.ref")
a.task-name(href="", title="See task details", tg-bind-html="task.subject", a.task-name(href="", title="See task details", tg-bind-html="task.subject",
tg-nav="project-tasks-detail:project=project.slug,ref=task.ref") tg-nav="project-tasks-detail:project=project.slug,ref=task.ref")