diff --git a/frontend/templates/notification/active_campaign/notice.html b/frontend/templates/notification/active_campaign/notice.html index 13930ff0..93aece3e 100644 --- a/frontend/templates/notification/active_campaign/notice.html +++ b/frontend/templates/notification/active_campaign/notice.html @@ -6,7 +6,7 @@
- The rights holder, {{ rightsholder }}, has launched a campaign for {{ campaign.work.title }}! +
The rights holder, {{ rightsholder }}, has launched a campaign for {{ campaign.work.title }}!
Congratulations! You wished for a campaign, and here it is. If ungluers like you pledge {{ campaign.target }} by {{ campaign.deadline|date:"M d, Y" }}, {{ campaign.work.title }} will be released under a Creative Commons license for all to enjoy.
diff --git a/frontend/templates/work.html b/frontend/templates/work.html index e00eea16..80df8d64 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -248,22 +248,10 @@ $j(document).ready(function(){

This work has been claimed by {{ rights_holder_name }}. The claim has been registered and approved by Unglue.It staff.

{% else %} {% if claimstatus == 'disputed' %} -

The rights to this work are disputed.

+

Rights claims are pending.

{% else %} {% if claimstatus == 'one_pending' %} -

This work has been claimed by {{ rights_holder_name }}. The claim is being verified by Unglue.It staff.

- - {% if request.user.rights_holder.all.count %} - Should you be authorized to run campaigns for this work instead? Select a rights holder:

- -
- {% csrf_token %} - {{ claimform.user }} - {{ claimform.work }} - {{ claimform.rights_holder }} - -

- {% endif %} +

This work has been claimed by {{ rights_holder_name }}. The claim is being verified by Unglue.It staff.

{% else %} {% if request.user.rights_holder.all.count %} Is this work yours? Claim it:

diff --git a/static/css/notices.css b/static/css/notices.css index abcfdc45..5d7b9113 100644 --- a/static/css/notices.css +++ b/static/css/notices.css @@ -150,14 +150,16 @@ input[type="submit"] { border: solid 3px #d6dde0; margin: 3px auto; } +.comments div { + float: left; +} .comments .comments_book { padding: 5px; border: solid 5px #EDF3F4; - float: left; margin: 5px; } .comments .comments_info { - float: left; + max-width: 500px; } .comments .comments_info .comments_graphical { border-bottom: solid 1px #d6dde0; @@ -165,5 +167,5 @@ input[type="submit"] { padding-bottom: 5px; } .comments .comments_info .comments_textual { - margin: auto 5px; + margin: 10px 5px auto; } diff --git a/static/less/notices.less b/static/less/notices.less index a7b3de21..2a7eccb8 100644 --- a/static/less/notices.less +++ b/static/less/notices.less @@ -55,16 +55,19 @@ input[type="submit"] { .comments { border: solid 3px @blue-grey; margin: 3px auto; + + div { + float: left; + } .comments_book { .mediaborder; - float: left; margin: 5px; } .comments_info { - float: left; - + max-width: 500px; + .comments_graphical { border-bottom: solid 1px @blue-grey; margin: 5px; @@ -72,7 +75,7 @@ input[type="submit"] { } .comments_textual { - margin: auto 5px; + margin: 10px 5px auto; } } } \ No newline at end of file