[Mpuls-commits] r66 - in trunk: . waskaweb/controllers waskaweb/templates waskaweb/templates/administration waskaweb/templates/appointments waskaweb/templates/casemanagement waskaweb/templates/logbook waskaweb/templates/start waskaweb/templates/tests

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Wed Aug 13 15:19:16 CEST 2008


Author: thomas
Date: 2008-08-13 15:19:15 +0200 (Wed, 13 Aug 2008)
New Revision: 66

Removed:
   trunk/waskaweb/templates/administration/userform_body.mako
   trunk/waskaweb/templates/casemanagement/static_form.mako
   trunk/waskaweb/templates/tests/forms.mako
Modified:
   trunk/ChangeLog.txt
   trunk/waskaweb/controllers/case.py
   trunk/waskaweb/templates/administration/edit_settings.mako
   trunk/waskaweb/templates/administration/edit_user.mako
   trunk/waskaweb/templates/administration/edit_usergroup.mako
   trunk/waskaweb/templates/administration/new_user.mako
   trunk/waskaweb/templates/administration/new_usergroup.mako
   trunk/waskaweb/templates/appointments/appointment_form.mako
   trunk/waskaweb/templates/appointments/edit_body.mako
   trunk/waskaweb/templates/casemanagement/newLogbookEntry.mako
   trunk/waskaweb/templates/casemanagement/search.mako
   trunk/waskaweb/templates/logbook/edit_body.mako
   trunk/waskaweb/templates/login.mako
   trunk/waskaweb/templates/start/start.mako
Log:
Load 199a6616d981 into trunk.


Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/ChangeLog.txt	2008-08-13 13:19:15 UTC (rev 66)
@@ -1,3 +1,39 @@
+2008-07-23 	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Issue312
+
+	* waskaweb/controllers/case.py: Added pagebreak after casedigest in
+	  printout.
+
+	Issue496
+
+	* waskaweb/templates/administration/edit_settings.mako,
+	  waskaweb/templates/administration/edit_user.mako,
+	  waskaweb/templates/administration/edit_usergroup.mako,
+	  waskaweb/templates/administration/new_user.mako,
+	  waskaweb/templates/administration/new_usergroup.mako,
+	  waskaweb/templates/administration/userform_body.mako,
+	  waskaweb/templates/appointments/appointment_form.mako,
+	  waskaweb/templates/appointments/edit_body.mako,
+	  waskaweb/templates/casemanagement/newLogbookEntry.mako,
+	  waskaweb/templates/casemanagement/search.mako,
+	  waskaweb/templates/casemanagement/static_form.mako,
+	  waskaweb/templates/logbook/edit_body.mako,
+	  waskaweb/templates/login.mako: Added maxlength attribute to
+	  textfields.
+
+	* waskaweb/templates/administration/userform_body.mako,
+	  waskaweb/templates/casemanagement/static_form.mako,
+	  waskaweb/templates/tests/forms.mako: Removed obsolete templates
+
+	Unsorted:
+
+	* waskaweb/templates/start/start.mako: Fixed typo
+
+2008-07-22 	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Retagged as "1.0.3rc9"
+
 2008-07-22	Sascha L. Teichmann	<sascha.teichmann at intevation.de>
 
 	* waskaweb/templates/casemanagement/new.mako: Added id to label

Modified: trunk/waskaweb/controllers/case.py
===================================================================
--- trunk/waskaweb/controllers/case.py	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/controllers/case.py	2008-08-13 13:19:15 UTC (rev 66)
@@ -250,6 +250,8 @@
         c.digest = case.getDigest(empty)
         digest = render('/casemanagement/digest_body.mako')
         formular.append(unicode(digest, 'utf-8'))
+        # append pagebreak
+        formular.append('<span style="page-break-after:always"></span>')
         for ti in self.getNavigation().getAllItems():
             if ti.key in ['27', '28', '29', '30']: continue #ignoring empty aid pages
             content, navigation = self._getRenderdFormElements(ti, id, ro_mode=True, no_data=empty)

