[Mpuls-commits] r5862 - in base/trunk/mpulsweb/templates/administration: . dialogs
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 7 13:52:09 CET 2012
Author: ludwig
Date: 2012-03-07 13:52:08 +0100 (Wed, 07 Mar 2012)
New Revision: 5862
Modified:
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:
Issue 2738: Replace url_for with url (templates/administration)
Modified: base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/delete_user_helper.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/delete_user_helper.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -3,10 +3,10 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -14,7 +14,7 @@
</div>
</div>
<p>${_('The selected user is main user of a case and cannot be deleted.')}:</p>
-<form action="${h.url_for(controller="administration", action="deleteUserHelper")}" method="POST">
+<form action="${h.url(controller='administration', action='deleteUserHelper')}" method="POST">
<%include file="../casemanagement/caselist.mako" />
<select name="editor">
% for user in c.user_list:
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,11 +2,11 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
<li><a href="#">${_('Delete user?')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>i
+ <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>i
<li><a href="#">${_('User deleted!')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('Delete usergroup?')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUserGroup')}">${_('Delete usergroup?')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,9 +2,9 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('Show user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='showUser')}">${_('Show user')}</a></li>
<li><a href="#">${_('Reset password')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
<li><a href="#">${_('User not deleted!')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUserGroup')}">${_('Create new usergroup')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,10 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id)}">${_('Delete user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('Delete helper user')}</a></li>
<li><a href="#">${_('Case document assigned')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
<li><a href="#">${_('User deleted!')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('Delete usergroup?')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='deleteUserGroup')}">${_('Delete usergroup?')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,10 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('Edit user')}</a></li>
+ <li><a href="${h.url(controller='case', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='editUser')}">${_('Edit user')}</a></li>
<li><a href="#">${_('User saved!')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('Edit usergroup')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='editUserGroup', id=c.group.id)}">${_('Edit usergroup')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUserGroup')}">${_('Create new usergroup')}</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 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -10,10 +10,10 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('Edit user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='editUser')}">${_('Edit user')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -24,11 +24,11 @@
<ul>
%if str(c.uo.id) != str(session.get('USER_AUTHORIZED').id):
<li>
- <a href="${h.url_for(controller='/administration', action='resetUserPassword', id=c.uo.id)}">${_('Reset user password')}</a>
+ <a href="${h.url(controller='administration', action='resetUserPassword', id=c.uo.id)}">${_('Reset user password')}</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}"> ${_('Back to: User overview')} </a>
+ <a href="${h.url(controller='administration', action='showUser', id=c.uo.id)}"> ${_('Back to: User overview')} </a>
</li>
</ul>
</div>
@@ -37,7 +37,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_edit_user">
<div id="waska_form">
-<form action="${h.url_for(controller='/administration', action='editUserAction')}"
+<form action="${h.url(controller='administration', action='editUserAction')}"
method="POST">
<fieldset>
Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -7,9 +7,9 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('Edit usergroup')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='editUserGroup', id=c.group.id)}">${_('Edit usergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -18,7 +18,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}
</a>
</li>
</ul>
@@ -28,7 +28,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
- <form action="${h.url_for(controller='/administration', action='editUserGroupAction')}" method="POST">
+ <form action="${h.url(controller='administration', action='editUserGroupAction')}" method="POST">
<input type="hidden" name="id">
<fieldset><legend>${_('Information about usergroup')}</legend>
<div class="w25">
Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -11,9 +11,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('Create new user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUser')}">${_('Create new user')}</a></li>
</%def>
<div id="content_header_small">
@@ -22,7 +22,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='administration',
+ <a href="${h.url(controller='administration',
action='overviewUser')}">
${_('Back to: User overview')}
</a>
@@ -35,7 +35,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
- <form action="${h.url_for(controller='/administration', action='newUserAction')}"
+ <form action="${h.url(controller='administration', action='newUserAction')}"
method="POST">
<fieldset><legend>${_('Information about personal')}</legend>
<div class="w25">
Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -3,9 +3,9 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('Create new user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUser')}">${_('Create new user')}</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="${h.url_for(controller='administration', action='overviewUser')}"> ${_('Back to: User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}"> ${_('Back to: User overview')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -6,9 +6,9 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUserGroup')}">${_('Create new usergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -17,7 +17,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}
</a>
</li>
</ul>
@@ -27,7 +27,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
-<form action="${h.url_for(controller='/administration', action='newUserGroupAction')}"
+<form action="${h.url(controller='administration', action='newUserGroupAction')}"
method="POST">
<fieldset><legend>${_('Information about usergroup')}</legend>
<div class="w25">
Modified: base/trunk/mpulsweb/templates/administration/overview_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_user.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/overview_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
</%def>
@@ -15,7 +15,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='newUser')}"> ${_('Create new user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUser')}"> ${_('Create new user')}</a></li>
</ul>
</div>
</div>
@@ -37,18 +37,18 @@
<tr class="table_row_h">
<% idset = 0 %>
% endif
- <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>
+ <td><a href="${h.url(controller='administration', action='showUser', id=user.id)}">${user.last_name| F.NA}</a></td>
+ <td><a href="${h.url(controller='administration', action='showUser', id=user.id)}">${user.first_name| F.NA}</a></td>
##% if user.getRole() == 'Admin':
- ##<td><img src="${h.url_for('/images/icons/admin_grey_tag.gif')}" alt="${_('Role Administrator')}" title="${_('Role Administrator')}"></td>
+ ##<td><img src="${h.url('/images/icons/admin_grey_tag.gif')}" alt="${_('Role Administrator')}" title="${_('Role Administrator')}"></td>
##% else:
- ## <td><img src="${h.url_for('/images/icons/cm_grey_tag_width.gif')}" alt="${_('Role Case Manager')}" title="${_('Role Case Manager')}"></td>
+ ## <td><img src="${h.url('/images/icons/cm_grey_tag_width.gif')}" alt="${_('Role Case Manager')}" title="${_('Role Case Manager')}"></td>
##% endif
<td>${user.getRole()}</td>
<td>
- <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="${_('Show')}" title="${_('Show')}"></a>
+ <a href="${h.url(controller='administration', action='showUser', id=user.id)}"><img src="${h.url('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
% if str(user.id) != str(session.get('USER_AUTHORIZED').id):
- <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="${_('Delete')}" title="${_('Delete')}"></a>
+ <a href="${h.url(controller='administration', action='deleteUser', id=user.id)}"><img src="${h.url('/images/icons/delete_active_22.png')}" border="0" alt="${_('Delete')}" title="${_('Delete')}"></a>
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_usergroups.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/overview_usergroups.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}">${_('Usergroup overview')}</a></li>
</%def>
@@ -15,7 +15,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}"> ${_('Create new usergroup')}</a></li>
+ <li><a href="${h.url(controller='administration', action='newUserGroup')}"> ${_('Create new usergroup')}</a></li>
</ul>
</div>
</div>
@@ -35,11 +35,11 @@
<% idset = 0 %>
% endif
<td>
- <a href="${h.url_for(controller='/administration', action='showUserGroup', id=group.id)}">${group.name| F.NA}</a>
+ <a href="${h.url(controller='administration', action='showUserGroup', id=group.id)}">${group.name| F.NA}</a>
</td>
<td>
- <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="${_('Show')}" title="${_('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="${_('Delete')}" title="${_('Delete')}"></a>
+ <a href="${h.url(controller='administration', action='showUserGroup', id=group.id)}"><img src="${h.url('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}" title="${_('Show')}"></a>
+ <a href="${h.url(controller='administration', action='deleteUserGroup', id=group.id)}"><img src="${h.url('/images/icons/delete_active_22.png')}" border="0" alt="${_('Delete')}" title="${_('Delete')}"></a>
</td>
</tr>
% endfor
Modified: base/trunk/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/reset_password.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/reset_password.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -3,17 +3,17 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('Show user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='showUser')}">${_('Show user')}</a></li>
<li><a href="#">${_('Reset password')}</a></li>
</%def>
<div class="dialog">
-<h1><img src="${h.url_for('/images/icons/info/confirmation.png')}"
+<h1><img src="${h.url('/images/icons/info/confirmation.png')}"
alt="${_('Confirmation')}"
width="48"
height="48"> ${_('User password reset!')}</h1>
<p>${_('The password of the user')} <strong>${c.uo.first_name| F.NA} ${c.uo.last_name| F.NA}</strong> ${_('has been changed.')}<br>
${_('The new password is:')} <strong>${c.new_password}</strong></p>
-<a class="button" href="${h.url_for(controller='/administration', action='overviewUser')}">${_('Foreward to: User overview')}</a>
+<a class="button" href="${h.url(controller='administration', action='overviewUser')}">${_('Foreward to: User overview')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/show_user.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -2,9 +2,9 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
+ <li><a href="${h.url(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='showUser', id=c.uo.id)}">${_('Show user')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -13,8 +13,8 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li> <a href="${h.url_for(controller='/administration', action='editUser', id=c.uo.id)}"> ${_('Edit user')}</a> </li>
- <li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('Back to: User overview')}</a></li>
+ <li> <a href="${h.url(controller='administration', action='editUser', id=c.uo.id)}"> ${_('Edit user')}</a> </li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}"> ${_('Back to: User overview')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2012-03-07 09:14:21 UTC (rev 5861)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2012-03-07 12:52:08 UTC (rev 5862)
@@ -3,9 +3,9 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('Administration')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('User overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUserGroup', id=c.group.id)}">${_('Show usergroup')}</a></li>
+ <li><a href="${h.urlfor(controller='administration', action='index')}">${_('Administration')}</a></li>
+ <li><a href="${h.url(controller='administration', action='overviewUser')}">${_('User overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='showUserGroup', id=c.group.id)}">${_('Show usergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -14,8 +14,8 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}"> ${_('Edit user group')}</a> </li>
- <li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}</a></li>
+ <li><a href="${h.url(controller='administration', action='editUserGroup', id=c.group.id)}"> ${_('Edit user group')}</a> </li>
+ <li><a href="${h.url(controller='administration', action='overviewUserGroups')}"> ${_('Back to: Usergroup overview')}</a></li>
</ul>
</div>
</div>
More information about the Mpuls-commits
mailing list