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

Merge pull request #898 from taigaio/us/65/user-resign 

projects block warning
stable
Alejandro 2016-03-02 13:23:39 +01:00
parent ed50191a41 10e5af6847
commit 19820a8d2d
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/modules/user-settings/lightboxes.coffee
View File

@ -53,11 +53,11 @@ DeleteUserDirective = ($repo, $rootscope, $auth, $location, $navUrls, lightboxSe
promise.then null, ->
console.log "FAIL"
$el.on "click", ".button-red", (event) ->
$el.on "click", ".button-green", (event) ->
event.preventDefault()
lightboxService.close($el)
$el.on "click", ".button-green", debounce 2000, (event) ->
$el.on "click", ".button-red", debounce 2000, (event) ->
event.preventDefault()
submit()

6
app/locales/taiga/locale-en.json
View File

@ -828,8 +828,10 @@
"SECTION_NAME": "Delete Taiga Account",
"CONFIRM": "Are you sure you want to delete your Taiga account?",
"SUBTITLE": "We're going to miss you! :-(",
"NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore"
"NEWSLETTER_LABEL_TEXT": "I don't wanna receive your newsletter anymore",
"CANCEL": "Back to settings",
"ACCEPT": "Delete account",
"BLOCK_PROJECT": "Note that all your projects owned will be <strong>blocked</strong>. If you do not want to block your projects before deleting your account you can transfer ownership of the project to someone else."
},
"DELETE_PROJECT": {
"TITLE": "Delete project",

13
app/partials/user/lightbox/lightbox-delete-account.jade
View File

@ -2,12 +2,13 @@ a.close(href="", title="{{'close' | translate}}")
svg.icon.icon-close
use(xlink:href="#icon-close")
form
h2.title(translate="LIGHTBOX.DELETE_ACCOUNT.SECTION_NAME")
h2.title(translate="LIGHTBOX.DELETE_ACCOUNT.CONFIRM")
p
span.question(translate="LIGHTBOX.DELETE_ACCOUNT.CONFIRM")
span.subtitle(translate="LIGHTBOX.DELETE_ACCOUNT.SUBTITLE")
p(ng-bind-html="'LIGHTBOX.DELETE_ACCOUNT.BLOCK_PROJECT' | translate")
div.options
a.button-green(href="", title="{{'COMMON.ACCEPT' | translate}}")
span(translate="COMMON.ACCEPT")
a.button-red(href="", title="{{'Cancel' | translate}}", )
span(translate="COMMON.CANCEL")
a.button-green(href="", title="{{'LIGHTBOX.DELETE_ACCOUNT.CANCEL' | translate}}")
span(translate="LIGHTBOX.DELETE_ACCOUNT.CANCEL")
a.button-red(href="", title="{{'LIGHTBOX.DELETE_ACCOUNT.ACCEPT' | translate}}")
span(translate="LIGHTBOX.DELETE_ACCOUNT.ACCEPT")

3
app/styles/modules/common/lightbox.scss
View File

@ -325,6 +325,9 @@
}
.lightbox-delete-account {
p {
text-align: center;
}
form {
flex-basis: 420px;
flex-grow: 0;