Modified: trunk/waskaweb/templates/administration/edit_settings.mako
===================================================================
--- trunk/waskaweb/templates/administration/edit_settings.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/administration/edit_settings.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -35,17 +35,17 @@
             <div class="waska_form_element w30">
 	      <label for="ka_name">${_('adm_form_settings_kaname')}</label>
               % if c.form_errors.get('ka_name'):
-	        <input type="text" class="field error_box" id="ka_name" name="ka_name" value="${c.form_result.get('ka_name', c.agency.getName())| h}">
+	        <input type="text" class="field error_box" id="ka_name" name="ka_name" value="${c.form_result.get('ka_name', c.agency.getName())| h}" maxlength="60">
               % else:
-	        <input type="text" class="field" id="ka_name" name="ka_name" value="${c.form_result.get('ka_name', c.agency.getName())| h}">
+	        <input type="text" class="field" id="ka_name" name="ka_name" value="${c.form_result.get('ka_name', c.agency.getName())| h}" maxlength="60">
               % endif
 	    </div>
             <div class="waska_form_element w30">
 	      <label for="fkz">${_('adm_form_settings_fkz')}</label>
               % if c.form_errors.get('fkz'):
-	        <input type="text" class="error_box" id="fkz" name="fkz" value="${c.form_result.get('fkz', c.agency.getFKZ())| h}">
+	        <input type="text" class="error_box" id="fkz" name="fkz" value="${c.form_result.get('fkz', c.agency.getFKZ())| h}" maxlength="60">
               % else:
-	        <input type="text" id="fkz" name="fkz" value="${c.form_result.get('fkz', c.agency.getFKZ())| h}">
+	        <input type="text" id="fkz" name="fkz" value="${c.form_result.get('fkz', c.agency.getFKZ())| h}" maxlength="60">
               % endif
             </div>
         </fieldset>
@@ -54,9 +54,9 @@
           <div class="waska_form_element w100">
             <label for="max_speicherdauer">${_('adm_form_settings_max_savetime')}</label>
             % if c.form_errors.get('max_speicherdauer'):
-              <input type="text" class="error_box" id="max_speicherdauer" name="max_speicherdauer", value="${c.form_result.get('max_speicherdauer', c.agency.getMaxSavetime())| h}">
+              <input type="text" class="error_box" id="max_speicherdauer" name="max_speicherdauer", value="${c.form_result.get('max_speicherdauer', c.agency.getMaxSavetime())| h}" maxlength="4">
             % else:
-              <input type="text" id="max_speicherdauer" name="max_speicherdauer", value="${c.form_result.get('max_speicherdauer', c.agency.getMaxSavetime())| h}">
+              <input type="text" id="max_speicherdauer" name="max_speicherdauer", value="${c.form_result.get('max_speicherdauer', c.agency.getMaxSavetime())| h}" maxlength="4">
             % endif
             <p>Die maximale Aufbewahrungsdauer legt fest, wie lange eine Fallakte nach Abschluss des CM vorgehalten wird. Nach Ablauf der Frist, wird die Fallakte automatisch zum Löschen vorgeschlagen.</p>
           </div>

Modified: trunk/waskaweb/templates/administration/edit_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/edit_user.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/administration/edit_user.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -36,35 +36,35 @@
           <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}">
+              <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}">
+              <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}">
+	      <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}">
+	      <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}">
+		<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}">
+		<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}">
+		<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>

Modified: trunk/waskaweb/templates/administration/edit_usergroup.mako
===================================================================
--- trunk/waskaweb/templates/administration/edit_usergroup.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/administration/edit_usergroup.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -34,10 +34,10 @@
         <div class="w25">
         % if c.form_errors.get('name'):
           <label for="name" class="error_font">${_('adm_form_usergroup_name')}</label><br>
-            <input type="text" class="field error_box" id="name" name="name">
+            <input type="text" class="field error_box" id="name" name="name" maxlength="128">
         % else:
           <label for="name">${_('adm_form_usergroup_name')}</label><br>
