Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

split out revenue model as a separate question #3469

Merged
merged 1 commit into from
May 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sql/branch.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
BEGIN;

ALTER TABLE teams ADD COLUMN revenue_model text NOT NULL DEFAULT '';

END;
7 changes: 4 additions & 3 deletions tests/py/test_teams.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 5 additions & 0 deletions www/%team/index.html.spt
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down
8 changes: 6 additions & 2 deletions www/new.spt
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions www/teams/create.json.spt
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down