This repository has been archived by the owner on Feb 8, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 308
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3707 from gratipay/fold-explore-down
fold explore down
- Loading branch information
Showing
7 changed files
with
42 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,2 @@ | ||
| #homepage { | ||
| h1 { | ||
| font: bold 30px/40px $Ideal; | ||
| text-transform: none; | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| p { | ||
| font: normal 18px/24px $Ideal; | ||
| margin: 0; | ||
| padding: 0 0 24px 0; | ||
| &:last-child { | ||
| padding-bottom: 0; | ||
| } | ||
| } | ||
|
|
||
| #sidebar { | ||
| width: 480px; | ||
| padding: 256px 48px 128px 110px; | ||
| img { | ||
| width: 384px; | ||
| position: absolute; | ||
| top: 48px; | ||
| left: 48px; | ||
| } | ||
| a { | ||
| color: transparentize($gold, 0.2); | ||
| &:hover { | ||
| color: $gold; | ||
| } | ||
| } | ||
| span { | ||
| white-space: nowrap; | ||
| } | ||
| p { | ||
| color: transparentize($white, 0.3); | ||
| } | ||
| } | ||
|
|
||
| #content { | ||
| background: transparentize($white, 0.1); | ||
| padding: 256px 48px 128px; | ||
| color: transparentize($brown, 0.2); | ||
| h1 { color: $brown; } | ||
| a { | ||
| color: transparentize($green, 0.3); | ||
| &:hover { | ||
| color: $green; | ||
| } | ||
| } | ||
|
|
||
| form { | ||
| display: inline; | ||
| } | ||
|
|
||
| div.twitter { | ||
| margin-bottom: 48px; | ||
| button { | ||
| @include has-icon("twitter", 24px, 4px); | ||
| font-size: 24px; | ||
| padding: 10px 24px 10px 18px; | ||
| border-radius: 6px; | ||
| background: $green; | ||
| color: $white; | ||
| &:hover { | ||
| color: $gold; | ||
| border-color: $brown; | ||
| background: $brown; | ||
| } | ||
| } | ||
| } | ||
| .other { | ||
| padding-bottom: 24px; | ||
| font-size: 13px; | ||
| line-height: 18px; | ||
| max-width: 700px; | ||
| display: block; | ||
|
|
||
| .or { | ||
| font: normal 13px/16px $Ideal; | ||
| } | ||
|
|
||
| button { | ||
| border: 1px solid transparentize($brown, 0.2); | ||
| background: transparent; | ||
| color: transparentize($brown, 0.2); | ||
| &:hover { | ||
| color: $gold; | ||
| border-color: $brown; | ||
| background: $brown; | ||
| } | ||
| } | ||
| form.facebook button { @include has-icon("facebook", 13px); } | ||
| form.google button { @include has-icon("google", 13px); } | ||
| form.github button { @include has-icon("github", 13px); } | ||
| form.bitbucket button { @include has-icon("bitbucket", 13px); } | ||
| form.openstreetmap button { @include has-icon("openstreetmap", 13px); } | ||
| } | ||
| } | ||
|
|
||
| .sign-out { | ||
| float: right; | ||
| font-size: 14px; | ||
| line-height: 40px; | ||
| margin-top: -40px; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -125,17 +125,17 @@ def test_error_message_for_slug_collision(self): | |
| assert self.db.one("SELECT COUNT(*) FROM teams") == 1 | ||
| assert "Sorry, there is already a team using 'gratiteam'." in r.body | ||
|
|
||
| def test_approved_team_shows_up_on_explore(self): | ||
| def test_approved_team_shows_up_on_homepage(self): | ||
| self.make_team(is_approved=True) | ||
| assert 'The Enterprise' in self.client.GET("/explore/").body | ||
| assert 'The Enterprise' in self.client.GET("/").body | ||
|
|
||
| def test_unreviewed_team_does_not_show_up_on_explore(self): | ||
| def test_unreviewed_team_does_not_show_up_on_homepage(self): | ||
| self.make_team(is_approved=None) | ||
| assert 'The Enterprise' not in self.client.GET("/explore/").body | ||
| assert 'The Enterprise' not in self.client.GET("/").body | ||
|
|
||
| def test_rejected_team_does_not_show_up_on_explore(self): | ||
| def test_rejected_team_does_not_show_up_on_homepage(self): | ||
| self.make_team(is_approved=False) | ||
| assert 'The Enterprise' not in self.client.GET("/explore/").body | ||
| assert 'The Enterprise' not in self.client.GET("/").body | ||
|
|
||
| def test_stripping_required_inputs(self): | ||
| self.make_participant('alice', claimed_time='now', email_address='[email protected]', last_paypal_result='') | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,3 @@ | ||
| [-----------------------------] | ||
|
|
||
| teams = website.db.all(""" | ||
|
|
||
| SELECT teams.*::teams | ||
| FROM teams | ||
| ORDER BY ctime DESC | ||
|
|
||
| """) | ||
| nteams = len(teams) | ||
| title = _("Explore Teams (N={0})", nteams) | ||
| subhead = _("Teams") | ||
|
|
||
| website.redirect('/') | ||
| [-----------------------------] text/html | ||
| {% extends "templates/base.html" %} | ||
| {% block content %} | ||
| <table class="table"> | ||
| <tr> | ||
| <th>{{ _("Name") }}</th> | ||
| <th>{{ _("Owner") }}</th> | ||
| {% if user.ADMIN %}<th>{{ _("Status") }}</th>{% endif %} | ||
| </tr> | ||
| {% for team in teams %} | ||
| {% if team.is_approved or user.ADMIN %} | ||
| <tr> | ||
| <td><a href="/{{ team.slug }}/">{{ team.name }}</a></td> | ||
| <td><a href="/{{ team.owner }}/">{{ team.owner }}</a></td> | ||
| {% if user.ADMIN %}<td>{{ team.status }}</td>{% endif %} | ||
| </tr> | ||
| {% endif %} | ||
| {% endfor %} | ||
| </table> | ||
| {% endblock %} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters