From 73157c872059cd567e3d67783169ccd1944f8768 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 8 May 2012 09:27:03 -0400 Subject: [PATCH] clarified manage campaign workflow --- frontend/templates/manage_campaign.html | 40 +++++++++++++++++++------ frontend/templates/rh_tools.html | 4 +++ static/css/documentation.css | 5 ++++ static/less/documentation.less | 6 ++++ 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/frontend/templates/manage_campaign.html b/frontend/templates/manage_campaign.html index 567de7ef..6a1f6091 100644 --- a/frontend/templates/manage_campaign.html +++ b/frontend/templates/manage_campaign.html @@ -12,7 +12,6 @@ textarea { - - +{% endblock %} +{% block topsection %} {% endblock %} {% block doccontent %} +{% with campaign.status as campaign_status %} {% if campaign.not_manager %}

You're not a manager for campaign: {{ campaign.name }}

{% else %} @@ -88,7 +87,11 @@ Please fix the following before launching your campaign:
- Preview This Campaign + {% ifequal campaign_status 'INITIALIZED' %} + Preview Your Campaign + {% else %} + See Your Campaign + {% endifequal %}
@@ -154,14 +157,15 @@ Please fix the following before launching your campaign:

If your campaign succeeds, the funds raised (less commission and fees) will be deposited in a paypal account bearing this email address.

{{ form.paypal_receiver.errors }}{{ form.paypal_receiver }}

- {% ifequal campaign.status 'ACTIVE' %} + {% ifequal campaign_status 'ACTIVE' %} +
When you click this button, your changes will be visible to supporters immediately. Make sure to proofread!
{% else %} {% endifequal %} - {% ifequal campaign.status 'INITIALIZED' %} + {% if campaign_status == 'INITIALIZED' %} - {% endifequal %} + {% endif %} @@ -191,7 +195,7 @@ Please fix the following before launching your campaign:

Add a custom premium for this campaign

{% csrf_token %} - Pledge Amount: {{ premium_form.amount.errors }}${{ premium_form.amount }}
+ Pledge Amount: {{ premium_form.amount.errors }}{{ premium_form.amount }}
Premium Description: {{ premium_form.description.errors }}{{ premium_form.description }}
Number Available (0 if no limit): {{ premium_form.limit.errors }}{{ premium_form.limit }}
{{ premium_form.campaign }} @@ -201,6 +205,7 @@ Please fix the following before launching your campaign:
+{% ifequal campaign_status 'INITIALIZED' %}
{% if campaign.description and campaign.target and campaign.deadline %}

Before you hit launch:

@@ -219,5 +224,22 @@ Please fix the following before launching your campaign: {% endif %}
+{% endifequal %} + +{% ifequal campaign_status 'ACTIVE' %} +
+

Your campaign is now active! Hooray!

+ +

What to do next

+ +
+{% endifequal %} + {% endif %} +{% endwith %} {% endblock %} \ No newline at end of file diff --git a/frontend/templates/rh_tools.html b/frontend/templates/rh_tools.html index 0a2ca46a..fe4b15dc 100644 --- a/frontend/templates/rh_tools.html +++ b/frontend/templates/rh_tools.html @@ -8,6 +8,10 @@ {% endblock %} + +{% block topsection %} +{% endblock %} + {% block doccontent %}

unglue.it Tools for Rightsholders

diff --git a/static/css/documentation.css b/static/css/documentation.css index 290eac01..7febf335 100644 --- a/static/css/documentation.css +++ b/static/css/documentation.css @@ -569,6 +569,7 @@ a.manage:hover { h2.thank-you { font-size: 34px; color: #8dc63f; + line-height: 40px; } .pledge_complete, .pledge_complete a { font-size: 14px; @@ -591,3 +592,7 @@ ul.social.pledge li { div.pledge-container { width: 100%; } +.yikes { + color: #e35351; + font-weight: bold; +} diff --git a/static/less/documentation.less b/static/less/documentation.less index 63bf01b4..bb4feb19 100644 --- a/static/less/documentation.less +++ b/static/less/documentation.less @@ -292,6 +292,7 @@ a.manage { h2.thank-you { font-size: 34px; color: @call-to-action; + line-height: 40px; } .pledge_complete, .pledge_complete a { @@ -319,4 +320,9 @@ ul.social.pledge { div.pledge-container { width: 100%; +} + +.yikes { + color: @alert; + font-weight: bold; } \ No newline at end of file