Merge pull request #3469 from gratipay/revenue-question

split out revenue model as a separate question

sql/branch.sql

@@ -0,0 +1,5 @@
+BEGIN;
+
+    ALTER TABLE teams ADD COLUMN revenue_model text NOT NULL DEFAULT '';
+
+END;

tests/py/test_teams.py

@@ -12,9 +12,10 @@ class TestNewTeams(Harness):
         'name': 'Gratiteam',
         'homepage': 'http://gratipay.com/',
         'agree_terms': 'true',
-        'product_or_service': 'Sample Product',
-        'getting_paid': 'Getting Paid',
-        'getting_involved': 'Getting Involved'
+        'product_or_service': 'We make widgets.',
+        'revenue_model': 'People pay us',
+        'getting_involved': 'People do stuff.',
+        'getting_paid': 'We pay people.'
     }
 
     def post_new(self, data, auth_as='alice', expected=200):

www/%team/index.html.spt

@@ -45,6 +45,11 @@ title = name = team.name
         {{ markdown.render(team.product_or_service) }}
     </div>
 
+    <h2>{{ _("Revenue Model") }}</h2>
+    <div class="statement profile-statement">
+        {{ markdown.render(team.revenue_model) }}
+    </div>
+
     <h2>{{ _("How to Get Involved") }}</h2>
     <div class="statement profile-statement">
         {{ markdown.render(team.getting_involved) }}

www/new.spt

@@ -61,12 +61,16 @@ title = _("Apply for a New Team")
     <p>{{ _("What product or service does your team provide?") }}</p>
     <textarea name="product_or_service" required></textarea>
 
+    <label><h2>{{ _("Revenue Model") }}</h2></label>
+    <p>{{ _("How does your team make money?") }}</p>
+    <textarea name="revenue_model" required></textarea>
+
     <label><h2>{{ _("Contributing") }}</h2></label>
     <p>{{ _("How can other people get involved with your team?") }}</p>
     <textarea name="getting_involved" required></textarea>
 
-    <label><h2>{{ _("Revenue") }}</h2></label>
-    <p>{{ _("What is your revenue model? How do you share revenue with contributors?") }}</p>
+    <label><h2>{{ _("Paying Contributors") }}</h2></label>
+    <p>{{ _("How do you share revenue with contributors?") }}</p>
     <textarea name="getting_paid" required></textarea>
 
     <br>

www/teams/create.json.spt

@@ -10,8 +10,9 @@ field_names = {
     'name': 'Team Name',
     'homepage': 'Homepage',
     'product_or_service': 'Product or Service',
-    'getting_paid': 'Revenue',
-    'getting_involved': 'Contributing'
+    'revenue_model': 'Revenue Model',
+    'getting_involved': 'Contributing',
+    'getting_paid': 'Paying Contributors'
 }
 
 if user.ANON: