[Mpuls-commits] r1691 - wasko/branches/2.0/jmdweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Feb 23 14:36:34 CET 2010
Author: torsten
Date: 2010-02-23 14:36:33 +0100 (Tue, 23 Feb 2010)
New Revision: 1691
Removed:
wasko/branches/2.0/jmdweb/templates/administration/dialogs/
wasko/branches/2.0/jmdweb/templates/administration/new_user.mako
wasko/branches/2.0/jmdweb/templates/administration/new_user_result.mako
wasko/branches/2.0/jmdweb/templates/administration/show_user_body.mako
wasko/branches/2.0/jmdweb/templates/administration/success_edit_user.mako
Log:
Deleted old template files
Deleted: wasko/branches/2.0/jmdweb/templates/administration/new_user.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/administration/new_user.mako 2010-02-23 13:02:32 UTC (rev 1690)
+++ wasko/branches/2.0/jmdweb/templates/administration/new_user.mako 2010-02-23 13:36:33 UTC (rev 1691)
@@ -1,121 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../main.mako" />
-<%
- 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/newUser">${_('adm_np_newuser')}</a></li>
-</%def>
-
-<div id="content_header_small">
- <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>
- </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">
- % 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">
- % else:
- <label for="firstname">${_('adm_form_user_firstname')}</label><br>
- <input type="text" class="field" id="firstname" name="firstname"
- 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" 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">
- % 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">
- % else:
- <label for="login">${_('adm_form_user_login')}</label><br>
- <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>
- <select name="role" id="role">
- % if h.getLogin() != 'adm':
- <option value="CM" >CM</option>
- % endif
- <option value="Admin">Admin</option>
- </select>
- </div>
- <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">
- <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>
-</div>
Deleted: wasko/branches/2.0/jmdweb/templates/administration/new_user_result.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/administration/new_user_result.mako 2010-02-23 13:02:32 UTC (rev 1690)
+++ wasko/branches/2.0/jmdweb/templates/administration/new_user_result.mako 2010-02-23 13:36:33 UTC (rev 1691)
@@ -1,80 +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/newUser">${_('adm_np_newuser')}</a></li>
-</%def>
-<div id="content_header_small">
- <div id="content_ueberschrift">
-${_('adm_header_newuser_Result')}
- </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>
- </div>
- </div>
-</div>
-<h2>${_('adm_form_legend_personal')}</h2>
-<p>${_('adm_form_new_user_notice')}</p>
-<table>
- <tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_forename')}</td>
- <td class="table_row_v table_description">${c.uo.first_name| F.NA, h}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_label_name')}</td>
- <td class="table_row_v_2">${c.uo.last_name| F.NA, h}</td>
- </tr>
- <tr>
- <td class="label table_header_v">${_('adm_form_label_phone')}</td>
- <td class="table_row_v table_description">${c.uo.telephone| F.NA, h}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_label_room')}</td>
- <td class="table_row_v_2">${c.uo.room| F.NA, h}</td>
- </tr>
- <tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_agency')}</td>
- <td class="table_row_v table_description">${c.uo.branchoffice| F.NA, h}</td>
- </tr>
-</table>
-<h2>${_('adm_form_legend_login')}</h2>
-<table>
- <tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_login')}</td>
- <td class="table_row_v table_description"><span id="newpassword">${c.uo.getLogin()| F.NA, h}</span></td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_label_password')}</td>
- <td class="table_row_v_2"><span id="newpassword">${c.user_password| F.NA, h}</span></td>
- </tr>
- <tr>
- <td class="label table_header_v">${_('adm_form_label_role')}</td>
- <td class="table_row_v table_description">${c.uo.role| F.NA, h}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_label_activated')}</td>
- <td class="table_row_v_2">
- % if c.uo.isActivated():
- ${_('adm_form_is_activated_yes')}
- % else:
- ${_('adm_form_is_activated_no')}
- % endif
- </td>
- </tr>
- <tr>
- <td class="label table_header_v table_width_long">${_('adm_form_label_login_pw')}</td>
- <td class="table_row_v table_description">
- % if c.uo.needsNewPass():
- ${_('adm_form_needs_pw_yes')}
- % else:
- ${_('adm_form_needs_pw_no')}
- % endif
- </td>
- </tr>
-</table>
Deleted: wasko/branches/2.0/jmdweb/templates/administration/show_user_body.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/administration/show_user_body.mako 2010-02-23 13:02:32 UTC (rev 1690)
+++ wasko/branches/2.0/jmdweb/templates/administration/show_user_body.mako 2010-02-23 13:36:33 UTC (rev 1691)
@@ -1,61 +0,0 @@
-<%! import mpulsweb.lib.helper.filters as F %>
-<h2>${_('adm_form_legend_personal')}</h2>
-<table>
- <tr>
- <td class="label table_header_v table_width_long">${_('adm_form_table_forename')}</td>
- <td class="table_row_v table_description">${c.uo.first_name | F.NA, h}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_table_name')}</td>
- <td class="table_row_v_2">${c.uo.last_name | F.NA, h}</td>
- </tr>
- <tr>
- <td class="label table_header_v">${_('adm_form_table_phone')}</td>
- <td class="table_row_v">${c.uo.telephone | F.NA, h}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_table_room')}</td>
- <td class="table_row_v_2">${c.uo.room | F.NA, h}</td>
- </tr>
- <tr>
- <td class="label table_header_v">${_('adm_form_table_agency')}</td>
- <td class="table_row_v">${c.uo.branchoffice | F.NA, h}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_table_replace')}</td>
- <td class="table_row_v_2">${c.vuo.name | F.NA, h}</td>
- </tr>
-</table>
-<h2>${_('adm_form_header_login')}</h2>
-<table>
- <tr>
- <td class="label table_header_v table_width_long">${_('adm_form_table_login')}</td>
- <td class="table_row_v table_description">${c.uo.getLogin()}</td>
- </tr>
- <tr>
- <td class="label">${_('adm_form_table_role')}</td>
- <td class="table_row_v_2">${c.uo.getRole()}</td>
- </tr>
- % if h.hasRole(['admin_ka']):
- <tr>
- <td class="label table_header_v table_width_mid_l">${_('adm_form_table_activated')}</td>
- <td class="table_row_v">
- % if c.uo.isActivated():
- ${_('adm_form_table_yes')}
- % else:
- ${_('adm_form_table_no')}
- % endif
- </td>
- </tr>
- <tr>
- <td class="label table_width_long">${_('adm_form_label_new_login_new_pw')}</td>
- <td class="table_row_v_2">
- % if c.uo.needsNewPass():
- ${_('adm_form_table_yes')}
- % else:
- ${_('adm_form_table_no')}
- % endif
- </td>
- </tr>
- % endif
-</table>
Deleted: wasko/branches/2.0/jmdweb/templates/administration/success_edit_user.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/administration/success_edit_user.mako 2010-02-23 13:02:32 UTC (rev 1690)
+++ wasko/branches/2.0/jmdweb/templates/administration/success_edit_user.mako 2010-02-23 13:36:33 UTC (rev 1691)
@@ -1,11 +0,0 @@
-## -*- coding: utf-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="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
- <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
- <li><a href="#">${_('adm_np_edituser_success')}</a></li>
-</%def>
-<%include file="../../dialogs/success.mako" />
More information about the Mpuls-commits
mailing list