[Mpuls-commits] r803 - in wasko/branches/2.0: . waskaweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Jan 21 16:39:07 CET 2010
Author: bh
Date: 2010-01-21 16:39:01 +0100 (Thu, 21 Jan 2010)
New Revision: 803
Modified:
wasko/branches/2.0/ChangeLog.txt
wasko/branches/2.0/waskaweb/templates/administration/new_user.mako
Log:
Fix formatting.
Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt 2010-01-21 15:27:06 UTC (rev 802)
+++ wasko/branches/2.0/ChangeLog.txt 2010-01-21 15:39:01 UTC (rev 803)
@@ -1,5 +1,9 @@
2010-01-21 Bernhard Herzog <bh at intevation.de>
+ * waskaweb/templates/administration/new_user.mako: Fix formatting.
+
+2010-01-21 Bernhard Herzog <bh at intevation.de>
+
* waskaweb/templates/casemanagement/downloadXML.mako: Fix
formatting. Remove evaluation server parts.
Modified: wasko/branches/2.0/waskaweb/templates/administration/new_user.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/new_user.mako 2010-01-21 15:27:06 UTC (rev 802)
+++ wasko/branches/2.0/waskaweb/templates/administration/new_user.mako 2010-01-21 15:39:01 UTC (rev 803)
@@ -8,107 +8,126 @@
'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/newUser">${_('adm_np_newuser')}</a></li>
+ ${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>
</%def>
+
<div id="content_header_small">
- <div id="content_ueberschrift">
- ${_('adm_header_newuser')}
- </div>
+ <div id="content_ueberschrift">${_('adm_header_newuser')}</div>
<div id="modusfield">
<div class="actions">
- <ul>
- <li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('menu_adm_link_useroverview_back')}
- </a>
- </li>
- </ul>
+ <ul>
+ <li>
+ <a href="${h.url_for(controller='administration',
+ action='overviewUser')}">
+ ${_('menu_adm_link_useroverview_back')}
+ </a>
+ </li>
+ </ul>
</div>
</div>
</div>
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
-<div id="waska_form">
-<form action="/administration/createUserAction" method="POST">
- <fieldset><legend>${_('adm_form_legend_personal')}</legend>
- <div class="w25">
+ <div id="waska_form">
+ <form action="/administration/createUserAction" 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" maxlength="60">
+ <label for="firstname" class="error_font">
+ ${_('adm_form_user_firstname')}
+ </label>
+ <br>
+ <input type="text" class="field error_box" id="firstname"
+ name="firstname" maxlength="60">
% else:
<label for="firstname">${_('adm_form_user_firstname')}</label><br>
- <input type="text" class="field" id="firstname" name="firstname" maxlength="64">
+ <input type="text" class="field" id="firstname" name="firstname"
+ maxlength="64">
% endif
- </div>
- <div class="w75">
+ </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" maxlength="64">
+ <label for="lastname" class="error_font">
+ ${_('adm_form_user_lastname')}
+ </label>
+ <br>
+ <input type="text" class="field error_box" id="lasttname"
+ name="lastname" maxlength="64">
% else:
<label for="lastname">${_('adm_form_user_lastname')}</label><br>
- <input type="text" class="field" id="lasttname" name="lastname" 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" maxlength="32">
- </div>
- <div class="w75">
- <label
- for="room">${_('adm_form_user_room')}</label><br>
- <input type="text" class="field" id="room" name="room" maxlength="16">
- </div>
- <div class="w100">
- <label
- for="branchoffice">${_('adm_form_user_branchoffice')}</label><br>
- <input type="text" class="field" id="branchoffice" name="branchoffice" maxlength="64">
- </div>
- </fieldset>
- <fieldset><legend>${_('adm_form_legend_login')}</legend>
- <div class="w25">
+ <input type="text" class="field" id="lasttname" name="lastname"
+ 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"
+ maxlength="32">
+ </div>
+ <div class="w75">
+ <label for="room">${_('adm_form_user_room')}</label><br>
+ <input type="text" class="field" id="room" name="room" maxlength="16">
+ </div>
+ <div class="w100">
+ <label for="branchoffice">${_('adm_form_user_branchoffice')}</label>
+ <br>
+ <input type="text" class="field" id="branchoffice" name="branchoffice"
+ maxlength="64">
+ </div>
+ </fieldset>
+ <fieldset><legend>${_('adm_form_legend_login')}</legend>
+ <div class="w25">
% if c.form_errors.get('login'):
- <label for="login" class="error_font">${_('adm_form_user_login')}</label><br>
- <input type="text" class="field error_box" id="login" name="login" maxlength="64">
+ <label for="login" class="error_font">
+ ${_('adm_form_user_login')}
+ </label>
+ <br>
+ <input type="text" class="field error_box" id="login" name="login"
+ maxlength="64">
% else:
<label for="login">${_('adm_form_user_login')}</label><br>
- <input type="text" class="field" id="login" name="login" maxlength="64">
+ <input type="text" class="field" id="login" name="login"
+ maxlength="64">
% endif
- </div>
- <div class="w50">
- <label for="role">${_('adm_form_user_role')}</label><br>
+ </div>
+ <div class="w50">
+ <label for="role">${_('adm_form_user_role')}</label><br>
% if h.getLogin() != 'adm':
- <select name="role" id="role">
- % if c.isEvaluationServer:
- <option value="PB">PB</option>
- % else:
- <option value="CM" >CM</option>
- % endif
- <option value="Admin">Admin</option>
- </select>
+ <select name="role" id="role">
+ % if c.isEvaluationServer:
+ <option value="PB">PB</option>
+ % else:
+ <option value="CM" >CM</option>
+ % endif
+ <option value="Admin">Admin</option>
+ </select>
% else:
% if c.isEvaluationServer:
PB
<input type="hidden" name="role" value="PB">
- % else:
+ % else:
Admin
<input type="hidden" name="role" value="Admin">
% endif
% endif
</div>
- <div class="w100">
- <input type="checkbox" name="activated" id="activated" value="1" checked>
+ <div class="w100">
+ <input type="checkbox" name="activated" id="activated" value="1"
+ checked>
<label for="activated">${_('adm_form_user_activated')}</label>
- </div>
- <div class="w100">
+ </div>
+ <div class="w100">
<input type="checkbox" name="newpass" id="newpass" value="1" checked>
<label for="newpass">${_('adm_form_user_newpass')}</label>
- </div>
- </fieldset>
- <input type="submit" value="${_('adm_form_user_submit')}">
-</form>
+ </div>
+ </fieldset>
+ <input type="submit" value="${_('adm_form_user_submit')}">
+ </form>
+ </div>
</div>
-</div>
More information about the Mpuls-commits
mailing list