Changeset 34339bb

Timestamp:

Jun 8, 2013, 3:24:04 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

8c0a2ff

Parents:

a7c08e4 (diff), d983e4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (06/08/13 03:24:02)

git-committer:

Alex Dehnert <adehnert@…> (06/08/13 03:24:04)

Message:

Merge branch 'stage'

• stage: Add forgotten midway list template

Location:

asadb

Files:

• template/midway/midway_list.html (added)
• groups/urls.py (modified) (1 diff)
• media/style/style.css (modified) (1 diff)
• template/groups/group_change_officers.html (modified) (3 diffs)

asadb/groups/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
+
+import django.shortcuts
 
 import groups.views
 import space.views
 
+def redirect_view(to):
+    def _redirect_view(request, **kwargs):
+        return django.shortcuts.redirect(to, **kwargs)
+    return _redirect_view
+
 group_patterns = patterns('',
     url(r'^$', groups.views.GroupDetailView.as_view(), name='group-detail', ),
     url(r'^edit/main$', groups.views.manage_main, name='group-manage-main', ),
-    url(r'^edit/officers$', groups.views.manage_officers, name='group-manage-officers', ),
+    url(r'^edit/people$', groups.views.manage_officers, name='group-manage-officers', ),
+    url(r'^edit/officers$', redirect_view('groups:group-manage-officers'), ),
     url(r'^history/$', groups.views.GroupHistoryView.as_view(), name='group-manage-history', ),
     url(r'^space/$', space.views.manage_access, name='group-space-access', ),

asadb/media/style/style.css

@@ -272 +272 @@
 }
 
-table.group-change-officers-change td
+table.group-update-people-change td
 {
     text-align: center;

asadb/template/groups/group_change_officers.html

@@ -1 +1 @@
 {% extends "base.html" %}
 
-{% block title %}{{group.name}}: Change people{% endblock %}
+{% block title %}{{group.name}}: Update people{% endblock %}
 {% block content %}
 
-<h1>{{group.name}}: Change people</h1>
+<h1>{{group.name}}: Update people</h1>
 
 {% include "groups/group_tools.part.html" %}
 
-<p>Please adjust your signatories below.</p>
+<p>Please adjust the people associated with your group below.</p>
 
 <h2>Available roles</h2>
@@ -52 +52 @@
 {% endif %}
 
-<h2>Option 1: View and update signatories one at a time</h2>
+<h2>Option 1: View and update people one at a time</h2>
 
 <p>Please note:</p>
@@ -64 +64 @@
 <input type='hidden' name='opt-mode' value='table' />
 {% csrf_token %}
-<table class='pretty-table group-change-officers-change'>
+<table class='pretty-table group-update-people-change'>
 <thead>
 <tr>