[Mpuls-commits] r1715 - in wasko/branches/2.0: . jmdweb/templates/casemanagement mpulsweb/templates mpulsweb/templates/casemanagement waskaweb/templates/casemanagement

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Feb 23 17:40:27 CET 2010 

Author: torsten
Date: 2010-02-23 17:40:26 +0100 (Tue, 23 Feb 2010)
New Revision: 1715

Added:
   wasko/branches/2.0/mpulsweb/templates/casemanagement/
   wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako
Removed:
   wasko/branches/2.0/jmdweb/templates/casemanagement/organisation.mako
   wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako
Modified:
   wasko/branches/2.0/ChangeLog
Log:
Moved template for setting edit and standing to base.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-23 16:36:39 UTC (rev 1714)
+++ wasko/branches/2.0/ChangeLog	2010-02-23 16:40:26 UTC (rev 1715)
@@ -47,6 +47,13 @@
 	* jmdweb/controllers/case.py (CaseController.organsation),
 	(CaseController.setEditorAction), (CaseController.setStandinAction):
 	Deleted. 
+	* waskaweb/controllers/case.py (CaseController.organsation),
+	(CaseController.setEditorAction), (CaseController.setStandinAction):
+	Deleted. 
+	* mpulsweb/templates/casemanagement/organisation.mako,
+	  waskaweb/templates/casemanagement/organisation.mako,
+	  jmdweb/templates/casemanagement/organisation.mako: Moved template to
+	  base.
 
 2010-02-22  Bernhard Herzog  <bh at intevation.de>
 

Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/organisation.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/organisation.mako	2010-02-23 16:36:39 UTC (rev 1714)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/organisation.mako	2010-02-23 16:40:26 UTC (rev 1715)
@@ -1,97 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="main.mako" />
-<%!  import mpulsweb.lib.helper.filters as F %>
-<%def name="buildNavipath()">
-		${parent.buildNavipath()}
-	<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/organisation/${session.get('case').id}">${_('cm_np_organisation')}</a></li>
-</%def>
-
-<div id="content_header_small">
-  <div id="content_ueberschrift">
-${_('cm_header_organisation')}
-  </div>
-</div>
-<p>${_('cm_organisation_con_whois_cm_replace')}</p>
-<h2>${_('cm_header_organisation_editor')}</h2>
-<table>
-  <tr>
-    <td class="label table_header_v table_width_mid_l">${_('cm_organisation_tbl_label_lastname')}</td><td class=" table_row_v table_description">${c.editor.last_name | F.NA, h}</td>
-    </tr>
-  <tr>
-    <td class="label">${_('cm_organisation_tbl_label_firstname')}</td><td class=" table_row_v_2">${c.editor.first_name | F.NA, h}
-    </td>
-  </tr>
-  <tr>
-    <td class="label table_header_v">${_('cm_organisation_tbl_label_telephone')}</td><td class=" table_row_v">${c.editor.telephone | F.NA, h}
-    </td>
-  </tr>
-</table>
-% if h.hasRole(['admin_ka']):
-<form action="${h.url_for(controller="case", action="setEditorAction")}" method="POST">
-<input type="hidden" name="case_id" value="${session.get('case').id}">
-<select name="editor">
-% for user in c.user_list:
-  <option value="${user.id | F.NA, h}">${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</option>
-% endfor
-</select>
-<input type="submit" value="${_('cm_form_editor_submit')}">
-</form>
-% endif
-<h2>${_('cm_header_standin')}</h2>
-% if (h.hasRole(['admin_ka']) or (c.current_user.id == c.editor.id)):
-<form action="${h.url_for(controller="case", action="setStandinAction")}" method="POST">
-<input type="hidden" name="case_id" value="${session.get('case').id}">
-<table>
-  <tr>
-    <th class="table_header_h table_checkbox">&nbsp;</th>
-    <th class="table_header_h table_description">${_('cm_organisation_table_cm')}</th>
-  </tr>
-  <% idset = True %>
-  % for group in c.group_list:
-  <tr>
-  % if idset:
-    % if group.id in c.standin.getGroups():
-     <td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
-    % else:
-     <td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
-    % endif
-     <td>${group.name | F.NA, h}</td>
-  % else:
-    % if group.id in c.standin.getGroups():
-     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
-    % else:
-     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
-    % endif
-     <td class="table_row_v_12">${group.name | F.NA, h}</td>
-  % endif
-  </tr>
-  <% idset = not idset %>
-  % endfor
-</table>
-<input type="submit" value="${_('cm_form_standin_submit')}">
-</form>
-% else:
-<table>
-  <tr>
-    <th class="table_width_long table_header_h">${_('cm_organisation_table_cm')}</th>
-  </tr>
-  <% idset = 0 %>
-  % for group in c.group_list2:
-    % if group.id in c.standin.getGroups():
-      % if idset==0:
-      <tr>
-        <td>${group.name | F.NA, h}</td>
-      </tr>
-      <% idset = 1 %>
-      % else:
-      <tr>
-        <td class="table_row_h">${group.name | F.NA, h}</td>
-      </tr>
-      <% idset = 0 %>
-      % endif
-    % endif
-  % endfor
-</table>
-% endif
-</div>

Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako (from rev 1699, wasko/branches/2.0/jmdweb/templates/casemanagement/organisation.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/organisation.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako	2010-02-23 16:36:39 UTC (rev 1714)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako	2010-02-23 16:40:26 UTC (rev 1715)
@@ -1,97 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="main.mako" />
-<%!  import mpulsweb.lib.helper.filters as F %>
-<%def name="buildNavipath()">
-		${parent.buildNavipath()}
-	<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-	<li><a href="/case/organisation/${session.get('case').id}">${_('cm_np_organisation')}</a></li>
-</%def>
-
-<div id="content_header_small">
-  <div id="content_ueberschrift">
-${_('cm_header_organisation')}
-  </div>
-</div>
-<p>${_('cm_organisation_con_whois_cm_replace')}</p>
-<h2>${_('cm_header_organisation_editor')}</h2>
-<table>
-  <tr>
-    <td class="label table_header_v table_width_mid_l">${_('cm_organisation_tbl_label_lastname')}</td><td class=" table_row_v table_description">${c.editor.last_name | F.NA, h}</td>
-    </tr>
-  <tr>
-    <td class="label">${_('cm_organisation_tbl_label_firstname')}</td><td class=" table_row_v_2">${c.editor.first_name | F.NA, h}
-    </td>
-  </tr>
-  <tr>
-    <td class="label table_header_v">${_('cm_organisation_tbl_label_telephone')}</td><td class=" table_row_v">${c.editor.telephone | F.NA, h}
-    </td>
-  </tr>
-</table>
-% if h.hasRole(['admin_ka']):
-<form action="${h.url_for(controller="case", action="setEditorAction")}" method="POST">
-<input type="hidden" name="case_id" value="${session.get('case').id}">
-<select name="editor">
-% for user in c.user_list:
-  <option value="${user.id | F.NA, h}">${user.last_name | F.NA, h}, ${user.first_name | F.NA, h}</option>
-% endfor
-</select>
-<input type="submit" value="${_('cm_form_editor_submit')}">
-</form>
-% endif
-<h2>${_('cm_header_standin')}</h2>
-% if (h.hasRole(['admin_ka']) or (c.current_user.id == c.editor.id)):
-<form action="${h.url_for(controller="case", action="setStandinAction")}" method="POST">
-<input type="hidden" name="case_id" value="${session.get('case').id}">
-<table>
-  <tr>
-    <th class="table_header_h table_checkbox">&nbsp;</th>
-    <th class="table_header_h table_description">${_('cm_organisation_table_cm')}</th>
-  </tr>
-  <% idset = True %>
-  % for group in c.group_list:
-  <tr>
-  % if idset:
-    % if group.id in c.standin.getGroups():
-     <td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
-    % else:
-     <td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
-    % endif
-     <td>${group.name | F.NA, h}</td>
-  % else:
-    % if group.id in c.standin.getGroups():
-     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
-    % else:
-     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
-    % endif
-     <td class="table_row_v_12">${group.name | F.NA, h}</td>
-  % endif
-  </tr>
-  <% idset = not idset %>
-  % endfor
-</table>
-<input type="submit" value="${_('cm_form_standin_submit')}">
-</form>
-% else:
-<table>
-  <tr>
-    <th class="table_width_long table_header_h">${_('cm_organisation_table_cm')}</th>
-  </tr>
-  <% idset = 0 %>
-  % for group in c.group_list2:
-    % if group.id in c.standin.getGroups():
-      % if idset==0:
-      <tr>
-        <td>${group.name | F.NA, h}</td>
-      </tr>
-      <% idset = 1 %>
-      % else:
-      <tr>
-        <td class="table_row_h">${group.name | F.NA, h}</td>
-      </tr>
-      <% idset = 0 %>
-      % endif
-    % endif
-  % endfor
-</table>
-% endif
-</div>

More information about the Mpuls-commits mailing list