Merge branch 'master' of github.com:Gluejar/regluit into fps

README.md

@@ -43,7 +43,7 @@ Instructions for setting please are slightly different.
 1. create an ubuntu ec2 instance (e.g, go http://alestic.com/ to find various ubuntu images)
 1. `sudo aptitude update`
 1. `sudo aptitude upgrade`
-1. `sudo aptitude install git-core apache libapache2-mod-wsgi mysql-client python-virtualenv python-mysqldb redis-server python-lxml postfix`
+1. `sudo aptitude install git-core apache libapache2-mod-wsgi mysql-client python-virtualenv python-mysqldb redis-server python-lxml postfix python-dev`
 1. `sudo mkdir /opt/regluit`
 1. `sudo chown ubuntu:ubuntu /opt/regluit`
 1. `cd /opt`
@@ -78,7 +78,8 @@ Instructions for setting please are slightly different.
 1. `sudo chmod 755 /etc/init.d/celeryd`
 1. `sudo cp deploy/celeryd.conf /etc/default/celeryd`
 1. `sudo mkdir /var/log/celery`
-1. `sudo chown celery:celery /var/log/celery`
+1. `sudo mkdir /var/run/celery`
+1. `sudo chown celery:celery /var/log/celery /var/run/celery`
 1. `sudo /etc/init.d/celeryd start`
 1. `sudo cp deploy/celerybeat /etc/init.d/celerybeat`
 1. `sudo chmod 755 /etc/init.d/celerybeat`

core/models.py

@@ -103,7 +103,7 @@ class Campaign(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     name = models.CharField(max_length=500, null=True, blank=False)
     description = models.TextField(null=True, blank=False)
-    details = models.TextField(null=True, blank=False)
+    details = models.TextField(null=True, blank=True)
     target = models.DecimalField(max_digits=14, decimal_places=2, null=True, blank=False)
     license = models.CharField(max_length=255, choices = LICENSE_CHOICES, default='CC BY-NC-ND')
     left = models.DecimalField(max_digits=14, decimal_places=2, null=True, blank=False)

frontend/templates/manage_campaign.html

@@ -52,11 +52,9 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
         <p>End Date: {{ campaign.deadline|date:"M d, Y" }}</p>
         <p>Campaign status: {{ campaign.status }}</p>
     </div>
-    {% ifequal campaign.status 'INITIALIZED' %}
     <div>
         <a href="{% url work_preview campaign.work.id %}" class="manage">Preview This Campaign</a>
     </div>
-    {% endifequal %}
 <h3>Description of the work offered for ungluing</h3>
 <form action="#" method="POST">
 {% csrf_token %}
@@ -72,7 +70,7 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
 <p>will display as <a href="http://www.archive.org">the Internet Archive</a>.</p>
 <p>Copy-paste the code above and substitute your own values.  You will find the link address in the location bar of your browser.</p>
 </div></li>
-<li>Anything especially appealing about the work or author: awards, embedded video (460px max), etc. <span class="rh_help" id="helpEmbed">(How do I embed video?)</span>
+<li>Anything especially appealing about the work or author: awards, embedded video (445px max), etc. <span class="rh_help" id="helpEmbed">(How do I embed video?)</span>
 <div id="helpEmbed2" class="rh_answer">
 <p>To embed a video from YouTube:</p>
 <p>Go to the page where you watch the video.  Under the video, click "Share".</p>
@@ -88,17 +86,13 @@ Or, <a href="{% url rightsholders %}">go back</a> to rights holder tools page.<b
 <p>Make it concise and emotionally appealing.  The point here is not to tell ungluers everything about your book; it's to remind them why they love it.</p>
 {{ form.description.errors }}{{ form.description }}
 <h3>Offer details</h3>
-<p>This will be displayed on the Details tab for your work.  It gives additional information for the highly curious.  It should include:</p>
+<p>This will be displayed on the Details tab for your work.  It's the fine print for your offer.  For example, if your unglued edition will exclude certain illustrations due to rights issues, or otherwise differ from existing editions, this is the place to disclose that.  If your offer doesn't have any fine print, you can leave this blank.</p>
-<ul class="terms">
-<li>Details about the edition being offered.</li>
-<li>Hyperlinks for the author(s), publisher making the offer, or for the work itself.</li>
-</uL>
 {{ form.details.errors }}{{ form.details }}
 <h3>Target Price</h3>
 <p> This is the target price for your campaign. Once you launch the campaign, you won't be able to increase it.</p>
 {{ form.target.errors }}{{ form.target }}
 <h3>License being offered</h3>
-<p> This is the license you are offering to use once the campaign succeeds. For more info on the licenses you can use, see <a href="http://creativecommons.org/">Creative Commons</a></p>
+<p> This is the license you are offering to use once the campaign succeeds. For more info on the licenses you can use, see <a href="http://creativecommons.org/licenses">Creative Commons: About the Licenses</a>.</p>
 {{ form.license.errors }}{{ form.license }}
 <h3>Ending date</h3>
 <p> This is the ending date of your campaign. Once you launch the campaign, you won't be able to change it. 
@@ -110,6 +104,8 @@ The ending date can't be more than six months away- that's a practical limit for
 <p> If your campaign succeeds, the funds raised (less commission and fees) will be deposited in a paypal account bearing this email address.</p>
 <p>{{ form.paypal_receiver.errors }}{{ form.paypal_receiver }}</p>
 
+<p>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 (<a href="mailto:amecke@gluejar.com">amecke@gluejar.com</a>) or Andromeda (<a href="mailto:andromeda@gluejar.com">andromeda@gluejar.com</a>).</p>
+
 {% ifequal campaign.status 'ACTIVE' %}
 <input type="submit" name="save" value="Modify Campaign" />
 {% else %}

frontend/templates/work.html

@@ -182,8 +182,7 @@ $j(document).ready(function(){
                     <ul class="tabs">
                         <li class="tabs1 {% if activetab == '1' %}active{% endif %}"><a href="#">{% if status == 'ACTIVE' %}Campaign{% else %}Description{% endif %}</a></li>
                         <li class="tabs2 {% if activetab == '2' %}active{% endif %}"><a href="#">Comments {% if comment_count > 0 %}({{ comment_count }}){% endif %}</a></li>
-                        {# the number of supporters currently commented out because they are overflowing the tab space #}
+                        <li class="tabs3 {% if activetab == '3' %}active{% endif %}" id="supporters"><a href="#">Ungluers {% if wishers > 0 %}({{ wishers }}){% endif %}</a></li>
-                        <li class="tabs3 {% if activetab == '3' %}active{% endif %}" id="supporters"><a href="#">Supporters {# {% if wishers > 0 %}({{ wishers }}){% endif %} #}</a></li>
                         <li class="tabs4 {% if activetab == '4' %}active{% endif %}"><a href="#">Rights</a></li>
                     </ul>
                         

settings/prod.py

@@ -23,6 +23,7 @@ DATABASES = {
         'PASSWORD': 'unglue1t',
         'HOST': 'production.cboagmr25pjs.us-east-1.rds.amazonaws.com',
         'PORT': '',
+        'TEST_CHARSET': 'utf8',
     }
 }
 
@@ -124,4 +125,4 @@ STATIC_ROOT = '/var/www/static'
 
 # Amazon credentials (for fps)
 AWS_ACCESS_KEY = ''
-AWS_SECRET_ACCESS_KEY = ''
+AWS_SECRET_ACCESS_KEY = ''