Daniel Holbach has proposed merging lp:~dholbach/loco-directory/601081 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#601081 Listing teams for approval at present is not accurate
https://bugs.launchpad.net/bugs/601081
--
https://code.launchpad.net/~dholbach/loco-directory/601081/+merge/29956
Your team loco-directory-dev is requested to review the proposed merge of
lp:~dholbach/loco-directory/601081 into lp:loco-directory.
=== modified file 'loco_directory/common/views.py'
--- loco_directory/common/views.py 2009-12-22 18:33:08 +0000
+++ loco_directory/common/views.py 2010-07-15 07:59:42 +0000
@@ -9,6 +9,11 @@
return render_to_response('index.html', context,
RequestContext(request))
+def loco_council(request):
+ context = {}
+ return render_to_response('loco_council.html', context,
+ RequestContext(request))
+
def about(request):
context = {}
return render_to_response('about.html', context,
=== modified file 'loco_directory/locale/loco-directory.pot'
--- loco_directory/locale/loco-directory.pot 2010-07-09 14:42:31 +0000
+++ loco_directory/locale/loco-directory.pot 2010-07-15 07:59:42 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 14:40+0000\n"
+"POT-Creation-Date: 2010-07-15 07:56+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <em...@address>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -21,7 +21,7 @@
msgstr ""
#: events/forms.py:128 teams/forms.py:22 templates/events/event_list.html:18
-#: templates/teams/team_list.html:17 templates/venues/venue_list.html:15
+#: templates/teams/team_list.html:16 templates/venues/venue_list.html:15
#: venues/forms.py:27
msgid "Search"
msgstr ""
@@ -424,7 +424,7 @@
msgid "just ask!"
msgstr ""
-#: templates/base.html:4 templates/index.html:8
+#: templates/base.html:4 templates/index.html:8 templates/loco_council.html:10
msgid "Ubuntu LoCo Team Directory"
msgstr ""
@@ -457,27 +457,31 @@
msgid "Venues"
msgstr ""
-#: templates/base.html:20
+#: templates/base.html:20 templates/loco_council.html:12
+msgid "LoCo Council"
+msgstr ""
+
+#: templates/base.html:21
msgid "About LoCo Directory"
msgstr ""
-#: templates/base.html:20
+#: templates/base.html:21
msgid "About"
msgstr ""
-#: templates/base.html:22
+#: templates/base.html:23
msgid "Log out"
msgstr ""
-#: templates/base.html:24
+#: templates/base.html:25
msgid "Log in"
msgstr ""
-#: templates/base.html:46
+#: templates/base.html:47
msgid "Logged in as"
msgstr ""
-#: templates/base.html:48
+#: templates/base.html:49
msgid "LoCo Directory"
msgstr ""
@@ -511,6 +515,78 @@
msgid "Future additions to this site will include:"
msgstr ""
+#: templates/loco_council.html:5 templates/teams/team_reapprovals.html:10
+msgid "Upcoming Reapprovals"
+msgstr ""
+
+#: templates/loco_council.html:14
+msgid ""
+"The Ubuntu LoCo Council is comprised of elected, dedicated members of the "
+"Ubuntu Community. They have diverse backgrounds, but have a firm "
+"understanding of what makes up successful LoCo's. The LoCo Council was set "
+"up to govern Ubuntu LoCo teams, and utilizing their past experiences, "
+"provide guidance and help when needed to these teams and lead them by "
+"example."
+msgstr ""
+
+#: templates/loco_council.html:17
+msgid ""
+"The LoCo Council governs the LoCo community, make decisions on resource "
+"allocation, deals with conflict resolution and make decisions about where "
+"the project should move forward."
+msgstr ""
+
+#: templates/loco_council.html:20
+msgid ""
+"The LoCo Council governs the LoCo Community; responsibilities include but "
+"are not limited to the following:"
+msgstr ""
+
+#: templates/loco_council.html:22
+msgid "To provide independent guidance for the LoCo Community."
+msgstr ""
+
+#: templates/loco_council.html:23
+msgid "To maintain quality of governance in the LoCo community."
+msgstr ""
+
+#: templates/loco_council.html:24
+msgid "To assess and re-assess teams for approved state."
+msgstr ""
+
+#: templates/loco_council.html:25
+msgid ""
+"To provide input and feedback to other Ubuntu governance boards regarding "
+"the needs and achievements of the LoCo community."
+msgstr ""
+
+#: templates/loco_council.html:26
+msgid ""
+"To act as an independent, objective, third party to resolve conflict in "
+"teams by acting as mediator for a group or individuals."
+msgstr ""
+
+#: templates/loco_council.html:27
+msgid ""
+"To govern key LoCo resources such as mailing lists and key web properties. "
+"ie. if you log a Request Ticket regarding your LoCo and don't hear anything "
+"after 2 weeks contact us."
+msgstr ""
+
+#: templates/loco_council.html:28
+msgid "Influencing and recommending how LoCo resources are allocated."
+msgstr ""
+
+#: templates/loco_council.html:29
+msgid ""
+"Influencing the direction and goals of the Ubuntu Project and greater LoCo "
+"Team effort."
+msgstr ""
+
+#: templates/loco_council.html:30
+msgid "To motivate and encourage LoCo s to be the best they can."
+msgstr ""
+
#: templates/events/event_history_list.html:4
msgid "Ubuntu LoCo Events History"
msgstr ""
@@ -938,34 +1014,30 @@
msgid "Ubuntu LoCo Teams List"
msgstr ""
-#: templates/teams/team_list.html:11
-msgid "Upcoming Reapprovals"
-msgstr ""
-
-#: templates/teams/team_list.html:26
+#: templates/teams/team_list.html:25
#, python-format
msgid "%(teamname)s approved"
msgstr ""
-#: templates/teams/team_list.html:26
+#: templates/teams/team_list.html:25
#, python-format
msgid "%(teamname)s not approved"
msgstr ""
#: templates/teams/team_reapprovals.html:4
-#: templates/teams/team_reapprovals.html:13
+#: templates/teams/team_reapprovals.html:15
msgid "Ubuntu LoCo Team Approvals List"
msgstr ""
-#: templates/teams/team_reapprovals.html:18
+#: templates/teams/team_reapprovals.html:20
msgid "Reapprovals in the next 6 months"
msgstr ""
-#: templates/teams/team_reapprovals.html:35
+#: templates/teams/team_reapprovals.html:37
msgid "Reapprovals later on"
msgstr ""
-#: templates/teams/team_reapprovals.html:52
+#: templates/teams/team_reapprovals.html:54
msgid "There are currently no approved teams in the Ubuntu LoCo Directory. :("
msgstr ""
=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py 2010-05-17 10:08:41 +0000
+++ loco_directory/teams/urls.py 2010-07-15 07:59:42 +0000
@@ -2,7 +2,6 @@
urlpatterns = patterns('',
url(r'^$', 'teams.views.team_list', name='team-list'),
- url(r'^reapprovals$', 'teams.views.reapprovals', name='reapprovals'),
url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/edit$', 'teams.views.team_edit', name='team-edit'),
url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events$', 'teams.views.team_event_list', name='team-event-list'),
url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)$', 'teams.views.team_detail', name='team-detail'),
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html 2010-06-24 19:22:27 +0000
+++ loco_directory/templates/base.html 2010-07-15 07:59:42 +0000
@@ -17,6 +17,7 @@
<a class="main-nav-item {% ifequal url_base 'teams' %}current{% endifequal %}" title="{% trans "Show all Teams" %}" href="{% url team-list %}">{% trans "Teams" %}</a>
<a class="main-nav-item {% ifequal url_base 'events' %}current{% endifequal %}" title="{% trans "Show all Events" %}" href="{% url event-list %}">{% trans "Events" %}</a>
<a class="main-nav-item {% ifequal url_base 'venues' %}current{% endifequal %}" title="{% trans "Show all Venues" %}" href="{% url venue-list %}">{% trans "Venues" %}</a>
+ <a class="main-nav-item {% ifequal url_base 'loco-council' %}current{% endifequal %}" title="{% trans "LoCo Council" %}" href="{% url loco_council %}">{% trans "LoCo Council" %}</a>
<a class="main-nav-item {% ifequal url_base 'about' %}current{% endifequal %}" title="{% trans "About LoCo Directory" %}" href="/about">{% trans "About" %}</a></li>
{% if user.is_authenticated %}
<a class="main-nav-item" href="/logout" title="{% trans "Log out" %}: {{ user.username }}">{% trans "Log out" %}</a>
=== added file 'loco_directory/templates/loco_council.html'
--- loco_directory/templates/loco_council.html 1970-01-01 00:00:00 +0000
+++ loco_directory/templates/loco_council.html 2010-07-15 07:59:42 +0000
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block sub_nav_links %}
+<a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a>
+{% endblock %}
+
+{% block content %}
+
+ <h1>{% trans "Ubuntu LoCo Team Directory" %}</h1>
+ <article class="main-content">
+ <h2>{% trans "LoCo Council" %}</h2>
+ <p>
+ {% trans "The Ubuntu LoCo Council is comprised of elected, dedicated members of the Ubuntu Community. They have diverse backgrounds, but have a firm understanding of what makes up successful LoCo's. The LoCo Council was set up to govern Ubuntu LoCo teams, and utilizing their past experiences, provide guidance and help when needed to these teams and lead them by example." %}
+ </p>
+ <p>
+ {% trans "The LoCo Council governs the LoCo community, make decisions on resource allocation, deals with conflict resolution and make decisions about where the project should move forward." %}
+ </p>
+ <p>
+ {% trans "The LoCo Council governs the LoCo Community; responsibilities include but are not limited to the following:" %}
+ <ul>
+ <li>{% trans "To provide independent guidance for the LoCo Community." %}</li>
+ <li>{% trans "To maintain quality of governance in the LoCo community." %}</li>
+ <li>{% trans "To assess and re-assess teams for approved state." %}</li>
+ <li>{% trans "To provide input and feedback to other Ubuntu governance boards regarding the needs and achievements of the LoCo community." %}</li>
+ <li>{% trans "To act as an independent, objective, third party to resolve conflict in teams by acting as mediator for a group or individuals." %}</li>
+ <li>{% trans "To govern key LoCo resources such as mailing lists and key web properties. ie. if you log a Request Ticket regarding your LoCo and don't hear anything after 2 weeks contact us." %}</li>
+ <li>{% trans "Influencing and recommending how LoCo resources are allocated." %}</li>
+ <li>{% trans "Influencing the direction and goals of the Ubuntu Project and greater LoCo Team effort." %}</li>
+ <li>{% trans "To motivate and encourage LoCo s to be the best they can." %}</li>
+ </ul>
+ </p>
+ </article>
+{% endblock %}
=== modified file 'loco_directory/templates/teams/team_list.html'
--- loco_directory/templates/teams/team_list.html 2010-06-24 19:18:57 +0000
+++ loco_directory/templates/teams/team_list.html 2010-07-15 07:59:42 +0000
@@ -8,7 +8,6 @@
{% endblock %}
{% block sub_nav_links %}
-<a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a>
{% endblock %}
{% block search_box %}
=== modified file 'loco_directory/templates/teams/team_reapprovals.html'
--- loco_directory/templates/teams/team_reapprovals.html 2010-06-24 19:18:57 +0000
+++ loco_directory/templates/teams/team_reapprovals.html 2010-07-15 07:59:42 +0000
@@ -6,7 +6,9 @@
<link rel="stylesheet" type="text/css" href="/media/css/newstyle.css" />
{% endblock %}
-{% block sub_nav %}{% endblock %}
+{% block sub_nav_links %}
+<a class="sub-nav-item" href="reapprovals">{% trans "Upcoming Reapprovals" %}</a>
+{% endblock %}
{% block content %}
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py 2010-06-17 19:11:30 +0000
+++ loco_directory/urls.py 2010-07-15 07:59:42 +0000
@@ -14,6 +14,8 @@
url(r'^teams/', include('teams.urls')),
url(r'^events/', include('events.urls')),
url(r'^venues/', include('venues.urls')),
+ url(r'^loco-council/$', 'common.views.loco_council', name='loco_council'),
+ url(r'^loco-council/reapprovals$', 'teams.views.reapprovals', name='reapprovals'),
url(r'^logout$', 'common.views.site_logout'),
url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
url(r'^services/', include('services.urls')),
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
