summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 14:21:39 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 14:21:39 +0100
commit3922d6c22c7c148e100eac1635a8d3f0565585db (patch)
treed82dd611096745056d17b237aa4edd3988b42d11
parent6aa43974d4bb674f457833ba6f314bbd7c8a2578 (diff)
downloadgitlab-ce-3922d6c22c7c148e100eac1635a8d3f0565585db.tar.gz
Move (Un)subscribe button below subscription status
-rw-r--r--app/views/shared/issuable/_context.html.haml9
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/shared/issuable/_context.html.haml b/app/views/shared/issuable/_context.html.haml
index 5d00c871080..0b87f11c4db 100644
--- a/app/views/shared/issuable/_context.html.haml
+++ b/app/views/shared/issuable/_context.html.haml
@@ -41,17 +41,16 @@
- subscribed = issuable.subscribed?(current_user)
%div.prepend-top-20.clearfix
.issuable-context-title
- %label
- Subscription:
- %button.btn.btn-block.subscribe-button{:type => 'button'}
- = icon('eye')
- %span= subscribed ? 'Unsubscribe' : 'Subscribe'
+ %label Subscription
- subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed'
.subscription-status{data: {status: subscribtion_status}}
.description-block.unsubscribed{class: ( 'hidden' if subscribed )}
You're not receiving notifications from this thread.
.description-block.subscribed{class: ( 'hidden' unless subscribed )}
You're receiving notifications because you're subscribed to this thread.
+ %button.btn.btn-block.subscribe-button{:type => 'button'}
+ = icon('eye')
+ %span= subscribed ? 'Unsubscribe' : 'Subscribe'
:javascript
new Subscription("#{toggle_subscription_path(issuable)}");