[Mpuls-commits] r1428 - in wasko/branches/2.0: . waskaweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Feb 9 17:56:36 CET 2010
Author: bh
Date: 2010-02-09 17:56:35 +0100 (Tue, 09 Feb 2010)
New Revision: 1428
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/waskaweb/templates/casemanagement/new.mako
Log:
* waskaweb/templates/casemanagement/new.mako: Fix formatting.
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-02-09 16:56:22 UTC (rev 1427)
+++ wasko/branches/2.0/ChangeLog 2010-02-09 16:56:35 UTC (rev 1428)
@@ -1,5 +1,9 @@
2010-02-09 Bernhard Herzog <bh at intevation.de>
+ * waskaweb/templates/casemanagement/new.mako: Fix formatting.
+
+2010-02-09 Bernhard Herzog <bh at intevation.de>
+
* waskaweb/controllers/formularpage.py: Remove unused imports.
2010-02-09 Bernhard Herzog <bh at intevation.de>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/new.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/new.mako 2010-02-09 16:56:22 UTC (rev 1427)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/new.mako 2010-02-09 16:56:35 UTC (rev 1428)
@@ -1,106 +1,149 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
+
<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <li><a href="/case/">${_('cm_np_root')}</a></li>
- <li><a href="/case/">${_('cm_np_new')}</a></li>
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_new')}</a></li>
</%def>
+
<div class="waska_form">
-<form id="waska_form" action="/case/newAction" accept-charset="UTF-8" name="waska_form" method="POST">
-<h1>Neue Fallakte anlegen</h1>
-<fieldset>
- <legend>Basisdaten</legend>
- <table>
- <tr>
- <td class="label">
- <label for="name">Name:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60" name="name" id="name" value="${c.case.last_name or ""}">
- </td>
- </tr>
- <tr>
- <td class="label">
- <label for="vorname">Vorname:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60" name="vorname" id="vorname" value="${c.case.first_name or ""}">
- </td>
- </tr>
- <tr>
- <td class="label">
- <label for="addresse_strasse">Strasse:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60" name="addresse_strasse" id="addresse_strasse" value="${c.case.street or ""}">
- </td>
- </tr>
- <tr>
- <td class="label">
- <label for="addresse_strassenr">Strasse Nr.:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60" name="addresse_strassenr" id="addresse_strassenr" value="${c.case.streetnr or ""}">
- </td>
- </tr>
- <tr>
- <td class="label">
- <label for="addresse_plz">PLZ:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60" name="addresse_plz" id="addresse_plz" value="${c.case.plz or ""}">
- </td>
- </tr>
- <tr>
- <td class="label">
- <label for="addresse_ort">Ort:</label>
- </td>
- <td>
- <input class="field" type="text" size="50" maxlength="60" name="addresse_ort" id="addresse_ort" value="${c.case.city or ""}">
- </td>
- </tr>
- </table>
-</fieldset>
-<fieldset>
-<legend>Art der Aufnahme</legend>
-<div class="waska_form_element w100"><input type="radio" name="aufnahme_typ" value="0" id="type_aufnahme_1" checked="checked">
- <label for="type_aufnahme_1">Erstaufnahme</label>
+ <form id="waska_form" action="/case/newAction" accept-charset="UTF-8"
+ name="waska_form" method="POST">
+ <h1>Neue Fallakte anlegen</h1>
+ <fieldset>
+ <legend>Basisdaten</legend>
+ <table>
+ <tr>
+ <td class="label">
+ <label for="name">Name:</label>
+ </td>
+ <td>
+ <input class="field" type="text" size="50" maxlength="60"
+ name="name" id="name" value="${c.case.last_name or ""}">
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label for="vorname">Vorname:</label>
+ </td>
+ <td>
+ <input class="field" type="text" size="50" maxlength="60"
+ name="vorname" id="vorname"
+ value="${c.case.first_name or ""}">
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label for="addresse_strasse">Strasse:</label>
+ </td>
+ <td>
+ <input class="field" type="text" size="50" maxlength="60"
+ name="addresse_strasse" id="addresse_strasse"
+ value="${c.case.street or ""}">
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label for="addresse_strassenr">Strasse Nr.:</label>
+ </td>
+ <td>
+ <input class="field" type="text" size="50" maxlength="60"
+ name="addresse_strassenr" id="addresse_strassenr"
+ value="${c.case.streetnr or ""}">
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label for="addresse_plz">PLZ:</label>
+ </td>
+ <td>
+ <input class="field" type="text" size="50" maxlength="60"
+ name="addresse_plz" id="addresse_plz"
+ value="${c.case.plz or ""}">
+ </td>
+ </tr>
+ <tr>
+ <td class="label">
+ <label for="addresse_ort">Ort:</label>
+ </td>
+ <td>
+ <input class="field" type="text" size="50" maxlength="60"
+ name="addresse_ort" id="addresse_ort"
+ value="${c.case.city or ""}">
+ </td>
+ </tr>
+ </table>
+ </fieldset>
+ <fieldset>
+ <legend>Art der Aufnahme</legend>
+ <div class="waska_form_element w100">
+ <input type="radio" name="aufnahme_typ" value="0" id="type_aufnahme_1"
+ checked="checked">
+ <label for="type_aufnahme_1">
+ Erstaufnahme
+ </label>
+ </div>
+ <div class="waska_form_element w100">
+ <input type="radio" name="aufnahme_typ" value="1" id="type_aufnahme_2">
+ <label for="type_aufnahme_2">
+ Wiederaufnahme nach erfolgreicher Reintegration
+ </label>
+ <a target="_blank" href="/case/showhelp/wiederaufnahme">
+ <img alt="Hilfesymbol" src="/images/icons/form_help.png" border="0">
+ </a>
+ </div>
+ <div class="waska_form_element w100">
+ <input type="radio" name="aufnahme_typ" value="2" id="type_aufnahme_3">
+ <label for="type_aufnahme_3">
+ Neuaufnahme nach sonstiger Beendigung
+ </label>
+ <a target="_blank" href="/case/showhelp/neuaufnahme">
+ <img alt="Hilfesymbol" src="/images/icons/form_help.png" border="0">
+ </a>
+ </div>
+ </fieldset>
+ <div style="padding: 1em 0;">
+ <p>${_('cm_new_p_please_consider_statement')}</p>
+ </div>
+ <div class="waska_form_element w100">
+ Als PDF-Version verfügbare Einverständniserklärungen zum
+ handschriftlichen Ausfüllen:
+ <table>
+ <tr>
+ <td class="table_row_h">
+ Arabisch <a href="/documents/ee_ar.pdf">download</a>
+ </td>
+ <td class="table_row_h">
+ Englisch <a href="/documents/ee_en.pdf">download</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
+ <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
+ </tr>
+ <tr>
+ <td class="table_row_h">
+ Türkisch <a href="/documents/ee_tr.pdf">download</a>
+ </td>
+ <td class="table_row_h">
+ Deutsch
+ (Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
+ <a href="/documents/ee_de_ohnetn.pdf">download</a>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="waska_form_element w100">
+ <input type="checkbox" id="statement_signed" name="statement_signed">
+ <label for="statement_signed">
+ ${_('cm_new_con_acceptance_statement_true')}
+ </label>
+ </div>
+ <div class="input_space">
+ <input type="hidden" name="page" value="page_1">
+ <input type="submit" value="Erklärung drucken" name="print">
+ <input type="submit" value="Fallakte anlegen" name="save">
+ </div>
+ </form>
</div>
-<div class="waska_form_element w100"><input type="radio" name="aufnahme_typ" value="1" id="type_aufnahme_2">
- <label for="type_aufnahme_2">Wiederaufnahme nach erfolgreicher Reintegration</label>
- <a target="_blank" href="/case/showhelp/wiederaufnahme"><img alt="Hilfesymbol" src="/images/icons/form_help.png" border="0"></a>
-</div>
-<div class="waska_form_element w100"><input type="radio" name="aufnahme_typ" value="2" id="type_aufnahme_3">
- <label for="type_aufnahme_3">Neuaufnahme nach sonstiger Beendigung</label>
- <a target="_blank" href="/case/showhelp/neuaufnahme"><img alt="Hilfesymbol" src="/images/icons/form_help.png" border="0"></a>
-</div>
-</fieldset>
-<div style="padding: 1em 0;">
-<p>${_('cm_new_p_please_consider_statement')}</p>
-</div>
-<div class="waska_form_element w100">
-Als PDF-Version verfügbare Einverständniserklärungen zum handschriftlichen Ausfüllen:
-<table>
- <tr>
- <td class="table_row_h">Arabisch <a href="/documents/ee_ar.pdf">download</a></td>
- <td class="table_row_h">Englisch <a href="/documents/ee_en.pdf">download</a></td>
- </tr>
- <tr>
- <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
- <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
- </tr>
- <tr>
- <td class="table_row_h">Türkisch <a href="/documents/ee_tr.pdf">download</a></td>
- <td class="table_row_h">Deutsch (Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen) <a href="/documents/ee_de_ohnetn.pdf">download</a></td>
- </tr>
-</table>
-</div>
-<div class="waska_form_element w100">
-<input type="checkbox" id="statement_signed" name="statement_signed"><label for="statement_signed">${_('cm_new_con_acceptance_statement_true')}</label></div>
-<div class="input_space">
-<input type="hidden" name="page" value="page_1">
-<input type="submit" value="Erklärung drucken" name="print">
-<input type="submit" value="Fallakte anlegen" name="save">
-</div>
-</form>
-</div>
More information about the Mpuls-commits
mailing list