diff --git a/sql/branch.sql b/sql/branch.sql new file mode 100644 index 0000000000..9f4eb43afe --- /dev/null +++ b/sql/branch.sql @@ -0,0 +1,5 @@ +BEGIN; + + ALTER TABLE teams ADD COLUMN revenue_model text NOT NULL DEFAULT ''; + +END; diff --git a/tests/py/test_teams.py b/tests/py/test_teams.py index 4285ecc78b..4367569060 100644 --- a/tests/py/test_teams.py +++ b/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): diff --git a/www/%team/index.html.spt b/www/%team/index.html.spt index 6ca978b64f..07e1f086f7 100644 --- a/www/%team/index.html.spt +++ b/www/%team/index.html.spt @@ -45,6 +45,11 @@ title = name = team.name {{ markdown.render(team.product_or_service) }} +

{{ _("Revenue Model") }}

+
+ {{ markdown.render(team.revenue_model) }} +
+

{{ _("How to Get Involved") }}

{{ markdown.render(team.getting_involved) }} diff --git a/www/new.spt b/www/new.spt index d18a64be6c..9c86244d36 100644 --- a/www/new.spt +++ b/www/new.spt @@ -61,12 +61,16 @@ title = _("Apply for a New Team")

{{ _("What product or service does your team provide?") }}

+ +

{{ _("How does your team make money?") }}

+ +

{{ _("How can other people get involved with your team?") }}

- -

{{ _("What is your revenue model? How do you share revenue with contributors?") }}

+ +

{{ _("How do you share revenue with contributors?") }}


diff --git a/www/teams/create.json.spt b/www/teams/create.json.spt index 2194fb17d1..56fa6518de 100644 --- a/www/teams/create.json.spt +++ b/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: