From ce36f6771dc720ce2f6274d144972250388646cd Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 1 May 2012 09:56:19 -0400 Subject: [PATCH 1/5] css changes per Stefan, part 1 --- frontend/templates/book_panel.html | 22 +++++++------- .../wishlist_unglued_book_released/full.txt | 4 +-- frontend/templates/pledge.html | 30 +++++++++++-------- frontend/templates/supporter.html | 20 +++++++------ frontend/templates/work.html | 4 +-- frontend/views.py | 8 ++++- static/css/campaign.css | 22 ++++++++++---- static/css/pledge.css | 13 +++++--- static/css/sitewide.css | 6 ++-- static/less/campaign.less | 10 +++++++ static/less/pledge.less | 15 +++++++--- static/less/sitewide.less | 2 +- 12 files changed, 102 insertions(+), 54 deletions(-) diff --git a/frontend/templates/book_panel.html b/frontend/templates/book_panel.html index 9d64d65e..094e161c 100644 --- a/frontend/templates/book_panel.html +++ b/frontend/templates/book_panel.html @@ -53,6 +53,17 @@ {% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %}{% endif %} + {% comment %}link to work page{% endcomment %} +
+ More Info +
+ + {% comment %}bibliographic data{% endcomment %} +
+

{{ work.title }}

+

{{ author }}

+
+ {% comment %}status of book vis-a-vis user's wishlist{% endcomment %} {% if works and activetab %}
@@ -82,17 +93,6 @@
{% endif %}{% endif %}{% endifequal %}{% endif %}{% endif %} - {% comment %}bibliographic data{% endcomment %} -
-

{{ work.title }}

-

{{ author }}

-
- - {% comment %}link to work page{% endcomment %} -
- More Info -
-
diff --git a/frontend/templates/notification/wishlist_unglued_book_released/full.txt b/frontend/templates/notification/wishlist_unglued_book_released/full.txt index c0ace2aa..d935fd96 100644 --- a/frontend/templates/notification/wishlist_unglued_book_released/full.txt +++ b/frontend/templates/notification/wishlist_unglued_book_released/full.txt @@ -20,7 +20,7 @@ URL: {{ ebook.url }} {% if work.ebooks.0.rights == 'PD-US' %} A public domain ebook belongs to all of us. You can do anything you like with it. {% else %} -The Creative Commons licensing terms for allow you to redistribute the files under the specified license terms. There's no DRM. +The Creative Commons licensing terms for {{ work.title }} allow you to redistribute the files under the specified license terms. There's no DRM. For full details, see http://creativecommons.org/licenses/. {% endif %} {% if work.last_campaign_status == 'SUCCESSFUL' %} @@ -33,4 +33,4 @@ Thanks, Your Tireless Unglue.it Staff -Give ebooks to the world; give income to authors and publishers. Unglue.it +Give ebooks to the world; give income to authors and publishers. Unglue.it \ No newline at end of file diff --git a/frontend/templates/pledge.html b/frontend/templates/pledge.html index 5f6bfbe7..42ff5bdd 100644 --- a/frontend/templates/pledge.html +++ b/frontend/templates/pledge.html @@ -10,16 +10,29 @@ {% endblock %} {% block doccontent %} -
+
-
+
{{ work.title }}
-

{{ work.title }}

-

{{ work.author }}

-

{{ work.publication_date }}

+
+

{{ work.title }}

+
+
+

{{ work.author }}

+

{{ pubdate }}

+
+
+
+ +
+
+ ${{ work.last_campaign.target }} needed by
+ {{ work.last_campaign.deadline }} +
+
@@ -32,13 +45,6 @@
-
-
- ${{ work.last_campaign.target }} needed by
- {{ work.last_campaign.deadline }} -
-
-
diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index 22dd423c..a5a0a150 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -255,19 +255,20 @@ there's no tab for seeing ALL my books, only the filters! huh.
+ + {% if not works %} + + {% comment %} + if we're in empty-wishlist, slideshow mode, suppress tab area + {% endcomment %} +
- - - - {% if not works %} - {% comment %} - don't let people toggle views if we're doing the slideshow -- it'll look weird - {% endcomment %} +
  • View As:
  • @@ -281,14 +282,15 @@ there's no tab for seeing ALL my books, only the filters! huh.
