Bug 595320, no more flignits to pick

apps/addons/models.py

@@ -184,8 +184,10 @@ class Addon(amo.models.ModelBase):
                                            nullify_invalid=True, blank=True,
                                            null=True)
 
-    annoying = models.PositiveIntegerField(choices=amo.CONTRIB_CHOICES,
-                                           default=0)
+    annoying = models.PositiveIntegerField(
+        choices=amo.CONTRIB_CHOICES, default=0,
+        help_text="Users will always be asked in the Add-ons"
+                  " Manager (Firefox 4 and above)")
     enable_thankyou = models.BooleanField(default=False,
         help_text="Should the thankyou note be sent to contributors?")
     thankyou_note = TranslatedField()

apps/devhub/templates/devhub/addons/payments.html

@@ -66,11 +66,12 @@
         {{ contrib_form.suggested_amount.errors|safe }}
         <label for="id_suggested_amount">{{ _('What is your suggested contribution?') }}</label>
         <div class="extra">{{ contrib_form.suggested_amount.help_text }}</div>
-        <div>{{ contrib_form.suggested_amount|safe }} USD</div>
+        <div>{{ contrib_form.suggested_amount|safe }} USD {{ _('(Example: 3.99)') }}</div>
       </div>
       <div class="nag">
         {{ contrib_form.annoying.errors|safe }}
         <b>{{ _('When should users be asked for contributions?') }}</b>
+        <div class="extra">{{ contrib_form.annoying.help_text }}</div>
         {{ contrib_form.annoying|safe }}
       </div>
       <div>

media/js/zamboni/devhub.js

@@ -9,6 +9,16 @@ $(document).ready(function() {
     if ($('.payments').length) {
         initPayments();
     }
+
+    // Edit Versions
+    if($('#upload-file').length) {
+        initEditVersions();
+    }
+
+    // View versions
+    if($('#version-list').length) {
+        initVersions();
+    }
 });
 
 
@@ -81,28 +91,6 @@ function addonFormSubmit() {
 $("#user-form-template .email-autocomplete")
     .attr("placeholder", gettext("Enter a new author's email address"));
 
-$(document).ready(function() {
-
-    //Ownership
-    if ($("#author_list").length) {
-        initAuthorFields();
-    }
-
-    //Payments
-    if ($('.payments').length) {
-        initPayments();
-    }
-
-    // Edit Versions
-    if($('#upload-file').length) {
-        initEditVersions();
-    }
-
-    // View versions
-    if($('#version-list').length) {
-        initVersions();
-    }
-});
 
 function initVersions() {
     $('#modals').hide();