From 24674d8a2d8c7b569f31bdc972ba665ab778dcb9 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 3 Apr 2012 12:30:34 -0400 Subject: [PATCH 1/3] improving display of active campaign notice --- .../notification/active_campaign/notice.html | 2 +- frontend/templates/work.html | 16 ++-------------- static/css/notices.css | 8 +++++--- static/less/notices.less | 11 +++++++---- 4 files changed, 15 insertions(+), 22 deletions(-) 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 From 49677c3a4526d8ef258da22041cda684351b4608 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 3 Apr 2012 14:58:32 -0400 Subject: [PATCH 2/3] manage campaign links replaced with big green buttons --- frontend/templates/rh_tools.html | 28 +++++++++++++++++++++------- frontend/templates/work.html | 2 +- static/css/documentation.css | 29 +++++++++++++++++++++++++++++ static/less/documentation.less | 29 +++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 8 deletions(-) diff --git a/frontend/templates/rh_tools.html b/frontend/templates/rh_tools.html index 267ff41a..a73b625c 100644 --- a/frontend/templates/rh_tools.html +++ b/frontend/templates/rh_tools.html @@ -21,9 +21,16 @@ Any questions not covered here? Please email us at {{campaign.work.title }} -
Campaign: {{ campaign.name }}
- Status: {{ campaign.status }}
- Created: {{ campaign.created }}
+
+
+
Campaign: {{ campaign.name }}
+ Campaign status: {{ campaign.status }}
+ Created: {{ campaign.created }}
+
+ +
{% endfor %} {% endif %} @@ -36,7 +43,7 @@ Any questions not covered here? Please email us at @@ -53,9 +60,16 @@ Any questions not covered here? Please email us at manage campaign)
- Created: {{ campaign.created }}
- Manager(s): {% for user in campaign.managers.all %} {{ user.username }} {% endfor %}

+
+
+ Name: Your campaign, "{{ campaign.name }}", is {{ campaign.status }}
+ Created: {{ campaign.created }}
+ Manager(s): {% for user in campaign.managers.all %} {{ user.username }} {% endfor %} +
+ +
{% endfor %} {% endif %} {% endif %} diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 80df8d64..b85fa897 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -194,7 +194,7 @@ $j(document).ready(function(){

A campaign is running to unglue {{work.title}}!

The rights holder, {% for claim in work.claim.all %} {% if claim.status == 'active' %} - {{ claim.rights_holder.rights_holder_name }} + {{ claim.rights_holder.rights_holder_name }} {% endif %} {% endfor %} , has agreed to release {{work.title}} to the world as a Creative Commons licensed ebook ({{ work.last_campaign.license }}) if ungluers can join together to raise ${{ work.last_campaign.target }} by {{ work.last_campaign.deadline }}. diff --git a/static/css/documentation.css b/static/css/documentation.css index 3a2d4d27..953abee9 100644 --- a/static/css/documentation.css +++ b/static/css/documentation.css @@ -520,6 +520,35 @@ dd { padding: 5px; border: solid 5px #EDF3F4; } +/* Miscellaneous */ p.pledge_complete { margin: 7px auto; } +a.manage { + background: #8dc63f; + color: white; + font-weight: bold; + padding: 0.5em 1em; + cursor: pointer; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + border: 1px solid #d6dde0; +} +a.manage:hover { + text-decoration: none; +} +.work_campaigns { + border: 1px solid #d6dde0; + margin: 10px auto; +} +.work_campaigns div { + float: left; +} +.work_campaigns div.campaign_info { + width: 60%; + margin: 5px; +} diff --git a/static/less/documentation.less b/static/less/documentation.less index 9553502b..19463394 100644 --- a/static/less/documentation.less +++ b/static/less/documentation.less @@ -241,6 +241,35 @@ dd { } } +/* Miscellaneous */ p.pledge_complete { margin: 7px auto; +} + +a.manage { + background: @call-to-action; + color: white; + font-weight: bold; + padding: 0.5em 1em; + cursor: pointer; + .one-border-radius(5px); + border: 1px solid @blue-grey; + + &:hover { + text-decoration: none; + } +} + +.work_campaigns { + border: 1px solid @blue-grey; + margin: 10px auto; + + div { + float: left; + + &.campaign_info { + width: 60%; + margin: 5px; + } + } } \ No newline at end of file From e03309a88eb142105b5af772ad23d18b052ace08 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Wed, 4 Apr 2012 08:50:06 -0400 Subject: [PATCH 3/3] more user-friendly wording of campaign status. also seeing if i can get this to show up in pivotal [start #27470969] --- frontend/templates/book_panel.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index ce6f16fb..9522a78a 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -129,9 +129,11 @@

{% ifequal status "ACTIVE" %} ${{ work.last_campaign.current_total }} raised of ${{ work.last_campaign.target }} goal - {% else %} - Status: {{ status }} - {% endifequal %} + {% else %}{% ifequal status "INITIALIZED" %} + Status: Coming soon! + {% else %} + Status:  + {% endifequal %}{% endifequal %}
{% if status == 'No campaign yet' or status == 'INITIALIZED' %}