[Mpuls-commits] r1437 - in wasko/branches/2.0: mpulsweb/templates/administration mpulsweb/templates/administration/dialogs waskaweb/templates/administration waskaweb/templates/administration/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 10 10:51:43 CET 2010
Author: torsten
Date: 2010-02-10 10:51:42 +0100 (Wed, 10 Feb 2010)
New Revision: 1437
Added:
wasko/branches/2.0/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako
wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako
Removed:
wasko/branches/2.0/waskaweb/templates/administration/dialogs/confirm_resetpassword.mako
wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako
wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako
Log:
Moved templates for resetting user password and editing user.
Copied: wasko/branches/2.0/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako (from rev 1433, wasko/branches/2.0/waskaweb/templates/administration/dialogs/confirm_resetpassword.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako (from rev 1433, wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/administration/edit_user.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako (from rev 1433, wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/administration/reset_password.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: wasko/branches/2.0/waskaweb/templates/administration/dialogs/confirm_resetpassword.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/dialogs/confirm_resetpassword.mako 2010-02-10 09:50:42 UTC (rev 1436)
+++ wasko/branches/2.0/waskaweb/templates/administration/dialogs/confirm_resetpassword.mako 2010-02-10 09:51:42 UTC (rev 1437)
@@ -1,10 +0,0 @@
-## -*- coding: utf-8 -*-
-<%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="#">${_('adm_np_resetpassword')}</a></li>
-</%def>
-<%include file="../../dialogs/confirm.mako" />
Deleted: wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako 2010-02-10 09:50:42 UTC (rev 1436)
+++ wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako 2010-02-10 09:51:42 UTC (rev 1437)
@@ -1,104 +0,0 @@
-<%inherit file="../main.mako" />
-<%! import mpulsweb.lib.helper.filters as F %>
-<%
- formular_labels = {'firstname' : 'adm_form_user_firstname',
- 'lastname' : 'adm_form_user_lastname',
- 'login' : 'adm_form_user_login',
- 'passwd' : 'adm_form_newuser_passwd',
- 'passwd2' : 'adm_form_newuser_passwd_confirm'
- }
-%>
-<%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>
-</%def>
-<div id="content_header_small">
- <div id="content_ueberschrift">
-${_('adm_header_edituser')}
- </div>
- <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>
- </ul>
- </div>
- </div>
-</div>
-${self.buildFormErrors(formular_labels)}
-<div id="admin_edit_user">
-<div id="waska_form">
-<form action="/administration/editUserAction" method="POST">
- <fieldset><legend>${_('adm_form_legend_personal')}</legend>
- <div class="w25">
- % if c.form_errors.get('firstname'):
- <label for="firstname" class="error_font">${_('adm_form_user_firstname')}</label><br>
- <input type="text" class="field error_box" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
- % else:
- <label for="firstname">${_('adm_form_user_firstname')}</label><br>
- <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', c.uo.first_name)| h}" maxlength="64">
- % endif
- </div>
- <div class="w75">
- % if c.form_errors.get('lastname'):
- <label for="lastname" class="error_font">${_('adm_form_user_lastname')}</label><br>
- <input type="text" class="field error_box" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
- % else:
- <label for="lastname">${_('adm_form_user_lastname')}</label><br>
- <input type="text" class="field" id="lasttname" name="lastname" value="${c.form_result.get('lastname', c.uo.last_name)| h}" maxlength="64">
- % endif
- </div>
- <div class="w25">
- <label
- for="telephone">${_('adm_form_user_telephone')}</label><br>
- <input type="text" class="field" id="telephone" name="telephone" value="${c.form_result.get('telephone', c.uo.telephone)| h}" maxlength="32">
- </div>
- <div class="w75">
- <label
- for="room">${_('adm_form_user_roomnumer')}</label><br>
- <input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', c.uo.room)| h}" maxlength="16">
- </div>
- <div class="waska_form_element w100">
- <label
- for="branchoffice">${_('adm_form_user_branchoffice')}</label><br>
- <input type="text" class="field" id="branchoffice" name="branchoffice" value="${c.form_result.get('branchoffice', c.uo.branchoffice)| h}" maxlength="64">
- </div>
- </fieldset>
- <fieldset><legend>${_('adm_form_legend_login')}</legend>
- <table>
- <tr>
- <td class="label table_header_v table_width_mid_s">Anmeldekennung</td>
- <td class="table_row_v">${c.uo.getLogin()| h}</td>
- </tr>
- <tr>
- <td class="label">Rolle</td>
- <td class="table_row_v_2">${c.uo.getRole()| h}</td>
- </tr>
- </table>
- </fieldset>
- <div class="waska_form_element w100">
- % if c.uo.isActivated():
- <input type="checkbox" checked name="activated" id="activated">
- % else:
- <input type="checkbox" name="activated" id="activated">
- % endif
- <label for="activated">${_('adm_form_user_activated')}</label>
- </div>
- <div class="waska_form_element w100">
- % if c.uo.needsNewPass():
- <input type="checkbox" checked name="newpass" id="newpass">
- % else:
- <input type="checkbox" name="newpass" id="newpass">
- % endif
- <label for="newpass">${_('adm_form_user_newpass')}</label>
- </div>
- <div id="admin_edit_user_submit" class="waska_form_element w100">
- <input type="submit" value="${_('adm_form_user_submit')}">
- </div>
- <input type="hidden" value="${c.form_errors.get('uid', c.uo.id)| F.NA, h}" name="uid">
-</form>
-</div>
-</div>
Deleted: wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako 2010-02-10 09:50:42 UTC (rev 1436)
+++ wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako 2010-02-10 09:51:42 UTC (rev 1437)
@@ -1,16 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../main.mako" />
-<%! 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="#">${_('adm_np_resetpassword')}</a></li>
-</%def>
-<div class="dialog">
-<h1><img src="/images/confirmation.png" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
-<p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name| F.NA, h} ${c.uo.last_name| F.NA, h}</strong> ${_('adm_con_rp_has_been_changed')}<br>
-${_('adm_con_rp_new_pw')} <strong>${c.new_password| h}</strong></p>
-<a class="button" href="/administration/overviewUser">${_('adm_con_rp_to_useroverview')}</a>
-</div>
More information about the Mpuls-commits
mailing list