-          <input type="text" class="field" id="name" name="name">
+          <input type="text" class="field" id="name" name="name" maxlength="128">
         % endif
         </div>
       </fieldset>

Modified: trunk/waskaweb/templates/administration/new_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/new_user.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/administration/new_user.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -37,45 +37,45 @@
 	<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">
+            <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">
+            <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">
+            <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">
+            <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">
+		<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">
+		<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">
+		<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">
+            <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">
+            <input type="text" class="field" id="login" name="login" maxlength="64">
           % endif
 	</div>
 	<div class="w50">

Modified: trunk/waskaweb/templates/administration/new_usergroup.mako
===================================================================
--- trunk/waskaweb/templates/administration/new_usergroup.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/administration/new_usergroup.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -32,10 +32,10 @@
   <div class="w25">
   % if c.form_errors.get('name'):
     <label for="name" class="error_font">${_('adm_form_usergroup_name')}</label><br>
-      <input type="text" class="field error_box" id="name" name="name">
+      <input type="text" class="field error_box" id="name" name="name" maxlength="128">
   % else:
     <label for="name">${_('adm_form_usergroup_name')}</label><br>
-    <input type="text" class="field" id="name" name="name">
+    <input type="text" class="field" id="name" name="name" maxlength="128">
   % endif
   </div>
 </fieldset>

Deleted: trunk/waskaweb/templates/administration/userform_body.mako
===================================================================
--- trunk/waskaweb/templates/administration/userform_body.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/administration/userform_body.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -1,56 +0,0 @@
-## -*- coding: utf-8 -*-
-<div id="waska_form">
-<form action="/administration/saveUser" method="POST">
-	<fieldset><legend>${_('adm_form_legend_personal')}</legend>
-	<div class="waska_form_element w100">
-		<label
-		for="firstname">${_('adm_form_user_firstname')}</label><br>
-		<input type="text" class="field" id="firstname" name="firstname", value="${c.user.first_name | h}">
-	</div>
-	<div class="waska_form_element w100">
-		<label
-		for="lastname">${_('adm_form_user_lastname')}</label><br>
-		<input type="text" class="field" id="lasttname" name="lastname" value="${c.user.last_name| h}">
-	</div>
-	<div class="waska_form_element w100">
-		<label
-		for="telephone">${_('adm_form_user_telephone')}</label><br>
-		<input type="text" class="field" id="telephone" name="telephone" value="${c.user.telephone| h}">
-	</div>
-	</fieldset>
-	<fieldset><legend>${_('adm_form_legend_login')}</legend>
-	<div class="waska_form_element w100">
-        % if c.user.activated:
-          <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.user.needs_passrefresh:
-          <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 class="waska_form_element w100">
-		<label
-		for="login">${_('adm_form_user_login')}</label><br>
-		<input type="text" class="field" id="login" name="login" value="${c.user.login| h}">
-	</div>
-	<div class="waska_form_element w50">
-		<label
-		for="passwd">${_('adm_form_user_passwd')}</label><br>
-		<input type="text" class="field" id="passwd" name="passwd">
-	</div>
-	<div class="waska_form_element w50">
-		<label
-		for="passwd2">${_('adm_form_user_passwd_confirm')}</label><br>
-		<input type="text" class="field" id="passwd2" name="passwd2">
-	</div>
-	</fieldset>
-	<input type="submit" value="${_('adm_form_user_submit')}">
-</form>
-</div>

Modified: trunk/waskaweb/templates/appointments/appointment_form.mako
===================================================================
--- trunk/waskaweb/templates/appointments/appointment_form.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/appointments/appointment_form.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -4,11 +4,11 @@
 <form action="/appointment/save" method="post">
 <div class="w25">
 	<label for="title">${_('app_form_label_title')}</label><br>
-	<input type="text" class="field" name="title" id="title">
+	<input type="text" class="field" name="title" id="title" maxlength="128">
 </div>
 <div class="w75">
 	<label for="date">${_('app_form_label_date')}</label><br>
