[Mpuls-commits] r812 - in wasko/branches/2.0: . waskaweb/templates/administration

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-21 18:51:45 +0100 (Thu, 21 Jan 2010)
New Revision: 812

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako
Log:
* waskaweb/templates/administration/show_settings.mako: Fix
formatting.  Remove commented out code


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-21 16:46:18 UTC (rev 811)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-21 17:51:45 UTC (rev 812)
@@ -1,5 +1,10 @@
 2010-01-21  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/templates/administration/show_settings.mako: Fix
+	formatting.  Remove commented out code
+
+2010-01-21  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/casemanagement/overview.mako: Removed
 	commented out check_validity bundle action.
 

Modified: wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako	2010-01-21 16:46:18 UTC (rev 811)
+++ wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako	2010-01-21 17:51:45 UTC (rev 812)
@@ -1,71 +1,58 @@
 ## -*- coding: utf-8 -*-
 <%inherit file="../main.mako" />
-<%!  import waskaweb.lib.filters as F %>
+<%! import waskaweb.lib.filters as F %>
 <%def name="buildNavipath()">
-		${parent.buildNavipath()}
-	<li><a href="/administration">${_('adm_np_root')}</a></li>
-	<li><a href="/administration/showSettings">${_('adm_np_showsettings')}</a></li>
+  ${parent.buildNavipath()}
+  <li>
+    <a href="/administration">${_('adm_np_root')}</a>
+  </li>
+  <li>
+    <a href="/administration/showSettings">${_('adm_np_showsettings')}</a>
+  </li>
 </%def>
 
 <div id="content_header_small">
   <div id="content_ueberschrift">
-${_('adm_header_showsettings')}
+    ${_('adm_header_showsettings')}
   </div>
   <div id="modusfield">
     <div class="actions">
-	<ul>
-		<li><a href="/administration/editSettings"> ${_('adm_actions_link_editsettings')}</a></li>
-	</ul>
+      <ul>
+	<li>
+          <a href="/administration/editSettings"> 
+            ${_('adm_actions_link_editsettings')}
+          </a>
+        </li>
+      </ul>
     </div>
   </div>
 </div>
 
 <p>${_('adm_con_ss_view_agency')}</p>
 <table>
-<tr>
-<td class="label table_header_v table_width_name">${_('adm_form_settings_kaname')}</td>
-  <td class="table_row_v table_description">${c.agency.getName()| F.NA, h}</td>
-</tr>
-<tr>
-  <td class="label">${_('adm_form_settings_fkz')}</td>
-  <td class="table_row_v_2">${c.agency.getFKZ()| F.NA, h}</td>
-</tr>
-<tr>
-  <td class="label table_header_v">${_('adm_form_settings_max_savetime')}</td>
-  <td class="table_row_v">${c.agency.getMaxSavetime()| F.NA, h}</td>
-</tr>
-<tr>
-  <td class="label table_header">${_('adm_form_settings_anontransfer')}</td>
-  <td class="table_row_v_2">
-    % if c.agency.isAnonTransfer():
-      ${_('adm_form_settings_anontransfer_yes')}
-    % else:
-      ${_('adm_form_settings_anontransfer_no')}
-    % endif
-  </td>
-</tr>
-##<tr>
-##  <td class="label">${_('adm_form_settings_privacystatement')}</td>
-##  <td>
-##    % if c.agency.conf.get('ee_formular'):
-##      <a href="${h.url_for(action="viewPrivacyStatement")}" target="_blank">
-##        ${_('adm_form_settings_view_privacystatement')}
-##      </a>
-##    % else:
-##      --
-##    % endif
-##  </td>
-##</tr>
-##<tr>
-##  <td class="label">${_('adm_form_settings_aidplanstatement')}</td>
-##  <td>
-##    % if c.agency.conf.get('fp_formular'):
-##      <a href="${h.url_for(action="viewAidPlanStatement")}" target="_blank">
-##        ${_('adm_form_settings_view_aidplanstatement')}
-##      </a>
-##    % else:
-##      --
-##    % endif
-##  </td>
-##</tr>
+  <tr>
+    <td class="label table_header_v table_width_name">
+      ${_('adm_form_settings_kaname')}
+    </td>
+    <td class="table_row_v table_description">${c.agency.getName()| F.NA, h}
+    </td>
+  </tr>
+  <tr>
+    <td class="label">${_('adm_form_settings_fkz')}</td>
+    <td class="table_row_v_2">${c.agency.getFKZ()| F.NA, h}</td>
+  </tr>
+  <tr>
+    <td class="label table_header_v">${_('adm_form_settings_max_savetime')}</td>
+    <td class="table_row_v">${c.agency.getMaxSavetime()| F.NA, h}</td>
+  </tr>
+  <tr>
+    <td class="label table_header">${_('adm_form_settings_anontransfer')}</td>
+    <td class="table_row_v_2">
+      % if c.agency.isAnonTransfer():
+        ${_('adm_form_settings_anontransfer_yes')}
+      % else:
+        ${_('adm_form_settings_anontransfer_no')}
+      % endif
+    </td>
+  </tr>
 </table>