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

Merge pull request #936 from taigaio/fix-custom-notification-messages 

fix custom notifications messages
stable
Alejandro 2016-03-29 12:50:04 +02:00
parent f8213d64a7 27c419a4a4
commit 513bd63a9c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/modules/projects/transfer/transfer-project.controller.coffee
View File

@ -76,7 +76,10 @@ class TransferProject
project: @.project.get("slug") project: @.project.get("slug")
}) })
@location.path(newUrl) @location.path(newUrl)
@confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 5000)
@confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.ACCEPTED_PROJECT_OWNERNSHIP"), '', 15000)
return
transferReject: (token, reason) -> transferReject: (token, reason) ->
@projectService.transferReject(@.project.get("id"), token, reason).success () => @projectService.transferReject(@.project.get("id"), token, reason).success () =>
@ -86,6 +89,8 @@ class TransferProject
@location.path(newUrl) @location.path(newUrl)
@confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000) @confirmService.notify("success", @translate.instant("ADMIN.PROJECT_TRANSFER.REJECTED_PROJECT_OWNERNSHIP"), '', 5000)
return
addComment: () -> addComment: () ->
@.showAddComment = true @.showAddComment = true

12
app/partials/includes/components/notification-message.jade
View File

@ -11,22 +11,22 @@
div.notification-message.notification-message-success div.notification-message.notification-message-success
div.text div.text
h4.warning(translate="NOTIFICATION.OK") h4.warning
p(translate="NOTIFICATION.SAVED") p
div.notification-message.notification-message-error div.notification-message.notification-message-error
svg.icon.icon-error svg.icon.icon-error
use(xlink:href="#icon-error") use(xlink:href="#icon-error")
div.text div.text
h4.warning(translate="NOTIFICATION.WARNING") h4.warning
p(translate="NOTIFICATION.WARNING_TEXT") p
svg.icon.icon-close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}") svg.icon.icon-close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
use(xlink:href="#icon-close") use(xlink:href="#icon-close")
div.notification-light.notification-message-light-error div.notification-light.notification-message-light-error
div.text div.text
h4.warning(translate="NOTIFICATION.WARNING") h4.warning
p(translate="NOTIFICATION.WARNING_TEXT") p
a.close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}") a.close(href="", title="{{'NOTIFICATION.CLOSE' | translate}}")
svg.icon.icon-close svg.icon.icon-close
use(xlink:href="#icon-close") use(xlink:href="#icon-close")