Merge branch 'update_manage_campaign'

frontend/templates/manage_campaign.html

@@ -240,7 +240,6 @@ Please fix the following before launching your campaign:
 				<span class="menu-item-price">${{ premium.amount|intcomma }}</span>
 				<span class="menu-item-desc">{{ premium.description }}</span>
 			</i>
-			   {% if premium.type %}<span class="custom-premium"> <br />Type: {{ premium.get_type_display }}</span>{% endif %}
 			{% ifnotequal premium.limit 0 %}<br />Limit:  {{ premium.limit }}{% endifnotequal %}
 			{% ifequal premium.type 'CU' %}<br />Deactivate?  <input type="checkbox" name="premium_id" value="{{ premium.id }}" />{% endifequal %}
 			</li>
@@ -251,9 +250,7 @@ Please fix the following before launching your campaign:
 		 {% endif %}
 		</form>
 	</div>
-	<h4>Editing premiums</h4>
+	<h4>Add a premium for this campaign</h4>
-	<p>At this time, you can't edit a premium you've created. But you can deactivate a premium and add a new one to replace it. So be sure to double-check your spelling before adding it.</p>
-	<h4>Add a custom premium for this campaign</h4>
 	<form action="#" method="POST">
 	{% csrf_token %}
 	Pledge Amount: {{ premium_form.amount.errors }}${{ premium_form.amount }}<br />
@@ -264,6 +261,8 @@ Please fix the following before launching your campaign:
 	<br />
 	<input type="submit" name="add_premium" value="Add Premium" />
 	</form>
+	<h4>Editing premiums</h4>
+	<p>At this time, you can't edit a premium you've created. But you can deactivate a premium and add a new one to replace it. So be sure to double-check your spelling before adding it.</p>
 </div>
 
 {% ifequal campaign_status 'INITIALIZED' %}

frontend/views.py

@@ -422,7 +422,7 @@ def manage_campaign(request, id):
         'form':form, 
         'problems': campaign.problems, 
         'alerts': alerts, 
-        'premiums' : campaign.effective_premiums(),
+        'premiums' : campaign.custom_premiums(),
         'premium_form' : new_premium_form,
         'work': work,
         'activetab': activetab,

settings/common.py

@@ -33,6 +33,12 @@ CKEDITOR_RESTRICT_BY_USER = True
 CKEDITOR_CONFIGS = {
     'default': {
         'width': 700,
+        'toolbar': [
+            ['Cut','Copy','Paste', 'PasteFromWord', '-', 'Undo', 'Redo', '-', 'Source'],
+            ['Bold', 'Italic', '-', 'NumberedList','BulletedList', '-','Blockquote'],
+            ['Find','Replace','-', 'Scayt'],
+            ['Link', 'Unlink', '-', 'Image', 'HorizontalRule']
+         ],
     },
 }