-	<input type="text" class="field" name="date" id="date">
+	<input type="text" class="field" name="date" id="date" maxlength="10">
 </div>
 <div class="w100">
 	<label for="description">${_('app_form_label_description')}</label><br>

Modified: trunk/waskaweb/templates/appointments/edit_body.mako
===================================================================
--- trunk/waskaweb/templates/appointments/edit_body.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/appointments/edit_body.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -5,37 +5,37 @@
   <div class="w25">
     % if c.form_errors.get('start_date'):
       <label for="starte_date" class="error_font">${_('app_form_startdate')}</label><br>
-      <input type="text" class="field error_box" id="start_date" name="start_date">
+      <input type="text" class="field error_box" id="start_date" name="start_date" maxlength="10">
     % else:
       <label for="starte_date">${_('app_form_startdate')}</label><br>
-      <input type="text" class="field" id="start_date" name="start_date">
+      <input type="text" class="field" id="start_date" name="start_date" maxlength="10">
     % endif
   </div>
   <div class="w75">
     % if c.form_errors.get('start_time'):
       <label for="starte_time" class="error_font">${_('app_form_starttime')}</label><br>
-      <input type="text" class="field error_box" id="start_time" name="start_time">
+      <input type="text" class="field error_box" id="start_time" name="start_time" maxlength="5">
     % else:
       <label for="starte_time">${_('app_form_starttime')}</label><br>
-      <input type="text" class="field" id="start_time" name="start_time">
+      <input type="text" class="field" id="start_time" name="start_time" maxlength="5">
     % endif
   </div>
   <div class="w25">
     % if c.form_errors.get('end_date'):
       <label for="ende_date" class="error_font">${_('app_form_enddate')}</label><br>
-      <input type="text" class="field error_box" id="end_date" name="end_date">
+      <input type="text" class="field error_box" id="end_date" name="end_date" maxlength="10">
     % else:
       <label for="ende_date">${_('app_form_enddate')}</label><br>
-      <input type="text" class="field" id="end_date" name="end_date">
+      <input type="text" class="field" id="end_date" name="end_date" maxlength="10">
     % endif
   </div>
   <div class="w75">
     % if c.form_errors.get('end_time'):
       <label for="ende_time" class="error_font">${_('app_form_endtime')}</label><br>
-      <input type="text" class="field error_box" id="end_time" name="end_time">
+      <input type="text" class="field error_box" id="end_time" name="end_time" maxlength="5">
     % else:
       <label for="ende_time">${_('app_form_endtime')}</label><br>
-      <input type="text" class="field" id="end_time" name="end_time">
+      <input type="text" class="field" id="end_time" name="end_time" maxlength="5">
     % endif
   </div>
 </fieldset>

Modified: trunk/waskaweb/templates/casemanagement/newLogbookEntry.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/newLogbookEntry.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/casemanagement/newLogbookEntry.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -34,11 +34,11 @@
             <br>
             <div>
                 <label for="date">Datum:</label>
-                <input type="text" name="date" id="date" value="${c.entry.getDate() | h}">
+                <input type="text" name="date" id="date" value="${c.entry.getDate() | h}" maxlength="10"/>
             </div>
             <div>
                 <label for="date">Uhrzeit:</label>
-                <input type="text" name="time" id="time" value="${c.entry.getTime() | h}">
+                <input type="text" name="time" id="time" value="${c.entry.getTime() | h}" maxlength="5"/>
             </div>
             <div>
                 <label for="kind">Art des Eintrags:</label>
@@ -59,11 +59,11 @@
             </div>
             <div>
                 <label for="short_notice">Nennung Sonstiges:</label>
-                <input type="text" name="short_notice" id="short_notice" value="${c.entry.getShortNotice('') | h}"/>
+                <input type="text" name="short_notice" id="short_notice" value="${c.entry.getShortNotice('') | h}" maxlength="80"/>
             </div>
             <div>
                 <label for="duration">Dauer in Minuten:</label>
