[Mpuls-commits] r2740 - in base/trunk: . mpulsweb/templates/administration mpulsweb/templates/administration/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue May 25 19:42:33 CEST 2010
Author: bh
Date: 2010-05-25 19:42:30 +0200 (Tue, 25 May 2010)
New Revision: 2740
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
base/trunk/mpulsweb/templates/administration/edit_user.mako
base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
base/trunk/mpulsweb/templates/administration/new_user.mako
base/trunk/mpulsweb/templates/administration/new_user_result.mako
base/trunk/mpulsweb/templates/administration/new_usergroup.mako
base/trunk/mpulsweb/templates/administration/overview_user.mako
base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
base/trunk/mpulsweb/templates/administration/reset_password.mako
base/trunk/mpulsweb/templates/administration/show_user.mako
base/trunk/mpulsweb/templates/administration/show_usergroup.mako
Log:
* mpulsweb/templates/administration/show_usergroup.mako,
mpulsweb/templates/administration/show_user.mako,
mpulsweb/templates/administration/reset_password.mako,
mpulsweb/templates/administration/overview_usergroups.mako,
mpulsweb/templates/administration/overview_user.mako,
mpulsweb/templates/administration/new_usergroup.mako,
mpulsweb/templates/administration/new_user_result.mako,
mpulsweb/templates/administration/new_user.mako,
mpulsweb/templates/administration/edit_usergroup.mako,
mpulsweb/templates/administration/edit_user.mako,
mpulsweb/templates/administration/dialogs/success_new_usergroup.mako,
mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako,
mpulsweb/templates/administration/dialogs/success_edit_user.mako,
mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako,
mpulsweb/templates/administration/dialogs/success_delete_user.mako,
mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako,
mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako,
mpulsweb/templates/administration/dialogs/failed_delete_user.mako,
mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako,
mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako,
mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako,
mpulsweb/templates/administration/delete_user_helper.mako: Use
h.url_for consistently for all intra application URLs.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/ChangeLog 2010-05-25 17:42:30 UTC (rev 2740)
@@ -1,5 +1,31 @@
2010-05-25 Bernhard Herzog <bh at intevation.de>
+ * mpulsweb/templates/administration/show_usergroup.mako,
+ mpulsweb/templates/administration/show_user.mako,
+ mpulsweb/templates/administration/reset_password.mako,
+ mpulsweb/templates/administration/overview_usergroups.mako,
+ mpulsweb/templates/administration/overview_user.mako,
+ mpulsweb/templates/administration/new_usergroup.mako,
+ mpulsweb/templates/administration/new_user_result.mako,
+ mpulsweb/templates/administration/new_user.mako,
+ mpulsweb/templates/administration/edit_usergroup.mako,
+ mpulsweb/templates/administration/edit_user.mako,
+ mpulsweb/templates/administration/dialogs/success_new_usergroup.mako,
+ mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako,
+ mpulsweb/templates/administration/dialogs/success_edit_user.mako,
+ mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako,
+ mpulsweb/templates/administration/dialogs/success_delete_user.mako,
+ mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako,
+ mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako,
+ mpulsweb/templates/administration/dialogs/failed_delete_user.mako,
+ mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako,
+ mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako,
+ mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako,
+ mpulsweb/templates/administration/delete_user_helper.mako: Use
+ h.url_for consistently for all intra application URLs.
+
+2010-05-25 Bernhard Herzog <bh at intevation.de>
+
Generate URLs properly so that SCRIPT_NAME is taken into account:
* mpulsweb/lib/renderer.py (icon): New function to help with icon
Modified: base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/delete_user_helper.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/delete_user_helper.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -3,10 +3,10 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
- <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,11 +2,11 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_delteuser')}</a></li>
- <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
- <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>i
+ <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>i
<li><a href="#">${_('adm_np_delteuser_success')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/deleteUserGroup">${_('adm_np_deleteusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('adm_np_deleteusergroup')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,9 +2,9 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/showUser">${_('adm_np_showuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('adm_np_showuser')}</a></li>
<li><a href="#">${_('adm_np_resetpassword')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_failed_deleteuser')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/newUserGroup">${_('adm_np_newusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,10 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
- <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>
<li><a href="#">${_('adm_np_deleteuser_helper_set_editor')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_success_deleteuser')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/deleteUserGroup">${_('adm_np_deleteusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('adm_np_deleteusergroup')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,10 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/case/">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
- <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
+ <li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('adm_np_edituser')}</a></li>
<li><a href="#">${_('adm_np_edituser_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/editUserGroup/${c.group.id}">${_('adm_np_editusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('adm_np_editusergroup')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/newUserGroup">${_('adm_np_newusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -10,10 +10,10 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
- <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('adm_np_edituser')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -22,8 +22,8 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li> <a href="/administration/resetUserPassword/${c.uo.id}"> ${_('adm_actions_link_userpassreset')}</a> </li>
- <li> <a href="/administration/showUser/${c.uo.id}"> ${_('menu_adm_link_useredit_back')} </a></li>
+ <li> <a href="${h.url_for(controller='/administration', action='resetUserPassword', id=c.uo.id)}"> ${_('adm_actions_link_userpassreset')}</a> </li>
+ <li> <a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}"> ${_('menu_adm_link_useredit_back')} </a></li>
</ul>
</div>
</div>
@@ -31,7 +31,8 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_edit_user">
<div id="waska_form">
-<form action="/administration/editUserAction" method="POST">
+<form action="${h.url_for(controller='/administration', action='editUserAction')}"
+ method="POST">
<fieldset>
Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -7,9 +7,9 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/editUserGroup/${c.group.id}">${_('adm_np_editusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('adm_np_editusergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -28,7 +28,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
- <form action="/administration/editUserGroupAction" method="POST">
+ <form action="${h.url_for(controller='/administration', action='editUserGroupAction')}" method="POST">
<input type="hidden" name="id">
<fieldset><legend>${_('adm_form_legend_groupdata')}</legend>
<div class="w25">
Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -11,9 +11,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/newUser">${_('adm_np_newuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('adm_np_newuser')}</a></li>
</%def>
<div id="content_header_small">
@@ -35,7 +35,8 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
- <form action="/administration/newUserAction" method="POST">
+ <form action="${h.url_for(controller='/administration', action='newUserAction')}"
+ method="POST">
<fieldset><legend>${_('adm_form_legend_personal')}</legend>
<div class="w25">
% if c.form_errors.get('firstname'):
Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -3,9 +3,9 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/newUser">${_('adm_np_newuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('adm_np_newuser')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/administration/new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -6,9 +6,9 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="/administration/newUserGroup">${_('adm_np_newusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -27,7 +27,8 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
-<form action="/administration/newUserGroupAction" method="POST">
+<form action="${h.url_for(controller='/administration', action='newUserGroupAction')}"
+ method="POST">
<fieldset><legend>${_('adm_form_legend_groupdata')}</legend>
<div class="w25">
% if c.form_errors.get('name'):
Modified: base/trunk/mpulsweb/templates/administration/overview_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/overview_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
</%def>
@@ -15,7 +15,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="/administration/newUser"> ${_('adm_actions_link_newuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUser')}"> ${_('adm_actions_link_newuser')}</a></li>
</ul>
</div>
</div>
@@ -37,17 +37,17 @@
<tr class="table_row_h">
<% idset = 0 %>
% endif
- <td><a href="/administration/showUser/${user.id}">${user.last_name| F.NA}</a></td>
- <td><a href="/administration/showUser/${user.id}">${user.first_name| F.NA}</a></td>
+ <td><a href="${h.url_for(controller='/administration', action='showUser', id=user.id)}">${user.last_name| F.NA}</a></td>
+ <td><a href="${h.url_for(controller='/administration', action='showUser', id=user.id)}">${user.first_name| F.NA}</a></td>
% if user.getRole() == 'Admin':
- <td><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
+ <td><img src="${h.url_for('/images/icons/admin_grey_tag.gif')}" alt="Administratorin, Administrator" title="Administrator/in"></td>
% else:
- <td><img src="/images/icons/cm_grey_tag_width.gif" alt="Case-Managerin, Case-Manager" title="Case-Manager/in"></td>
+ <td><img src="${h.url_for('/images/icons/cm_grey_tag_width.gif')}" alt="Case-Managerin, Case-Manager" title="Case-Manager/in"></td>
% endif
<td>
- <a href="/administration/showUser/${user.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <a href="${h.url_for(controller='/administration', action='showUser', id=user.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if str(user.id) != str(session.get('USER_AUTHORIZED').id):
- <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="${h.url_for(controller='/administration', action='deleteUser', id=user.id)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_usergroups.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/overview_usergroups.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
</%def>
@@ -15,7 +15,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="/administration/newUserGroup"> ${_('adm_actions_link_newusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}"> ${_('adm_actions_link_newusergroup')}</a></li>
</ul>
</div>
</div>
@@ -35,11 +35,11 @@
<% idset = 0 %>
% endif
<td>
- <a href="/administration/showUserGroup/${group.id}">${group.name| F.NA}</a>
+ <a href="${h.url_for(controller='/administration', action='showUserGroup', id=group.id)}">${group.name| F.NA}</a>
</td>
<td>
- <a href="/administration/showUserGroup/${group.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- <a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="${h.url_for(controller='/administration', action='showUserGroup', id=group.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <a href="${h.url_for(controller='/administration', action='deleteUserGroup', id=group.id)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
</td>
</tr>
% endfor
Modified: base/trunk/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/reset_password.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/reset_password.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -3,14 +3,14 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/showUser">${_('adm_np_showuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('adm_np_showuser')}</a></li>
<li><a href="#">${_('adm_np_resetpassword')}</a></li>
</%def>
<div class="dialog">
-<h1><img src="/images/icons/info/confirmation.png" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
+<h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
<p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name| F.NA} ${c.uo.last_name| F.NA}</strong> ${_('adm_con_rp_has_been_changed')}<br>
${_('adm_con_rp_new_pw')} <strong>${h.literal(c.new_password) | h}</strong></p>
-<a class="button" href="/administration/overviewUser">${_('adm_con_rp_to_useroverview')}</a>
+<a class="button" href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_con_rp_to_useroverview')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/show_user.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -2,9 +2,9 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -13,7 +13,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li> <a href="/administration/editUser/${c.uo.id}"> ${_('adm_actions_link_edituser')}</a> </li>
+ <li> <a href="${h.url_for(controller='/administration', action='editUser', id=c.uo.id)}"> ${_('adm_actions_link_edituser')}</a> </li>
<li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('menu_adm_link_useroverview_back')}</a></li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2010-05-25 17:28:24 UTC (rev 2739)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2010-05-25 17:42:30 UTC (rev 2740)
@@ -3,9 +3,9 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="/administration">${_('adm_np_root')}</a></li>
- <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
- <li><a href="/administration/showUserGroup/${c.group.id}">${_('adm_np_showusergroup')}</a></li>
+ <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="${h.url_for(controller='/administration', action='showUserGroup', id=c.group.id)}">${_('adm_np_showusergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -14,7 +14,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="/administration/editUserGroup/${c.group.id}"> ${_('adm_actions_link_editusergroup')}</a> </li>
+ <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}"> ${_('adm_actions_link_editusergroup')}</a> </li>
<li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview_back')}</a></li>
</ul>
</div>
More information about the Mpuls-commits
mailing list