Merge lp:~cjohnston/loco-team-portal/ui-changes into lp:loco-team-portal

[Chris Johnston]

UI Changes

=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot	2010-08-17 00:25:27 +0000
+++ loco_directory/locale/loco-directory.pot	2010-08-17 00:47:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-16 19:38+0000\n"
+"POT-Creation-Date: 2010-08-17 00:44+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -303,11 +303,16 @@
 msgstr ""
 
 #: templates/404.html:4
-msgid " The Page does not exist | Ubuntu LoCo Team Directory"
+msgid "This Page Does Not Exist"
+msgstr ""
+
+#: templates/404.html:4 templates/500.html:4 templates/about.html:4
+#: templates/base.html:4 templates/index.html:13 templates/loco_council.html:4
+msgid "Ubuntu LoCo Team Directory"
 msgstr ""
 
 #: templates/404.html:10
-msgid "The Page does not Exist!"
+msgid "This Page Does Not Exist!"
 msgstr ""
 
 #: templates/404.html:14
@@ -327,12 +332,12 @@
 "If you believe the reason you are here is a bug in the LoCo Directory please "
 msgstr ""
 
-#: templates/404.html:19 templates/500.html:15 templates/about.html:32
+#: templates/404.html:19 templates/500.html:15 templates/about.html:31
 msgid "Report it!"
 msgstr ""
 
 #: templates/500.html:4
-msgid " The team does not exist | Ubuntu LoCo Team Directory"
+msgid "This Team Does Not Exist"
 msgstr ""
 
 #: templates/500.html:11
@@ -352,93 +357,97 @@
 msgstr ""
 
 #: templates/about.html:4
-msgid " About LoCo Team Directory | Ubuntu LoCo Team Directory"
+msgid "About the LoCo Team Directory"
 msgstr ""
 
 #: templates/about.html:12
-msgid "What is the LoCo Directory?"
+msgid "What is the LoCo Team Directory?"
 msgstr ""
 
 #: templates/about.html:13
 msgid ""
-"The LoCo Directory is a place where you can find information regarding LoCo "
-"Teams. It was originally developed by <a href='https://launchpad.net/"
+"The LoCo Team Directory is a place where you can find information regarding "
+"LoCo Teams. It was originally developed by <a href='https://launchpad.net/"
 "~nixternal'>Richard Johnson</a> and further development has been made "
 "possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo "
 "Directory Developers</a>."
 msgstr ""
 
-#: templates/about.html:14
+#: templates/about.html:13
 msgid ""
-"The LoCo Directory is made available under the <a href='http://www.gnu.org/"
-"licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>."
+"The LoCo Team Directory is made available under the <a href='http://www.gnu."
+"org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>."
+msgstr ""
+
+#: templates/about.html:20
+msgid "The Directory Data"
 msgstr ""
 
 #: templates/about.html:21
-msgid "The Directory Data"
+msgid ""
+"The LoCo Team Directory comes from two sources, <a href='https://launchpad."
+"net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/"
+"launchpadlib'>APIs</a>. The data that the LoCo Team Directory gathers is "
+"also made available as  <a href='/data/xml'>XML</a> format to interoperate "
+"with other web apps and for possible mashups."
 msgstr ""
 
 #: templates/about.html:22
 msgid ""
-"The LoCo Directory comes from two sources, <a href='https://launchpad."
-"net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/"
-"launchpadlib'>APIs</a>. The data that the LoCo Directory gathers is also "
-"made available as  <a href='/data/xml'>XML</a> format to interoperate with "
-"other web apps and for possible mashups."
+"The LoCo Team Directory is made available under the <a href='http://www.gnu."
+"org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is "
+"available in <a href='https://code.launchpad.net/loco-directory'>Launchpad "
+"Code Hosting</a>."
 msgstr ""
 
-#: templates/about.html:23
-msgid ""
-"The LoCo Directory is made available under the <a href='http://www.gnu.org/"
-"licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is available "
-"in <a href='https://code.launchpad.net/loco-directory'>Launchpad Code "
-"Hosting</a>."
+#: templates/about.html:26
+msgid "Contribute to the LoCo Team Directory!"
 msgstr ""
 
 #: templates/about.html:27
-msgid "Contribute to LoCo Directory!"
-msgstr ""
-
-#: templates/about.html:28
 msgid "You can make it better:"
 msgstr ""
 
-#: templates/about.html:30
+#: templates/about.html:29
 msgid "Have an Idea?"
 msgstr ""
 
