Merge pull request #279 from Gluejar/t4u_address_rycomments

T4u address rycomments
pull/1/head
Raymond Yee 2014-01-10 16:36:21 -08:00
commit 0ef2531725
4 changed files with 38 additions and 16 deletions

View File

@ -48,7 +48,7 @@ from regluit.core.models import (
GRAVATAR
)
from regluit.libraryauth.models import Library
from regluit.core.parameters import LIBRARY
from regluit.core.parameters import LIBRARY, REWARDS, BUY2UNGLUE, THANKS
from regluit.core.lookups import (
OwnerLookup,
WorkLookup,
@ -410,13 +410,13 @@ def getManageCampaignForm ( instance, data=None, *args, **kwargs ):
return Edition.objects.filter(work = work)
class ManageCampaignForm(CCDateForm,forms.ModelForm):
target = forms.DecimalField( required= (instance.type in {1,2}))
target = forms.DecimalField( required= (instance.type in {REWARDS, BUY2UNGLUE}))
deadline = forms.DateTimeField(
required = (instance.type==1),
required = (instance.type==REWARDS),
widget = SelectDateWidget(years=date_selector) if instance.status=='INITIALIZED' else forms.HiddenInput
)
cc_date_initial = forms.DateTimeField(
required = (instance.type==2) and instance.status=='INITIALIZED',
required = (instance.type==BUY2UNGLUE) and instance.status=='INITIALIZED',
widget = SelectDateWidget(years=date_selector) if instance.status=='INITIALIZED' else forms.HiddenInput
)
paypal_receiver = forms.EmailField(
@ -433,7 +433,7 @@ def getManageCampaignForm ( instance, data=None, *args, **kwargs ):
widgets = { 'deadline': SelectDateWidget }
def clean_target(self):
if self.instance.type == 3:
if self.instance.type == THANKS:
return None
new_target = super(ManageCampaignForm,self).clean_target()
if self.instance:
@ -442,7 +442,7 @@ def getManageCampaignForm ( instance, data=None, *args, **kwargs ):
return new_target
def clean_cc_date_initial(self):
if self.instance.type in {1,3} :
if self.instance.type in {REWARDS,THANKS} :
return None
if self.instance:
if self.instance.status != 'INITIALIZED':
@ -451,7 +451,7 @@ def getManageCampaignForm ( instance, data=None, *args, **kwargs ):
return super(ManageCampaignForm,self).clean_cc_date_initial()
def clean_deadline(self):
if self.instance.type in {2,3} :
if self.instance.type in {BUY2UNGLUE, THANKS} :
return None
new_deadline_date = self.cleaned_data['deadline']
new_deadline= new_deadline_date + timedelta(hours=23,minutes=59)

View File

@ -3,12 +3,12 @@
You are now free to start a campaign to sell or unglue your work. If you're logged in, you will see the option to open a campaign at https://{{ current_site.domain }}/rightsholders . (You can also find this page by clicking on "Rights Holder Tools" at the bottom of any Unglue.it page.)
To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. This will appear in the Description tab on your book's page (https://{{ current_site.domain }}{% url work claim.work.id %}). Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. Feel free to email us (rights@gluejar.com) if you need any help with this.
To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. For Pledge-to-Unglue and Buy-to-Unglue campaigns, this will appear in the Description tab on your book's page (https://{{ current_site.domain }}{% url work claim.work.id %}). Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. For Thanks-for-Ungluing, your pitch will occur when the user clicks a Download button. You should emphasize how the ungluer's support enables you to keep doing what you do. Feel free to email us (rights@gluejar.com) if you need any help with this.
If you're running a Buy-to-Unglue or Thanks-for-Ungluing Campaign, now is the time to upload your digital files. For Buy-to-Unglue, you need to decide on revenue targets and pricing for individual and library licenses.
If you're running a Pledge Campaign, you need to decide on a funding target, and you should also come up with some custom premiums to reward ungluers for supporting your book. Again, we can help you if you need ideas for what these should be or how to price them.
If you're running a Buy-to-Unglue Campaign, now is the time to upload your EPUB file and decide on revenue targets and pricing for individual and library licenses.
Finally, think about how you're going to publicize your campaign: social media, newsletters, media contacts, professional organizations, et cetera. Have a plan for how to reach out to these potential supporters before you launch your campaign. Your supporters' sense of connection with you and your book is key to your campaign's success. Again, email us if you'd like help.
We're thrilled to be working with you.

View File

@ -12,7 +12,19 @@
{{ claim.rights_holder }}'s Claim to {{ claim.work.title }} is now {{ claim.status }}.
<br /><br />
{% ifequal claim.status 'active' %}
To get started on the on a campaign, please visit <a href="{% url rightsholders %}">rights holder tools page</a> (also available through a link at the bottom of every page). Contact us at support@gluejar.com if you need any help.
{{ claim.rights_holder }}'s claim to {{ claim.work }} on Unglue.it has been approved.
<br /><br />
You are now free to start a campaign to sell or unglue your work. If you're logged in, you can <a href="{% url rightsholders %}">open a campaign</a>. (You can also find this page by clicking on "Rights Holder Tools" at the bottom of any Unglue.it page.)
<br /><br />
To run a campaign, you'll need to set up campaign parameters. You'll also need to write a pitch. For Pledge-to-Unglue and Buy-to-Unglue campaigns, this will appear in the Description tab on your book's <a href="{% url work claim.work.id %}">work page</a>. Think about who your book's audience is, and remind them why they'll love this book -- your pitch is not a catalog page! We encourage video, audio, and links to make your pitch come alive. For Thanks-for-Ungluing, your pitch will occur when the user clicks a Download button. You should emphasize how the ungluer's support enables you to keep doing what you do. Feel free to email us (rights@gluejar.com) if you need any help with this.
<br /><br />
If you're running a Buy-to-Unglue or Thanks-for-Ungluing Campaign, now is the time to upload your digital files. For Buy-to-Unglue, you need to decide on revenue targets and pricing for individual and library licenses.
<br /><br />
If you're running a Pledge Campaign, you need to decide on a funding target, and you should also come up with some custom premiums to reward ungluers for supporting your book. Again, we can help you if you need ideas for what these should be or how to price them.
<br /><br />
Finally, think about how you're going to publicize your campaign: social media, newsletters, media contacts, professional organizations, et cetera. Have a plan for how to reach out to these potential supporters before you launch your campaign. Your supporters' sense of connection with you and your book is key to your campaign's success. Again, email us if you'd like help.
We're thrilled to be working with you.
{% endifequal %}
{% ifequal claim.status 'pending' %}
The claim will be examined, and we'll email you. Contact us at support@gluejar.com if you need any help.

View File

@ -44,18 +44,28 @@ Any questions not covered here? Please email us at <a href="mailto:rights@gluej
<h2>Campaigns You Manage</h2>
<dl>
{% for campaign in campaigns %}
<dt>Work: <a href="{% url work work_id=campaign.work.id %}">{{campaign.work.title }}</a></dt>
<dt><a href="{% url work work_id=campaign.work.id %}">{{campaign.name }}</a></dt>
<dd>
<div class="work_campaigns clearfix">
<div class="campaign_info">
Campaign: {{ campaign.name }}<br />
{% ifequal campaign.type 1 %}
<b>Pledge Campaign</b><br />
Campaign status: {{ campaign.status }} <br />
Created: {{ campaign.created }}<br />
{% ifequal campaign.type 1 %}
${{ campaign.current_total }} pledged of ${{ campaign.target }}, {{ campaign.supporters_count }} supporters
{% else %}
{% endifequal %}
{% ifequal campaign.type 2 %}
<b>Buy-to-Unglue Campaign</b><br />
Campaign status: {{ campaign.status }} <br />
Created: {{ campaign.created }}<br />
${{ campaign.current_total }} sold. ${{ campaign.target }} to go. Ungluing Date: {{ campaign.cc_date }}
{% endifequal %}
{% ifequal campaign.type 3 %}
<b>Thanks-for-Ungluing Campaign</b><br />
Campaign status: {{ campaign.status }} <br />
Created: {{ campaign.created }}<br />
${{ campaign.current_total }} raised from {{ campaign.supporters_count }} supporters.
{% endifequal %}
</div>
{% if campaign.status = 'ACTIVE' or campaign.status = 'INITIALIZED' %}
<div>
@ -116,7 +126,7 @@ Any questions not covered here? Please email us at <a href="mailto:rights@gluej
<div class="work_campaigns clearfix">
{% if campaign.status = 'ACTIVE' or campaign.status = 'INITIALIZED' %}
<div class="campaign_info">
Name: Your campaign, "{{ campaign.name }}", is {{ campaign.status }}<br />
Your {{ campaign.get_type_display }}, "{{ campaign.name }}", is {{ campaign.status }}<br />
Created: {{ campaign.created }}<br />
Manager(s): {% for user in campaign.managers.all %} <a href="{% url supporter user.username %}">{{ user.username }} </a> {% endfor %}
<form method="POST" action="#">{% csrf_token %}