-                <input type="text" name="duration" id="duration" value="${c.entry.getDuration() | h}"/>
+                <input type="text" name="duration" id="duration" value="${c.entry.getDuration() | h}"/ maxlength="4">
             </div>
             <div>
                 <label for="notice">Notiz:</label><br>

Modified: trunk/waskaweb/templates/casemanagement/search.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/search.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/casemanagement/search.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -2,7 +2,7 @@
 <div id="search_field">
   <form method="post" name="case_search" action="/case_overview/search/" accept-charset="UTF-8">
   <div>
-    <input type="text" size="30" name="search_str">
+    <input type="text" size="30" name="search_str" maxlength="50">
     <input type="submit" value="${_('cm_form_overview_search_submit')}">
     % if c.extended_search:
       <a href="/case_overview/overview_extended/">Erweiterte Suche ausblenden</a>
@@ -57,7 +57,7 @@
       <tr>
         <td width="80" valign="top"><label for="branch">Filiale:</label></td>
         <td valign="top">
-          <input type="text" name="branch" id="branch">
+          <input type="text" name="branch" id="branch" maxlength="64">
         </td>
       </tr>
       % endif

Deleted: trunk/waskaweb/templates/casemanagement/static_form.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/static_form.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/casemanagement/static_form.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -1,317 +0,0 @@
-# -*- coding: utf-8 -*-
-        <form action="action" accept-charset="&Uuml;TF-8">
-	<div class="w100">
-	<h2>
-	    1. Zust&auml;ndigkeiten, Eingangsdaten
-	</h2>
-	</div>
-	<div class="waska_form_element w100">
-	      <label for="fkz">F&ouml;rderkennzeichen der
-	      Kompetenzagentur <span class="help"><a href=
-	      "help?what=fkz" target="_blank"><img src=
-	      "static?what=images/icons/icon_info.png"
-	      border="0" alt=
-	      "Hilfesymbol"></a></span></label><br>
-	      <input class="field" type="text" name="fkz" id="fkz">
-	</div>
-	<div class="waska_form_element w100">
-	      <label for="name_kompetenzagentur">Name der
-	      Kompetenzagentur</label><br>
-	      <input type="text" class="field" name="name_kompetenzagentur" id= "name_kompetenzagentur"><br>
-	</div>
-	    <div class="waska_form_element w100">
-	      <fieldset>
-		<legend>Name des zust&auml;ndigen Mitarbeiters
-		in der Kompetenzagentur</legend>
-		  <div class="waska_form_element w50">
-		    <label for=
-		    "vorname">Vorname</label><br>
-
-		    <input type="text" class="field" name="vorname" id="vorname"><br>
-		  </div>
-		  <div class="waska_form_element w50">
-		    <label for="name">Name</label><br>
-		    <input type="text" class="field" name="name" id="name"><br>
-		  </div>
-	      </fieldset>
-	    </div>
-	    <div class="waska_form_element w100">
-	      <label for="zugang_kompetenzagentur">Zugang
-	      des Jugendlichen zur
-	      Kompetenzagentur</label><br>
-	      <select size="1" name=
-	      "zugang_kompetenzagentur" id=
-	      "zugang_kompetenzagentur">
-		<option value="-1">
-		  keine Angabe
-		</option>
-
-		<option value="0">
-		  eigenst&auml;ndiger Zugang des Jugendlichen
-		</option>
-		<option value="1">
-		  Familie
-		</option>
-		<option value="2">
-		  Verwandte
-		</option>
-		<option value="3">
-
-		  Freunde
-		</option>
-		<option value="4">
-		  Lehrer/Lehrerin
-		</option>
-		<option value="5">
-		  andere Menschen aus dem sozialen &Uuml;mfeld
-		  des Jugendlichen
-		</option>
-		<option value="6">
-		  Agentur f&uuml;r Arbeit
-		</option>
-
-		<option value="7">
-		  SGB II -Tr&auml;ger
-		</option>
-		<option value="8">
-		  Jugendamt
-		</option>
-		<option value="9">
-		  Jugendhilfeeinrichtung
-		</option>
-		<option value="10">
-
-		  Schule
-		</option>
-		<option value="11">
-		  Streetwork
-		</option>
-		<option value="12">
-		  Beratungsstelle
-		</option>
-		<option value="13">
-		  &Uuml;nternehmen
-		</option>
-
-		<option value="14">
-		  Kompetenzagentur
-		</option>
-		<option value="15">
-		  Sonstiges
-		</option>
-	      </select>
-	  </div>
-	    <div class="waska_form_element w100">
-	      <fieldset>
-		<legend>Bei Eintritt ist der Jugendliche
-		(Mehrfachantworten m&ouml;glich)</legend>
-		  <input type="checkbox" name=
-		  "schulpflichtig" id=
-		  "schulpflichtig"><label for=
-		  "schulpflichtig">schulpflichtig</label><br>
-
-		  <input type="checkbox" name=
-		  "noch_schueler" id=
-		  "noch_schueler"><label for=
-		  "noch_schueler">noch
-		  Sch&uuml;lerin/Sch&uuml;ler</label><br>
-
-		  <div class="waska_form_element w100">
-		    <label for=
-		    "bei_eintritt_ist_der_jugendliche">keine
-		    Beschriftung vorhanden</label><br>
-		    <select size="1" name=
-		    "bei_eintritt_ist_der_jugendliche" id=
-		    "bei_eintritt_ist_der_jugendliche">
-		      <option value="-1">
-			keine Angabe
-		      </option>
-		      <option value="0">
-			in der Schule
-		      </option>
-
-		      <option value="1">
-			in der Ausbildung
-		      </option>
-		      <option value="2">
-			in Arbeit
-		      </option>
-		      <option value="3">
-			arbeitslos
-		      </option>
-		      <option value="4">
-
-			in der Erziehungszeit
-		      </option>
-		    </select>
-		  </div>
-	      </fieldset>
-	  </div>
-	    <div class="waska_form_element w50">
-	      <label for="rechtlicher_kontext">Rechtlicher
-	      Kontext</label><br>
-	      <select size="1" name="rechtlicher_kontext"
-	      id="rechtlicher_kontext">
-		<option value="-1">
-		  keine Angabe
-		</option>
-		<option value="0">
-		  SGB II
-		</option>
-
-		<option value="1">
-		  SGB II
-		</option>
-		<option value="2">
-		  SGB III
-		</option>
-		<option value="3">
-		  SGB XII
-		</option>
-		<option value="4">
-
-		  ungekl&auml;rt
-		</option>
-	      </select>
-	    </div>
-	    <div class="waska_form_element w50">
-	      <label for="schnittstelle_zu">Schnittstelle
-	      zu</label><br>
-	      <select size="1" name="schnittstelle_zu" id=
-	      "schnittstelle_zu">
-		<option value="-1">
-		  keine Angabe
-		</option>
-
-		<option value="0">
-		  SGB II
-		</option>
-		<option value="1">
-		  SGB II
-		</option>
-		<option value="2">
-		  SGB III
-		</option>
-		<option value="3">
-
-		  SGB XII
-		</option>
-	      </select>
-	    </div>
-	  <div class="w100">
-	    <div class="waska_form_element w50">
-	      <label for="kontaktdaten_arge">Kontaktdaten
-	      ARGE/&Ouml;ptionskommune</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kontaktdaten_arge" id=
-	      "kontaktdaten_arge"><br>
-
-	    </div>
-	    <div class="waska_form_element w50">
-	      <label for="kundennummer_arge">Kundennummer
-	      ARGE/&Ouml;ptionskommune</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kundennummer_arge" id=
-	      "kundennummer_arge"><br>
-	    </div>
-	  </div>
-	  <div class="w100">
-	    <div class="waska_form_element w50">
-
-	      <label for=
-	      "kontaktdaten_agentur_fuer_arbeit">Kontaktdaten
-	      Agentur f&uuml;r Arbeit</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kontaktdaten_agentur_fuer_arbeit" id=
-	      "kontaktdaten_agentur_fuer_arbeit"><br>
-	    </div>
-	    <div class="waska_form_element w50">
-	      <label for=
-	      "kundennummer_agentur_fuer_arbeit">Kundennummer
-	      Agentur f&uuml;r Arbeit</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kundennummer_agentur_fuer_arbeit" id=
-	      "kundennummer_agentur_fuer_arbeit"><br>
-	    </div>
-	  </div>
-
-	  <div class="w100">
-	    <div class="waska_form_element w50">
-	      <label for=
-	      "kundennummer_jugendamt">Kontaktdaten
-	      Jugendamt</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kundennummer_jugendamt" id=
-	      "kundennummer_jugendamt"><br>
-	    </div>
-	    <div class="waska_form_element w50">
-	      <label for=
-	      "kontaktdaten_jugendamt">Kundennummer
-	      Jugendamt</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kontaktdaten_jugendamt" id=
-	      "kontaktdaten_jugendamt"><br>
-
-	    </div>
-	  </div>
-	  <div class="w100">
-	    <div class="waska_form_element w50">
-	      <label for="kontaktdaten_schule">Kontaktdaten
-	      Schule</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kontaktdaten_schule" id=
-	      "kontaktdaten_schule"><br>
-	    </div>
-	    <div class="waska_form_element w50">
-
-	      <label for="schulname">Schulname</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="schulname" id="schulname"><br>
-	    </div>
-	  </div>
-	  <div class="w100">
-	    <div class="waska_form_element w50">
-	      <label for=
-	      "kontaktdaten_gerichtshilfe">Kontaktdaten
-	      Gerichtshilfe</label><br>
-	      <input type="text" class="field" size="50" maxlength="100"
-	      name="kontaktdaten_gerichtshilfe" id=
-	      "kontaktdaten_gerichtshilfe"><br>
-
-	    </div>
-	    <div class="waska_form_element w50">
-	      <label for=
-	      "kundennummer_gerichtshilfe">Kundennummer
-	      Gerichtshilfe</label><br>
-	      <input type="text" class="field" name="kundennummer_gerichtshilfe" id=
-	      "kundennummer_gerichtshilfe"><br>
-	    </div>
-	  </div>
-	  <div class="w100">
-	    <div class="waska_form_element w100">
-
-	      <label for=
-	      "kontaktdaten_weitere_institutionen">Kontaktdaten
-	      weitere Institutionen</label><br>
-	      <input type="text" class="field"100" name="kontaktdaten_weitere_institutionen" id=
-	      "kontaktdaten_weitere_institutionen"><br>
-	    </div>
-	  </div>
-	  <div class="w100">
-	    <div class="waska_form_element w50">
-	      <label for="erstgespraech">Datum des
-	      Erstgespr&auml;ches mit dem
-	      Jugendlichen</label><br>
-	      <input type="text" class="field" name="erstgespraech" id="erstgespraech"><br>
-
-	    </div>
-	    <div class="waska_form_element w50">
-	      <label for="kundennummer">Kundennummer bei
-	      der Kompetenzagentur</label><br>
-	      <input type="text" class="field" name="kundennummer" id="kundennummer"><br>
-	    </div>
-	  </div>
-	    <input type="hidden" name="page" value="page_0">
-            <input type="submit" value="Speichern">
-	</form>
-	<!--

Modified: trunk/waskaweb/templates/logbook/edit_body.mako
===================================================================
--- trunk/waskaweb/templates/logbook/edit_body.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/logbook/edit_body.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -4,28 +4,28 @@
   <div class="w25">
     % if c.form_errors.get('date'):
       <label for="date" class="error_font">Datum:</label><br>
-      <input type="text" class="field error_box" name="date" id="date">
+      <input type="text" class="field error_box" name="date" id="date" maxlength="10"/>
     % else:
       <label for="date">Datum:</label><br>
-      <input type="text" class="field" name="date" id="date">
+      <input type="text" class="field" name="date" id="date" maxlength="10"/>
     % endif
   </div>
   <div class="w75">
     % if c.form_errors.get('time'):
       <label for="date" class="error_font">Uhrzeit:</label><br>
-      <input type="text" class="field error_box" name="time" id="time">
+      <input type="text" class="field error_box" name="time" id="time" maxlength="5"/>
     % else:
       <label for="date">Uhrzeit:</label><br>
-      <input type="text" class="field" name="time" id="time">
+      <input type="text" class="field" name="time" id="time" maxlength="5"/>
     % endif
   </div>
   <div class="w25">
     % if c.form_errors.get('duration'):
       <label for="duration" class="error_font">Dauer in Minuten:</label><br>
-      <input type="text" class="field error_box" name="duration" id="duration"/>
+      <input type="text" class="field error_box" name="duration" id="duration" maxlength="4"/>
     % else:
       <label for="duration">Dauer in Minuten:</label><br>
-      <input type="text" class="field" name="duration" id="duration"/>
+      <input type="text" class="field" name="duration" id="duration" maxlength="4"/>
     % endif
   </div>
 </fieldset>

Modified: trunk/waskaweb/templates/login.mako
===================================================================
--- trunk/waskaweb/templates/login.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/login.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -20,7 +20,7 @@
    
 </div>
 <div class="input">
-   <input type="text" size="20" name="username">
+   <input type="text" size="20" name="username" maxlength="64">
 </div>
 <div class="clearer"> </div>
 <div class="label">

Modified: trunk/waskaweb/templates/start/start.mako
===================================================================
--- trunk/waskaweb/templates/start/start.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/start/start.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -22,10 +22,10 @@
 %else:
   % if c.isEvaluationServer: 
   <div id="adm_beta">
-    <p>Sie befinden sich auf dem zentralen Auswerteserver. Diese enthält den Datenbestand aller Fallakten der einzelnen Kompetenzagenturen in anonymisierter Form.<br>Bitte beachten Sie folgende Hinweise:</p>
+    <p>Sie befinden sich auf dem zentralen Auswerteserver. Dieser enthält den Datenbestand aller Fallakten der einzelnen Kompetenzagenturen in anonymisierter Form.<br>Bitte beachten Sie folgende Hinweise:</p>
     <ul>
-      <li>Eine Aktualisierung des Datenbestandes findet wöchentlich am Wochende statt. Die Spalte "Aktualisiert" in der Fallakenübersicht gibt das Alter des Datenbestands einer jeweiligen KA an.</li>
-      <li>Damit Fallakten einer KA auf diesen Server übertragen werden, muss die Option "Fallakten übertragen" in den Agentureinstellungen der jeweiligen KA aktiviert sein. Diese Einstellung kann nur durch den Administrator vorgenommen werden</li>
+      <li>Eine Aktualisierung des Datenbestandes findet wöchentlich am Wochenende statt. Die Spalte "Aktualisiert" in der Fallakenübersicht gibt das Alter des Datenbestands einer jeweiligen KA an.</li>
+      <li>Damit Fallakten einer KA auf diesen Server übertragen werden, muss die Option "Fallakten übertragen" in den Agentureinstellungen der jeweiligen KA aktiviert sein. Diese Einstellung kann nur durch den Administrator vorgenommen werden.</li>
     </ul>
   </div>
   % else:

Deleted: trunk/waskaweb/templates/tests/forms.mako
===================================================================
--- trunk/waskaweb/templates/tests/forms.mako	2008-08-13 13:18:42 UTC (rev 65)
+++ trunk/waskaweb/templates/tests/forms.mako	2008-08-13 13:19:15 UTC (rev 66)
@@ -1,9 +0,0 @@
-<%inherit file="../main.mako" />
-<form name="outer" action="/dummy/save">
-	<input name="outer_text" type="text"><br>
-	<form name="inner" action="/dummy/save2">
-		<input name="inner_text" type="text"><br>
-		<input type="submit" value="inner"><br>
-	</form>
-	<input type="submit" value="outer"><br>
-</form>



More information about the Mpuls-commits mailing list