-#: templates/about.html:30
+#: templates/about.html:29
 msgid "Write a blueprint!"
 msgstr ""
 
-#: templates/about.html:31
+#: templates/about.html:30
 msgid ""
 "Help <a href='https://translations.launchpad.net/loco-directory'>Translate!</"
 "a>"
 msgstr ""
 
-#: templates/about.html:32
+#: templates/about.html:31
 msgid "Found a bug,"
 msgstr ""
 
-#: templates/about.html:33
+#: templates/about.html:32
 msgid "Help with code,"
 msgstr ""
 
-#: templates/about.html:33
+#: templates/about.html:32
 msgid "Get the code!"
 msgstr ""
 
-#: templates/about.html:36
+#: templates/about.html:35
 msgid "Need to know more,"
 msgstr ""
 
-#: templates/about.html:36
+#: templates/about.html:35
 msgid "just ask!"
 msgstr ""
 
-#: templates/base.html:4 templates/index.html:13
-msgid "Ubuntu LoCo Team Directory"
+#: templates/about.html:41
+msgid "Coming Soon!"
+msgstr ""
+
+#: templates/about.html:43
+msgid "Future additions to this site will include:"
 msgstr ""
 
 #: templates/base.html:6
@@ -486,7 +495,11 @@
 msgid "Logged in as"
 msgstr ""
 
-#: templates/base.html:56
+#: templates/base.html:57
+msgid "About the LoCo Team Directory Project"
+msgstr ""
+
+#: templates/base.html:58
 msgid "LoCo Directory"
 msgstr ""
 
@@ -548,16 +561,8 @@
 msgid "Microblogging"
 msgstr ""
 
-#: templates/index.html:57
-msgid "Coming Soon!"
-msgstr ""
-
-#: templates/index.html:59
-msgid "Future additions to this site will include:"
-msgstr ""
-
-#: templates/loco_council.html:4
-msgid " Ubuntu LoCo Council | Ubuntu LoCo Team Directory"
+#: templates/loco_council.html:4 templates/loco_council.html.py:14
+msgid "Ubuntu LoCo Council"
 msgstr ""
 
 #: templates/loco_council.html:7
@@ -568,10 +573,6 @@
 msgid "Meeting Agenda"
 msgstr ""
 
-#: templates/loco_council.html:14
-msgid "Ubuntu LoCo Council"
-msgstr ""
-
 #: templates/loco_council.html:17
 msgid ""
 "The Ubuntu LoCo Council is comprised of elected, dedicated members of the "

=== modified file 'loco_directory/templates/404.html'
--- loco_directory/templates/404.html	2010-06-24 19:18:57 +0000
+++ loco_directory/templates/404.html	2010-08-17 00:47:38 +0000
@@ -1,13 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %} {% trans " The Page does not exist | Ubuntu LoCo Team Directory" %} {% endblock %}
+{% block title %} {% trans "This Page Does Not Exist" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block content %}
 
 <article class="main-content">
 
-<h2>{% trans "The Page does not Exist!" %}</h2>
+<h2>{% trans "This Page Does Not Exist!" %}</h2>
 
 <p>
 <ul>

=== modified file 'loco_directory/templates/500.html'
--- loco_directory/templates/500.html	2010-06-24 19:18:57 +0000
+++ loco_directory/templates/500.html	2010-08-17 00:47:38 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %} {% trans " The team does not exist | Ubuntu LoCo Team Directory" %} {% endblock %}
+{% block title %} {% trans "This Team Does Not Exist" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav %}{% endblock %}
 

=== modified file 'loco_directory/templates/about.html'
--- loco_directory/templates/about.html	2010-07-17 14:48:47 +0000
+++ loco_directory/templates/about.html	2010-08-17 00:47:38 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %} {% trans " About LoCo Team Directory | Ubuntu LoCo Team Directory" %} {% endblock %}
+{% block title %} {% trans "About the LoCo Team Directory" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav %}{% endblock %}
 
@@ -9,9 +9,8 @@
 
 
 <article class="main-content leading">
