Refactored the application review template into group_app.
authorLennard de Rijk <ljvderijk@gmail.com>
Tue, 03 Feb 2009 21:15:12 +0000
changeset 1206 657da4693f4b
parent 1205 2e88261aba72
child 1207 2b1fe1ed18b4
Refactored the application review template into group_app. Patch by: Madhusudan C.S Reviewed by: Lennard de Rijk
app/soc/templates/soc/club_app/review.html
app/soc/templates/soc/group_app/review.html
app/soc/templates/soc/org_app/review.html
--- a/app/soc/templates/soc/club_app/review.html	Tue Feb 03 20:30:08 2009 +0000
+++ b/app/soc/templates/soc/club_app/review.html	Tue Feb 03 21:15:12 2009 +0000
@@ -1,4 +1,4 @@
-{% extends "soc/base.html" %}
+{% extends "soc/group_app/review.html" %}
 {% comment %}
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,37 +13,9 @@
 limitations under the License.
 {% endcomment %}
 {% load forms_helpers %}
-
-{% block header_title %}
-{{ page_name }} for {{ entity.name }}
-{% endblock %}
-
-{% block body %}
-<p>
- <table>
-  {% readonly_field_as_twoline_table_row entity.fields.name.label entity.name %}
-  {% readonly_field_as_twoline_table_row entity.fields.applicant.label entity.applicant.link_id %}
-  {% readonly_field_as_twoline_table_row entity.fields.home_page.label entity.home_page %}
-  {% readonly_field_as_twoline_table_row entity.fields.email.label entity.email %}
-  {% readonly_field_as_twoline_table_row entity.fields.description.label entity.description %}
-  {% readonly_field_as_twoline_table_row entity.fields.why_applying.label entity.why_applying %}
+{% block group_details %}
   {% readonly_field_as_twoline_table_row entity.fields.pub_mailing_list.label entity.pub_mailing_list %}
   {% readonly_field_as_twoline_table_row entity.fields.irc_channel.label entity.irc_channel %}
   {% readonly_field_as_twoline_table_row entity.fields.backup_admin.label entity.backup_admin.link_id %}
   {% readonly_field_as_twoline_table_row entity.fields.member_criteria.label entity.member_criteria %}
-  {% readonly_field_as_table_row entity.fields.status.label entity.status %}
-  {% readonly_field_as_table_row "Created on" entity.created_on %}
-  {% readonly_field_as_table_row "Last Modified on" entity.last_modified_on %}
- </table>
-</p>
-
-<tr>
-  <td>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=accepted'" value="Accept"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=rejected'" value="Reject"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=ignored'" value="Ignore"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/delete/{{ entity.key.name }}'" value="Delete"/>
-  </td>
-</tr>
-</table>
 {% endblock %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/soc/templates/soc/group_app/review.html	Tue Feb 03 21:15:12 2009 +0000
@@ -0,0 +1,48 @@
+{% extends "soc/base.html" %}
+{% comment %}
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+{% load forms_helpers %}
+
+{% block header_title %}
+{{ page_name }} for {{ entity.name }}
+{% endblock %}
+
+{% block body %}
+<p>
+ <table>
+  {% readonly_field_as_twoline_table_row entity.fields.name.label entity.name %}
+  {% readonly_field_as_twoline_table_row entity.fields.applicant.label entity.applicant.link_id %}
+  {% readonly_field_as_twoline_table_row entity.fields.home_page.label entity.home_page %}
+  {% readonly_field_as_twoline_table_row entity.fields.email.label entity.email %}
+  {% readonly_field_as_twoline_table_row entity.fields.description.label entity.description %}
+  {% readonly_field_as_twoline_table_row entity.fields.why_applying.label entity.why_applying %}
+  {% block group_details %}{% endblock %}
+  {% readonly_field_as_table_row entity.fields.status.label entity.status %}
+  {% readonly_field_as_table_row "Created on" entity.created_on %}
+  {% readonly_field_as_table_row "Last Modified on" entity.last_modified_on %}
+ </table>
+</p>
+
+{% block buttons %}
+<tr>
+  <td>
+    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=accepted'" value="Accept"/>
+    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=rejected'" value="Reject"/>
+    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=ignored'" value="Ignore"/>
+    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/delete/{{ entity.key.name }}'" value="Delete"/>
+  </td>
+</tr>
+</table>
+{% endblock buttons %}
+{% endblock body %}
--- a/app/soc/templates/soc/org_app/review.html	Tue Feb 03 20:30:08 2009 +0000
+++ b/app/soc/templates/soc/org_app/review.html	Tue Feb 03 21:15:12 2009 +0000
@@ -1,4 +1,4 @@
-{% extends "soc/base.html" %}
+{% extends "soc/group_app/review.html" %}
 {% comment %}
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,20 +13,7 @@
 limitations under the License.
 {% endcomment %}
 {% load forms_helpers %}
-
-{% block header_title %}
-{{ page_name }} for {{ entity.name }}
-{% endblock %}
-
-{% block body %}
-<p>
- <table>
-  {% readonly_field_as_twoline_table_row entity.fields.name.label entity.name %}
-  {% readonly_field_as_twoline_table_row entity.fields.applicant.label entity.applicant.link_id %}
-  {% readonly_field_as_twoline_table_row entity.fields.home_page.label entity.home_page %}
-  {% readonly_field_as_twoline_table_row entity.fields.email.label entity.email %}
-  {% readonly_field_as_twoline_table_row entity.fields.description.label entity.description %}
-  {% readonly_field_as_twoline_table_row entity.fields.why_applying.label entity.why_applying %}
+{% block group_details %}
   {% readonly_field_as_twoline_table_row entity.fields.prior_participation.label entity.prior_participation %}
   {% readonly_field_as_twoline_table_row entity.fields.prior_application.label entity.prior_application %}
   {% readonly_field_as_twoline_table_row entity.fields.license_name.label entity.license_name %}
@@ -41,19 +28,4 @@
   {% readonly_field_as_twoline_table_row entity.fields.continued_contribs.label entity.continued_contribs %}
   {% readonly_field_as_twoline_table_row entity.fields.ideas.label entity.ideas %}
   {% readonly_field_as_twoline_table_row entity.fields.contrib_template.label entity.contrib_template %}
-  {% readonly_field_as_table_row entity.fields.status.label entity.status %}
-  {% readonly_field_as_table_row "Created on" entity.created_on %}
-  {% readonly_field_as_table_row "Last Modified on" entity.last_modified_on %}
- </table>
-</p>
-
-<tr>
-  <td>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=accepted'" value="Accept"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=rejected'" value="Reject"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/review/{{ entity.key.name }}?status=ignored'" value="Ignore"/>
-    <input type="button" onclick="location.href='/{{ entity_type_url|lower }}/delete/{{ entity.key.name }}'" value="Delete"/>
-  </td>
-</tr>
-</table>
 {% endblock %}