diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-20 16:49:57 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-20 16:49:57 -0500 |
| commit | 0a5e335c5b657f8db38eebf5aab59af3273f49d3 (patch) | |
| tree | 0f19f4ede4de5d241385cd780ff625d5dbb7038e | |
| parent | 8955ed0c599900aed144f52a1f1a9f6b5cbc018a (diff) | |
| parent | 9a91a1e7b42e1decb788ca71f5046bb835babe48 (diff) | |
| download | mediagoblin-0a5e335c5b657f8db38eebf5aab59af3273f49d3.tar.lz mediagoblin-0a5e335c5b657f8db38eebf5aab59af3273f49d3.tar.xz mediagoblin-0a5e335c5b657f8db38eebf5aab59af3273f49d3.zip | |
Merge remote branch 'remotes/schendje/master'
| -rw-r--r-- | mediagoblin/static/css/base.css | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/500.html | 49 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/login.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 4 |
4 files changed, 53 insertions, 4 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 243b299c..51a855be 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -74,7 +74,7 @@ label { font-weight: normal; } -input { +input, textarea { font-size:1em; font-family:'Lato', sans-serif; } diff --git a/mediagoblin/templates/mediagoblin/500.html b/mediagoblin/templates/mediagoblin/500.html new file mode 100644 index 00000000..464630a7 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/500.html @@ -0,0 +1,49 @@ +<!-- +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011 Free Software Foundation, Inc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +--> +<!doctype html> +<html> + <head> + <meta charset="utf-8"> + <title>500 error! GNU MediaGoblin is sorry...</title> + </head> + <body style="text-align:center;font-family: monospace"> + <h1>YEOWCH... that's an error!</h1> + <p> + .-------------------------.<br> + | __ _ |<br> + | -, \_,------,_// |<br> + | <\ ,-- --.\ |<br> + | / ( X) (X ) |<br> + | ' '--, ,--'\ |<br> + | / \ -v-v-u-v / |<br> + | . '.__.--__'.\ |<br> + | / ',___/ / \__/' |<br> + | | | ,'\_'/, || |<br> + | \_| | | | | || |<br> + | W',_ ||| |||_'' |<br> + | | '------'| |<br> + | |__| |_|_ |<br> + | ,,,-' '-,,, |<br> + '-------------------------'<br> + </p> + <p>Something bad happened, and things broke.</p> + <p>If this is not your website, you may want to alert the owner.</p> + <br><br> + <p>Powered... er broken... by <a href="http://www.mediagoblin.org">MediaGoblin</a>, a <a href="http://www.gnu.org">GNU Project</a>.</p> + </body> +</html> diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 8fe45f2d..afbecf20 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -26,7 +26,7 @@ <h1>{% trans %}Log in{% endtrans %}</h1> {% if login_failed %} <div class="form_field_error"> - {% trans %}Login failed!{% endtrans %} + {% trans %}Logging in failed!{% endtrans %} </div> {% endif %} {{ wtforms_util.render_divs(login_form) }} diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index f46871c6..6e54c31d 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -64,10 +64,10 @@ user= request.user['username']) }}"> {{ request.user['username'] }}</a> - (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>) + (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">log out</a>) {% else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> - {% trans %}Login{% endtrans %}</a> + {% trans %}Log in{% endtrans %}</a> {% endif %} </div> </div> |