-  <h2>{% trans "What is the LoCo Directory?" %}</h2>
-    <p>{% trans "The LoCo Directory is a place where you can find information regarding LoCo Teams. It was originally developed by <a href='https://launchpad.net/~nixternal'>Richard Johnson</a> and further development has been made possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo Directory Developers</a>." %}
-{% trans "The LoCo Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>." %}
+    <h2>{% trans "What is the LoCo Team Directory?" %}</h2>
+    <p>{% trans "The LoCo Team Directory is a place where you can find information regarding LoCo Teams. It was originally developed by <a href='https://launchpad.net/~nixternal'>Richard Johnson</a> and further development has been made possible by the <a href='https://launchpad.net/~loco-directory-dev'>The LoCo Directory Developers</a>." %} {% trans "The LoCo Team Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a>." %}
     </p>
 </article>
 
@@ -19,12 +18,12 @@
 
 <article class="minor-content">
 <h2>{% trans "The Directory Data" %}</h2>
-<p>{% trans "The LoCo Directory comes from two sources, <a href='https://launchpad.net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/launchpadlib'>APIs</a>. The data that the LoCo Directory gathers is also made available as  <a href='/data/xml'>XML</a> format to interoperate with other web apps and for possible mashups." %}
-{% trans "The LoCo Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is available in <a href='https://code.launchpad.net/loco-directory'>Launchpad Code Hosting</a>." %}
+<p>{% trans "The LoCo Team Directory comes from two sources, <a href='https://launchpad.net/'>Launchpad</a> and its <a href='https://help.launchpad.net/API/launchpadlib'>APIs</a>. The data that the LoCo Team Directory gathers is also made available as  <a href='/data/xml'>XML</a> format to interoperate with other web apps and for possible mashups." %}
+{% trans "The LoCo Team Directory is made available under the <a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html'>GNU GPL v3</a> and the Code is available in <a href='https://code.launchpad.net/loco-directory'>Launchpad Code Hosting</a>." %}
 </p>
 </article>
 <article class="minor-content">
-<h2>{% trans "Contribute to LoCo Directory!" %}</h2>
+<h2>{% trans "Contribute to the LoCo Team Directory!" %}</h2>
 <p>{% trans "You can make it better:" %}
 <ul>
 <li>{% trans "Have an Idea?" %} <a href='https://blueprints.launchpad.net/loco-directory'>{% trans "Write a blueprint!" %}</a></li>
@@ -34,5 +33,18 @@
 </ul>
 </p>
 <p>{% trans "Need to know more," %} <a href='https://answers.launchpad.net/loco-directory'>{% trans "just ask!" %}</a></p>
+
+<hr class="divide" />
+
 </article>
+		<article class="minor-content">
+        <h2>{% trans "Coming Soon!" %}</h2>
+        <p>
+          {% trans "Future additions to this site will include:" %}
+          <ul>
+            <li>Team Collaboration</li>
+            <li>Various mashups</li>
+          </ul>
+        </p>
+        </article>
 {% endblock %}

=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html	2010-08-17 00:25:27 +0000
+++ loco_directory/templates/base.html	2010-08-17 00:47:38 +0000
@@ -53,7 +53,9 @@
 	</div>
 </div>
 <div class="copyright">
-&copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. See <a href="https://launchpad.net/loco-directory">LoCo Directory Project</a> for details.  Ubuntu is a registered trademark of Canonical Ltd.<br />{% trans "LoCo Directory" %} {{ loco_version }}
+&copy; 2008-{% now "Y" %} Canonical Ltd., Ubuntu Community. Ubuntu is a registered trademark of Canonical Ltd.<br />
+<a href="/about">{% trans "About the LoCo Team Directory Project" %}</a><br />
+{% trans "LoCo Directory" %} {{ loco_version }}
 </div>
 {% endblock %}
 

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2010-08-15 20:11:04 +0000
+++ loco_directory/templates/index.html	2010-08-17 00:47:38 +0000
@@ -51,17 +51,4 @@
         <p><script src="{{MEDIA_URL}}js/twidenash.js?locoteams"></script></p>
         </article>
 
-		<hr class="divide" />
-
-		<article class="minor-content">
-        <h2>{% trans "Coming Soon!" %}</h2>
-        <p>
-          {% trans "Future additions to this site will include:" %}
-          <ul>
-            <li>Team Collaboration</li>
-            <li>Various mashups</li>
-          </ul>
-        </p>
-        </article>
-
 {% endblock %}

=== modified file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html	2010-08-14 20:22:37 +0000
+++ loco_directory/templates/loco_council.html	2010-08-17 00:47:38 +0000
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %} {% trans " Ubuntu LoCo Council | Ubuntu LoCo Team Directory" %} {% endblock %}
+{% block title %} {% trans "Ubuntu LoCo Council" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav_links %}
 <a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a>