From 924e112b8c9ff922b92efe7e63e48968361399fb Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Sat, 20 Aug 2011 22:12:44 +0200
Subject: [PATCH 1/4] Feature #494: login vs. log in -- lots of incorrect usage

---
 mediagoblin/templates/mediagoblin/auth/login.html | 2 +-
 mediagoblin/templates/mediagoblin/base.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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..e147a34b 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -67,7 +67,7 @@
                 (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
               {% else %}
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
-                  {% trans %}Login{% endtrans %}</a>
+                  {% trans %}Log in{% endtrans %}</a>
               {% endif %}
             </div>
           </div>

From 03b058b78e1c27bac3dc61d8bd60801025ec0e7c Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Sat, 20 Aug 2011 22:16:48 +0200
Subject: [PATCH 2/4] Missed one thing for Bug #464

---
 mediagoblin/static/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 }

From 2ff37624ff0d19b5b0dd779e2ec1214d928554b7 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Sat, 20 Aug 2011 22:24:30 +0200
Subject: [PATCH 3/4] Logout -> log out

---
 mediagoblin/templates/mediagoblin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index e147a34b..6e54c31d 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -64,7 +64,7 @@
                                             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 %}Log in{% endtrans %}</a>

From 9a91a1e7b42e1decb788ca71f5046bb835babe48 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Sat, 20 Aug 2011 23:15:00 +0200
Subject: [PATCH 4/4] Add 500.html page

---
 mediagoblin/templates/mediagoblin/500.html | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 mediagoblin/templates/mediagoblin/500.html

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>
+      |&nbsp;&nbsp;&nbsp;&nbsp; __&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;-,&nbsp;\_,------,_//&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<\&nbsp;&nbsp;,--&nbsp;&nbsp;&nbsp;--.\&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/&nbsp;(&nbsp;&nbsp;X)&nbsp;(X&nbsp;&nbsp;)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'&nbsp;&nbsp;'--,&nbsp;,--'\&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;/&nbsp;\&nbsp;-v-v-u-v&nbsp;/&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;'.__.--__'.\&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;/&nbsp;',___/&nbsp;/&nbsp;\__/'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;|&nbsp;&nbsp;&nbsp;,'\_'/,&nbsp;||&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;\_|&nbsp;&nbsp;&nbsp;|&nbsp;|&nbsp;|&nbsp;|&nbsp;||&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;W',_&nbsp;|||&nbsp;|||_''&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;'------'|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|__|&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|_|_&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|<br>
+      |&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;,,,-'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'-,,,&nbsp;&nbsp;&nbsp;&nbsp;                 |<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>