- {% endif %}
+ {% endif %} +
{% ifequal wishlist.works.all.count 0 %} {% ifequal request.user supporter %}
-
You haven't wishlisted anything yet. Can we help?

+

Add a book to your wishlist to get started.



diff --git a/frontend/templates/work.html b/frontend/templates/work.html index af907d64..74cfcf71 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -114,7 +114,7 @@ $j(document).ready(function(){
{% endif %} {% endif %} -
+
{% if work.first_ebook %}
@@ -139,7 +139,7 @@ $j(document).ready(function(){ {% endfor %}
- {% endif %} + {% endif %}
diff --git a/frontend/views.py b/frontend/views.py index c7b9c6df..164007ac 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -422,8 +422,14 @@ class PledgeView(FormView): form = form_class(data) else: form = form_class() + + try: + pubdate = work.publication_date[:4] + except IndexError: + pubdate = 'unknown' + - context.update({'work':work,'campaign':campaign, 'premiums':premiums, 'form':form, 'premium_id':premium_id, 'faqmenu': 'pledge'}) + context.update({'work':work,'campaign':campaign, 'premiums':premiums, 'form':form, 'premium_id':premium_id, 'faqmenu': 'pledge', 'pubdate':pubdate}) return context def form_valid(self, form): diff --git a/static/css/campaign.css b/static/css/campaign.css index 86a70c58..2a6b7565 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -196,6 +196,7 @@ .book-detail-info > div.layout div.pubinfo { float: left; width: auto; + padding-bottom: 7px; } .book-detail-info > div.layout div.btn_support { float: right; @@ -262,8 +263,7 @@ #tabs-1, #tabs-2, #tabs-3, -#tabs-4, -.more_ebooks { +#tabs-4 { display: none; } #tabs-1.active, @@ -368,6 +368,9 @@ ul.tabs li a:hover, ul.tabs li.active a { div#content-block-content { padding-left: 5px; } +div#content-block-content a { + color: #6994a3; +} .tabs-content { padding-right: 5px; } @@ -538,7 +541,7 @@ ul.support li:hover a { .editions a:hover { text-decoration: underline; } -.show_more_edition,.show_more_ebooks{ +.show_more_edition, .show_more_ebooks { cursor: pointer; } .thank-you { @@ -567,13 +570,18 @@ ul.support li:hover a { padding-bottom: 10px; padding-left: 60px; } -.show_more_edition:hover, -.show_more_ebooks:hover { +.show_more_edition:hover { text-decoration: underline; } .show_more_edition { text-align: right; } +.more_ebooks { + display: none; +} +.show_more_ebooks:hover { + text-decoration: underline; +} .alert > .errorlist { list-style-type: none; font-size: 14px; @@ -598,3 +606,7 @@ ul.support li:hover a { #js-slide .jsmodule { width: 660px !important; } +a { + color: #3d4e53; + font-size: 12px; +} diff --git a/static/css/pledge.css b/static/css/pledge.css index 4b15938d..f271b11a 100644 --- a/static/css/pledge.css +++ b/static/css/pledge.css @@ -100,13 +100,12 @@ cursor: pointer; } .pledge_amount { - margin: auto auto 10px 10px; + padding: 10px; font-size: 17px; + background: #edf3f4; } form.pledgeform { - margin-top: 10px; - padding-top: 10px; - border-top: solid 2px #d6dde0; + width: 470px; } #id_preapproval_amount { width: 50%; @@ -119,3 +118,9 @@ ul.support li, ul.support li:hover { p { margin: 7px auto; } +.jsmodule.pledge { + margin: auto; +} +.jsmodule.pledge .jsmod-content { + float: right !important; +} diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 315a202f..d0edabaa 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -175,9 +175,9 @@ body { bottom: 0; width: 160px; height: 32px; - -moz-border-radius: 32px; - -webkit-border-radius: 32px; - border-radius: 32px; + -moz-border-radius: 10px 10px 0 0; + -webkit-border-radius: 10px 10px 0 0; + border-radius: 10px 10px 0 0; background: #8dc63f; margin-bottom: 0; text-align: center; diff --git a/static/less/campaign.less b/static/less/campaign.less index 646cc416..16ba7d45 100644 --- a/static/less/campaign.less +++ b/static/less/campaign.less @@ -139,6 +139,7 @@ div.pubinfo { float: left; width: auto; + padding-bottom: 7px; } div.btn_support { @@ -328,6 +329,10 @@ ul.tabs { div#content-block-content { padding-left: 5px; + + a { + color: @medium-blue; + } } .tabs-content { @@ -544,3 +549,8 @@ ul.support li { #js-slide .jsmodule { width: 660px !important; } + +a { + color:#3d4e53; + font-size:12px; +} diff --git a/static/less/pledge.less b/static/less/pledge.less index 7a34faab..34209128 100644 --- a/static/less/pledge.less +++ b/static/less/pledge.less @@ -13,14 +13,13 @@ } .pledge_amount { - margin: auto auto 10px 10px; + padding: 10px; font-size: 17px; + background: @pale-blue; } form.pledgeform { - margin-top: 10px; - padding-top: 10px; - border-top: solid 2px @blue-grey; + width: 470px; } #id_preapproval_amount { @@ -35,4 +34,12 @@ ul.support li, ul.support li:hover { p { margin: 7px auto; +} + +.jsmodule.pledge { + margin: auto; + + .jsmod-content { + float: right !important; + } } \ No newline at end of file diff --git a/static/less/sitewide.less b/static/less/sitewide.less index f9e9de51..9a4391cc 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -85,7 +85,7 @@ body{ bottom:0; width:160px; height:32px; - .one-border-radius(32px); + .border-radius(10px, 10px, 0, 0); background: @call-to-action; margin-bottom: 0; text-align: center; From fb5333be2e3c9c6549f4279415a77864721af1c3 Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 1 May 2012 10:02:07 -0400 Subject: [PATCH 2/5] only use role account email addresses in documentation pages --- frontend/templates/faq.html | 4 ++-- frontend/templates/manage_campaign.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/templates/faq.html b/frontend/templates/faq.html index 4a513120..cf00df23 100644 --- a/frontend/templates/faq.html +++ b/frontend/templates/faq.html @@ -367,7 +367,7 @@ Unglue.it signs agreements assuring the copyright status of every work we unglue
What do I need to do to become an authorized Rights Holder on Unglue.it?
-
Contact Amanda Mecke, amecke@gluejar.com, to discuss signing our Platform Services Agreement. This is the first step in being able to make an offer to license, set a monetary goal, and run a campaign on Unglue.it.
+
Contact our Rights Holder Relations team, rights@gluejar.com, to discuss signing our Platform Services Agreement. This is the first step in being able to make an offer to license, set a monetary goal, and run a campaign on Unglue.it.
Do I need to know the exact titles I might want to unglue before I sign the Platform Services Agreement?
@@ -429,7 +429,7 @@ We strongly encourage you to include video. You can upload it to YouTube and em
I need help using social media channels to publicize my campaign.
-
We're developing a social media toolkit for rights holders. Please tell us what you think should be in it so we can serve you better: andromeda@gluejar.com. In the meantime we're happy to help you one-on-one, at the same address.
+
We're developing a social media toolkit for rights holders. Please tell us what you think should be in it so we can serve you better: support@gluejar.com. In the meantime we're happy to help you one-on-one, at the same address.
Can I contact my supporters directly?
We will not provide you contact information, except as needed to fulfill premiums after successful campaigns. Supporters may voluntarily disclose certain contact information (such as Twitter handles) on their profile pages. We encourage you to be thoughtful in your use of this information. Supporters have likely provided it as a way to connect with other like-minded people, not as a marketing tool, so please engage with it in that spirit.
diff --git a/frontend/templates/manage_campaign.html b/frontend/templates/manage_campaign.html index f5fa5e92..6e98213a 100644 --- a/frontend/templates/manage_campaign.html +++ b/frontend/templates/manage_campaign.html @@ -104,7 +104,7 @@ The ending date can't be more than six months away- that's a practical limit for

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 }}

-

We recommend that you save and then preview your campaign before launch. If it doesn't look exactly the way you like, we're happy to help; please email Amanda (amecke@gluejar.com) or Andromeda (andromeda@gluejar.com).

+

We recommend that you save and then preview your campaign before launch. If it doesn't look exactly the way you like, we're happy to help; please email unglue.it support (support@gluejar.com).

{% ifequal campaign.status 'ACTIVE' %} From c0625d78b85279f5fa523209f031f467ae004ed2 Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 1 May 2012 10:54:29 -0400 Subject: [PATCH 3/5] banish isbn 10 display because it might not exist and prefer not to address the issue --- frontend/templates/campaign_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/templates/campaign_detail.html b/frontend/templates/campaign_detail.html index 64f14501..69ac924c 100644 --- a/frontend/templates/campaign_detail.html +++ b/frontend/templates/campaign_detail.html @@ -27,7 +27,7 @@

Target: {{campaign.target}}

Deadline: {{campaign.deadline}}

Status: {{campaign.status}}

-

ISBN: {{campaign.work.editions.all.0.isbn_10}} | {{campaign.work.first_isbn_13}}

+

ISBN: {{campaign.work.first_isbn_13}}

Widget Link

Embed a widget:

From 1c2e48bc87f6f91c0a857606a04cdf94c9c8d05c Mon Sep 17 00:00:00 2001 From: eric Date: Tue, 1 May 2012 10:56:19 -0400 Subject: [PATCH 4/5] added edition to campaign model to allow selection of a preferred edition [finish #28736373] --- .../0031_auto__add_field_campaign_edition.py | 218 ++++++++++++++++++ core/models.py | 21 +- frontend/forms.py | 97 ++++---- frontend/templates/manage_campaign.html | 4 +- frontend/views.py | 15 +- 5 files changed, 300 insertions(+), 55 deletions(-) create mode 100644 core/migrations/0031_auto__add_field_campaign_edition.py diff --git a/core/migrations/0031_auto__add_field_campaign_edition.py b/core/migrations/0031_auto__add_field_campaign_edition.py new file mode 100644 index 00000000..38781190 --- /dev/null +++ b/core/migrations/0031_auto__add_field_campaign_edition.py @@ -0,0 +1,218 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding field 'Campaign.edition' + db.add_column('core_campaign', 'edition', self.gf('django.db.models.fields.related.ForeignKey')(related_name='campaigns', null=True, to=orm['core.Edition']), keep_default=False) + + + def backwards(self, orm): + + # Deleting field 'Campaign.edition' + db.delete_column('core_campaign', 'edition_id') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'core.author': { + 'Meta': {'object_name': 'Author'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'editions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authors'", 'symmetrical': 'False', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'core.campaign': { + 'Meta': {'object_name': 'Campaign'}, + 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'deadline': ('django.db.models.fields.DateTimeField', [], {}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), + 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), + 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), + 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) + }, + 'core.campaignaction': { + 'Meta': {'object_name': 'CampaignAction'}, + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actions'", 'to': "orm['core.Campaign']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '15'}) + }, + 'core.celerytask': { + 'Meta': {'object_name': 'CeleryTask'}, + 'active': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 4, 30, 16, 55, 2, 205843)', 'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True'}), + 'function_args': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'function_name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'task_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tasks'", 'null': 'True', 'to': "orm['auth.User']"}) + }, + 'core.claim': { + 'Meta': {'object_name': 'Claim'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'rights_holder': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.RightsHolder']"}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '7'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['auth.User']"}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.Work']"}) + }, + 'core.ebook': { + 'Meta': {'object_name': 'Ebook'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ebooks'", 'to': "orm['core.Edition']"}), + 'format': ('django.db.models.fields.CharField', [], {'max_length': '25'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'rights': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) + }, + 'core.edition': { + 'Meta': {'object_name': 'Edition'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True'}), + 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) + }, + 'core.identifier': { + 'Meta': {'unique_together': "(('type', 'value'),)", 'object_name': 'Identifier'}, + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'null': 'True', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '4'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '31'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['core.Work']"}) + }, + 'core.premium': { + 'Meta': {'object_name': 'Premium'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) + }, + 'core.rightsholder': { + 'Meta': {'object_name': 'RightsHolder'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rights_holder'", 'to': "orm['auth.User']"}), + 'rights_holder_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'core.subject': { + 'Meta': {'ordering': "['name']", 'object_name': 'Subject'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}), + 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subjects'", 'symmetrical': 'False', 'to': "orm['core.Work']"}) + }, + 'core.userprofile': { + 'Meta': {'object_name': 'UserProfile'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'facebook_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), + 'goodreads_auth_secret': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'goodreads_auth_token': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'goodreads_user_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'goodreads_user_link': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'goodreads_user_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'home_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'librarything_id': ('django.db.models.fields.CharField', [], {'max_length': '31', 'blank': 'True'}), + 'pic_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'tagline': ('django.db.models.fields.CharField', [], {'max_length': '140', 'blank': 'True'}), + 'twitter_id': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'core.waswork': { + 'Meta': {'object_name': 'WasWork'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'moved': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'was': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Work']"}) + }, + 'core.wishes': { + 'Meta': {'object_name': 'Wishes', 'db_table': "'core_wishlist_works'"}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'source': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), + 'wishlist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']"}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishes'", 'to': "orm['core.Work']"}) + }, + 'core.wishlist': { + 'Meta': {'object_name': 'Wishlist'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'wishlist'", 'unique': 'True', 'to': "orm['auth.User']"}), + 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'wishlists'", 'symmetrical': 'False', 'through': "orm['core.Wishes']", 'to': "orm['core.Work']"}) + }, + 'core.work': { + 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), + 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) + } + } + + complete_apps = ['core'] diff --git a/core/models.py b/core/models.py index d27f26a5..296fd0a2 100755 --- a/core/models.py +++ b/core/models.py @@ -115,6 +115,7 @@ class Campaign(models.Model): managers = models.ManyToManyField(User, related_name="campaigns", null=False) # status: INITIALIZED, ACTIVE, SUSPENDED, WITHDRAWN, SUCCESSFUL, UNSUCCESSFUL status = models.CharField(max_length=15, null=True, blank=False, default="INITIALIZED") + edition = models.ForeignKey("Edition", related_name="campaigns", null=True) problems = [] def __unicode__(self): @@ -323,13 +324,13 @@ class Work(models.Model): def cover_image_small(self): try: - return self.editions.all()[0].cover_image_small() + return self.preferred_edition.cover_image_small() except IndexError: return "/static/images/generic_cover_larger.png" def cover_image_thumbnail(self): try: - return self.editions.all()[0].cover_image_thumbnail() + return self.preferred_edition.cover_image_thumbnail() except IndexError: return "/static/images/generic_cover_larger.png" @@ -352,6 +353,13 @@ class Work(models.Model): self._last_campaign_ = None return self._last_campaign_ + @property + def preferred_edition(self): + if self.last_campaign(): + if self.last_campaign().edition: + return self.last_campaign().edition + return self.editions.all()[0] + def last_campaign_status(self): campaign = self.last_campaign() if campaign: @@ -494,7 +502,14 @@ class Edition(models.Model): work = models.ForeignKey("Work", related_name="editions", null=True) def __unicode__(self): - return "%s (%s)" % (self.title, self.isbn_13) + if self.isbn_13: + return "%s (ISBN %s) %s" % (self.title, self.isbn_13, self.publisher) + if self.oclc: + return "%s (OCLC %s) %s" % (self.title, self.oclc, self.publisher) + if self.googlebooks_id: + return "%s (GOOG %s) %s" % (self.title, self.googlebooks_id, self.publisher) + else: + return "%s (GLUE %s) %s" % (self.title, self.id, self.publisher) def cover_image_small(self): if self.googlebooks_id: diff --git a/frontend/forms.py b/frontend/forms.py index 18f4cea6..a763ce9f 100644 --- a/frontend/forms.py +++ b/frontend/forms.py @@ -5,13 +5,14 @@ from django.contrib.auth.models import User from django.conf import settings from django.core.validators import validate_email from django.utils.translation import ugettext_lazy as _ +from django.forms.widgets import RadioSelect from django.forms.extras.widgets import SelectDateWidget from decimal import Decimal as D from selectable.forms import AutoCompleteSelectMultipleWidget,AutoCompleteSelectMultipleField from selectable.forms import AutoCompleteSelectWidget,AutoCompleteSelectField -from regluit.core.models import UserProfile, RightsHolder, Claim, Campaign, Premium, Ebook +from regluit.core.models import UserProfile, RightsHolder, Claim, Campaign, Premium, Ebook, Edition from regluit.core.lookups import OwnerLookup from regluit.utils.localdatetime import now @@ -165,50 +166,56 @@ class CustomPremiumForm(forms.ModelForm): 'type': forms.HiddenInput(attrs={'value':'XX'}), 'limit': forms.TextInput(attrs={'value':'0'}), } - -class ManageCampaignForm(forms.ModelForm): - paypal_receiver = forms.EmailField( - label=_("email address to collect Paypal funds"), - max_length=100, - error_messages={'required': 'You must enter the email associated with your Paypal account.'}, - ) - target = forms.DecimalField( min_value= D('0.00'), error_messages={'required': 'Please specify a target price.'} ) - class Meta: - model = Campaign - fields = 'description', 'details', 'license', 'target', 'deadline', 'paypal_receiver' - widgets = { - 'description': forms.Textarea(attrs={'cols': 80, 'rows': 20}), - 'details': forms.Textarea(attrs={'cols': 80, 'rows': 20}), - 'deadline': SelectDateWidget - } - - def clean_target(self): - new_target = self.cleaned_data['target'] - if self.instance: - if self.instance.status == 'ACTIVE' and self.instance.target < new_target: - raise forms.ValidationError(_('The fundraising target for an ACTIVE campaign cannot be increased.')) - if new_target < D(settings.UNGLUEIT_MINIMUM_TARGET): - raise forms.ValidationError(_('A campaign may not be launched with a target less than $%s' % settings.UNGLUEIT_MINIMUM_TARGET)) - return new_target - - def clean_deadline(self): - new_deadline = self.cleaned_data['deadline'] - if self.instance: - if self.instance.status == 'ACTIVE' and self.instance.deadline != new_deadline: - raise forms.ValidationError(_('The closing date for an ACTIVE campaign cannot be changed.')) - if new_deadline - now() > timedelta(days=int(settings.UNGLUEIT_LONGEST_DEADLINE)): - raise forms.ValidationError(_('The chosen closing date is more than %s days from now' % settings.UNGLUEIT_LONGEST_DEADLINE)) - elif new_deadline - now() < timedelta(days=int(settings.UNGLUEIT_SHORTEST_DEADLINE)): - raise forms.ValidationError(_('The chosen closing date is less than %s days from now' % settings.UNGLUEIT_SHORTEST_DEADLINE)) - return new_deadline - - def clean_license(self): - new_license = self.cleaned_data['license'] - if self.instance: - if self.instance.status == 'ACTIVE' and self.instance.license != new_license: - raise forms.ValidationError(_('The license for an ACTIVE campaign cannot be changed.')) - return new_license - +def getManageCampaignForm ( instance, data=None, *args, **kwargs ): + def get_queryset(): + work=instance.work + return Edition.objects.filter(work = work) + + class ManageCampaignForm(forms.ModelForm): + paypal_receiver = forms.EmailField( + label=_("email address to collect Paypal funds"), + max_length=100, + error_messages={'required': 'You must enter the email associated with your Paypal account.'}, + ) + target = forms.DecimalField( min_value= D('0.00'), error_messages={'required': 'Please specify a target price.'} ) + edition = forms.ModelChoiceField(get_queryset(), widget=RadioSelect(),empty_label='no edition selected') + + class Meta: + model = Campaign + fields = 'description', 'details', 'license', 'target', 'deadline', 'paypal_receiver', 'edition' + widgets = { + 'description': forms.Textarea(attrs={'cols': 80, 'rows': 20}), + 'details': forms.Textarea(attrs={'cols': 80, 'rows': 20}), + 'deadline': SelectDateWidget, + } + + def clean_target(self): + new_target = self.cleaned_data['target'] + if self.instance: + if self.instance.status == 'ACTIVE' and self.instance.target < new_target: + raise forms.ValidationError(_('The fundraising target for an ACTIVE campaign cannot be increased.')) + if new_target < D(settings.UNGLUEIT_MINIMUM_TARGET): + raise forms.ValidationError(_('A campaign may not be launched with a target less than $%s' % settings.UNGLUEIT_MINIMUM_TARGET)) + return new_target + + def clean_deadline(self): + new_deadline = self.cleaned_data['deadline'] + if self.instance: + if self.instance.status == 'ACTIVE' and self.instance.deadline != new_deadline: + raise forms.ValidationError(_('The closing date for an ACTIVE campaign cannot be changed.')) + if new_deadline - now() > timedelta(days=int(settings.UNGLUEIT_LONGEST_DEADLINE)): + raise forms.ValidationError(_('The chosen closing date is more than %s days from now' % settings.UNGLUEIT_LONGEST_DEADLINE)) + elif new_deadline - now() < timedelta(days=int(settings.UNGLUEIT_SHORTEST_DEADLINE)): + raise forms.ValidationError(_('The chosen closing date is less than %s days from now' % settings.UNGLUEIT_SHORTEST_DEADLINE)) + return new_deadline + + def clean_license(self): + new_license = self.cleaned_data['license'] + if self.instance: + if self.instance.status == 'ACTIVE' and self.instance.license != new_license: + raise forms.ValidationError(_('The license for an ACTIVE campaign cannot be changed.')) + return new_license + return ManageCampaignForm(instance = instance, data=data) class CampaignPledgeForm(forms.Form): preapproval_amount = forms.DecimalField( diff --git a/frontend/templates/manage_campaign.html b/frontend/templates/manage_campaign.html index 6e98213a..d4703fe5 100644 --- a/frontend/templates/manage_campaign.html +++ b/frontend/templates/manage_campaign.html @@ -47,7 +47,7 @@ Or, go back to rights holder tools page.Title: {{ campaign.work.title }}

Authors: {{ campaign.work.author }}

Published: {{ campaign.work.publication_date }}

-

Language: {{ campaign.work.editions.all.0.language }}

+

Language: {{ campaign.work.language }}

Target Price: ${{ campaign.target }}

End Date: {{ campaign.deadline|date:"M d, Y" }}

Campaign status: {{ campaign.status }}

@@ -58,6 +58,8 @@ Or, go back to rights holder tools page.Description of the work offered for ungluing
{% csrf_token %} +

Please choose the edition that most closely matches the edition to be unglued: +{{ form.edition.errors }}{{ form.edition }}

This will be displayed in the Campaign tab for your work. It's your main pitch to supporters. It should include:

  • A synopsis of the work.
    • diff --git a/frontend/views.py b/frontend/views.py index c7b9c6df..52e6b675 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -44,7 +44,7 @@ from regluit.core.search import gluejar_search from regluit.core.goodreads import GoodreadsClient from regluit.frontend.forms import UserData, UserEmail, ProfileForm, CampaignPledgeForm, GoodreadsShelfLoadingForm from regluit.frontend.forms import RightsHolderForm, UserClaimForm, LibraryThingForm, OpenCampaignForm -from regluit.frontend.forms import ManageCampaignForm, DonateForm, CampaignAdminForm, EmailShareForm, FeedbackForm +from regluit.frontend.forms import getManageCampaignForm, DonateForm, CampaignAdminForm, EmailShareForm, FeedbackForm from regluit.frontend.forms import EbookForm, CustomPremiumForm, EditManagersForm from regluit.payment.manager import PaymentManager from regluit.payment.models import Transaction @@ -129,8 +129,11 @@ def work(request, work_id, action='display'): activetab = '1'; except: activetab = '1'; - editions = work.editions.all().order_by('-publication_date') campaign = work.last_campaign() + if campaign and campaign.edition: + editions = [campaign.edition] + else: + editions = work.editions.all().order_by('-publication_date') if action == 'preview': work.last_campaign_status = 'ACTIVE' try: @@ -220,9 +223,9 @@ def manage_campaign(request, id): new_premium_form = CustomPremiumForm(data={'campaign': campaign}) else: alerts.append(_('New premium has not been added')) - form = ManageCampaignForm(instance=campaign) + form = getManageCampaignForm(instance=campaign) elif request.POST.has_key('save') or request.POST.has_key('launch') : - form= ManageCampaignForm(instance=campaign, data=request.POST) + form= getManageCampaignForm(instance=campaign, data=request.POST) if form.is_valid(): form.save() alerts.append(_('Campaign data has been saved')) @@ -244,10 +247,10 @@ def manage_campaign(request, id): selected_premium.type = 'XX' selected_premium.save() alerts.append(_('Premium %s has been inactivated'% premium_to_stop)) - form = ManageCampaignForm(instance=campaign) + form = getManageCampaignForm(instance=campaign) new_premium_form = CustomPremiumForm(data={'campaign': campaign}) else: - form = ManageCampaignForm(instance=campaign) + form = getManageCampaignForm(instance=campaign) new_premium_form = CustomPremiumForm(data={'campaign': campaign}) return render(request, 'manage_campaign.html', { From 3deb660ce34b9cb24a78bf121826c9318194ea13 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 1 May 2012 13:49:23 -0400 Subject: [PATCH 5/5] more css tweaks per stefan --- frontend/templates/basepledge.html | 10 +------- frontend/templates/pledge_complete.html | 23 +++++++++++++++-- frontend/templates/slideshow.html | 2 +- frontend/templates/work.html | 21 ++++++++++----- frontend/views.py | 21 ++++++++++++--- static/css/campaign.css | 30 ++++++++-------------- static/css/documentation.css | 5 +--- static/less/campaign.less | 34 ++++++++++--------------- static/less/documentation.less | 6 +---- 9 files changed, 80 insertions(+), 72 deletions(-) diff --git a/frontend/templates/basepledge.html b/frontend/templates/basepledge.html index 44a6715d..15633f2a 100644 --- a/frontend/templates/basepledge.html +++ b/frontend/templates/basepledge.html @@ -30,7 +30,7 @@ $j("#js-leftcol").ready(function() { {% else %}{% if faqmenu == "cancel" %} {% include "faq_pledge_cancel.html" %} {% else %}{% if faqmenu == "complete" %} - {% include "sidebar_pledge_complete.html" %} + {% include "explore.html" %} {% endif %}{% endif %}{% endif %}
@@ -50,14 +50,6 @@ $j("#js-leftcol").ready(function() {
-{% if faqmenu == "complete" %} -
-
-
- {% include "slideshow.html" %} -
-
-{% endif %} {% endblock %} diff --git a/frontend/templates/pledge_complete.html b/frontend/templates/pledge_complete.html index 05a5ed16..a6abf53f 100644 --- a/frontend/templates/pledge_complete.html +++ b/frontend/templates/pledge_complete.html @@ -9,6 +9,7 @@ +