[Mpuls-commits] r1407 - in wasko/branches/2.0/mpulsweb/templates: . settings

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-09 16:19:46 +0100 (Tue, 09 Feb 2010)
New Revision: 1407

Modified:
   wasko/branches/2.0/mpulsweb/templates/main.mako
   wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
   wasko/branches/2.0/mpulsweb/templates/settings/show.mako
Log:
Call methods from mpulsweb.settings


Modified: wasko/branches/2.0/mpulsweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/main.mako	2010-02-09 15:19:18 UTC (rev 1406)
+++ wasko/branches/2.0/mpulsweb/templates/main.mako	2010-02-09 15:19:46 UTC (rev 1407)
@@ -158,8 +158,7 @@
             </a>
           </li>
           <li>
-            <a href="${h.url_for(controller='/administration', 
-                                 action='showSettings')}">
+            <a href="${h.url_for(controller='/settings')}">
               ${_('menu_adm_link_showsettings')}
             </a>
           </li>

Modified: wasko/branches/2.0/mpulsweb/templates/settings/edit.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/edit.mako	2010-02-09 15:19:18 UTC (rev 1406)
+++ wasko/branches/2.0/mpulsweb/templates/settings/edit.mako	2010-02-09 15:19:46 UTC (rev 1407)
@@ -9,13 +9,13 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="/administration">${_('adm_np_root')}</a>
+    <a href="/settings">${_('adm_np_root')}</a>
   </li>
   <li>
-    <a href="/administration/showSettings">${_('adm_np_showsettings')}</a>
+    <a href="/settings/show">${_('adm_np_showsettings')}</a>
   </li>
   <li>
-    <a href="/administration/editSettings">${_('adm_np_editsettings')}</a>
+    <a href="/settings/edit">${_('adm_np_editsettings')}</a>
   </li>
 </%def>
 
@@ -27,8 +27,8 @@
     <div class="actions">
       <ul>
         <li>
-          <a href="${h.url_for(controller='administration',
-                               action='showSettings')}">
+          <a href="${h.url_for(controller='settings',
+                               action='show')}">
             ${_('adm_actions_link_showsettings')}
           </a>
         </li>
@@ -41,7 +41,7 @@
 <div id="admin_edit_settings">
   <p>${_('adm_con_es_editsettings')}</p>
   <div class="waska_form">
-    <form action="/administration/editSettingsAction" method="POST">
+    <form action="/settings/editAction" method="POST">
       <fieldset>
         <legend>Angaben zur Einrichtung</legend>
         <div class="waska_form_element w30">

Modified: wasko/branches/2.0/mpulsweb/templates/settings/show.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/settings/show.mako	2010-02-09 15:19:18 UTC (rev 1406)
+++ wasko/branches/2.0/mpulsweb/templates/settings/show.mako	2010-02-09 15:19:46 UTC (rev 1407)
@@ -4,10 +4,10 @@
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
   <li>
-    <a href="/administration">${_('adm_np_root')}</a>
+    <a href="/settings">${_('adm_np_root')}</a>
   </li>
   <li>
-    <a href="/administration/showSettings">${_('adm_np_showsettings')}</a>
+    <a href="/settings/show">${_('adm_np_showsettings')}</a>
   </li>
 </%def>
 
@@ -19,7 +19,7 @@
     <div class="actions">
       <ul>
 	<li>
-          <a href="/administration/editSettings"> 
+          <a href="/settings/edit"> 
             ${_('adm_actions_link_editsettings')}
           </a>
         </li>