[Mpuls-commits] r18 - in trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/public/styles waskaweb/templates waskaweb/templates/administration
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:05:11 CEST 2008
Author: thomas
Date: 2008-08-13 15:05:10 +0200 (Wed, 13 Aug 2008)
New Revision: 18
Modified:
trunk/ChangeLog.txt
trunk/waskaweb/controllers/navigation.py
trunk/waskaweb/controllers/rg_aid.py
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/i18n/waskaweb.pot
trunk/waskaweb/lib/helpers.py
trunk/waskaweb/lib/renderer.py
trunk/waskaweb/model/case.py
trunk/waskaweb/model/repeatgroup.py
trunk/waskaweb/public/styles/screen.css
trunk/waskaweb/templates/administration/new_user_result.mako
trunk/waskaweb/templates/logout.mako
Log:
Load 6a60397f3a0b into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/ChangeLog.txt 2008-08-13 13:05:10 UTC (rev 18)
@@ -1,5 +1,42 @@
+2008-01-11 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/i18n/de/LC, SSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot, waskaweb/public/styles/screen.css,
+ waskaweb/templates/administration/new_user_result.mako:
+ Fixed issue 198: Login and Passwort of new created user is now better
+ visible. Fixed typo in po file.
+
2008-01-10 Torsten Irlaender <torsten.irlaender at intevation.de>
+ * waskaweb/controllers/rg_aid.py, waskaweb/lib/renderer.py,
+ waskaweb/model/repeatgroup.py: Fixed issue 207.
+ "Unterstützungsangebote" could not be deleted because the renderer
+ rendered a wrong id for deletion. This error was introduced by the
+ refactoring.
+
+2008-01-10 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/controllers/navigation.py: If a new selected case
+ as toggled in the first time before selecting a page, the
+ session has no parent page and it tried to toggle a
+ not 'bookmarked' page -> 404.
+ Now this case is caught. Fix for issue 206.
+ TODO: Using session for this kind of bookmarking is bad!!!
+ Use the toggle link instead to code the currently displayed page.
+
+2008-01-10 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/model/case.py: A field in SQL statement was missing.
+ Sorting by lastname is now stable against None values.
+ Fix for issue 205.
+
+2008-01-10 Torsten Irlaender <torsten.irlaender at intevation.de>
+
+ * waskaweb/lib/helpers.py: Fixed 404 when trying to print out the
+ whole formular.
+
+2008-01-10 Torsten Irlaender <torsten.irlaender at intevation.de>
+
* waskaweb/model/case.py: Filtering cases for cm for which the privacy
statement is is not set and will not be set in the future. Admin can
see the cases.
Modified: trunk/waskaweb/controllers/navigation.py
===================================================================
--- trunk/waskaweb/controllers/navigation.py 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/controllers/navigation.py 2008-08-13 13:05:10 UTC (rev 18)
@@ -39,13 +39,18 @@
# Check values and toggle navigation tree
ds_id = self._checkInt(ds_id)
page_id = self._checkInt(page_id)
- ti = self.navigation.getTreeItem(page_id)
+ try:
+ ti = self.navigation.getTreeItem(page_id)
+ except:
+ return render('/casemanagement/formular.mako')
+
ti.toggle()
# Load last selected page
session_case = session.get('case')
- sti = self.navigation.getTreeItem(session_case.getPageId())
- if not sti:
+ try:
+ sti = self.navigation.getTreeItem(session_case.getPageId())
+ except:
# session page_id is none (e.g after selecting a case)
sti = ti
c.ds_id = ds_id
Modified: trunk/waskaweb/controllers/rg_aid.py
===================================================================
--- trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/controllers/rg_aid.py 2008-08-13 13:05:10 UTC (rev 18)
@@ -100,7 +100,7 @@
aid = AidObject(ds_type, rg_id)
if aid.delete():
# Redirect to the overview page: 14 should be the correct page key
- redirect_to('/case/show/%s/14' % session.get('case').id)
+ redirect_to('/case/edit/%s/14' % session.get('case').id)
else:
return "Error! Could not delete ds."
else:
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:05:10 UTC (rev 18)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2007-12-17 14:36+0100\n"
+"POT-Creation-Date: 2008-01-11 10:37+0100\n"
"PO-Revision-Date: 2007-10-14 20:33+0200\n"
"Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
@@ -17,6 +17,74 @@
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"Generated-By: Babel 0.9.1\n"
+#: waskaweb/lib/renderer.py:208
+msgid "cm_rg_aid_overview_table_institution"
+msgstr "Institution"
+
+#: waskaweb/lib/renderer.py:209
+msgid "cm_rg_aid_overview_table_offer_type"
+msgstr "Angebotsform"
+
+#: waskaweb/lib/renderer.py:210
+msgid "cm_rg_aid_overview_table_actions"
+msgstr "Aktionen"
+
+#: waskaweb/lib/renderer.py:211
+msgid "cm_rg_aid_overview_table_show"
+msgstr "Anzeigen"
+
+#: waskaweb/lib/renderer.py:212
+msgid "cm_rg_aid_overview_table_edit"
+msgstr "Bearbeiten"
+
+#: waskaweb/lib/renderer.py:213
+msgid "cm_rg_aid_overview_table_"
+msgstr "Löschen"
+
+#: waskaweb/lib/renderer.py:214
+msgid "cm_rg_aid_overview_table_no_offer_found"
+msgstr "Keine Angebote gefunden"
+
+#: waskaweb/lib/renderer.py:215
+msgid "cm_rg_aid_overview_legend_legend"
+msgstr "Legende:"
+
+#: waskaweb/lib/renderer.py:216
+msgid "cm_rg_aid_overview_legend_bb"
+msgstr "(BB)"
+
+#: waskaweb/lib/renderer.py:217
+msgid "cm_rg_aid_overview_legend_common_educational_area"
+msgstr "Allgemein bildenden Bereich"
+
+#: waskaweb/lib/renderer.py:218
+msgid "cm_rg_aid_overview_legend_bv"
+msgstr "(BV)"
+
+#: waskaweb/lib/renderer.py:219
+msgid "cm_rg_aid_overview_legend_vocational_preparation"
+msgstr "Bereich der Berufsvorbereitung"
+
+#: waskaweb/lib/renderer.py:220
+msgid "cm_rg_aid_overview_legend_bq"
+msgstr "(BQ)"
+
+#: waskaweb/lib/renderer.py:221
+msgid "cm_rg_aid_overview_legend_qualifications"
+msgstr "Berufliche Qualifizierung"
+
+#: waskaweb/lib/renderer.py:222
+msgid "cm_rg_aid_overview_legend_lb"
+msgstr "(LB)"
+
+#: waskaweb/lib/renderer.py:223
+msgid "cm_rg_aid_overview_legend_life_skills"
+msgstr "Lebensbewältigung"
+
+#: waskaweb/lib/renderer.py:224
+msgid "cm_rg_aid_overview_legend_new_offer"
+msgstr "Neues Angebot hinzufügen"
+
#: waskaweb/templates/login.mako:3
msgid "login_header_waska_login"
msgstr "WASKA Login"
@@ -47,84 +115,84 @@
#: waskaweb/templates/logout.mako:5
msgid "logout_p_login_again"
-msgstr "um sich erneut in WASKA anzumelden."
+msgstr ", um sich erneut in WASKA anzumelden."
-#: waskaweb/templates/main.mako:66
+#: waskaweb/templates/main.mako:68
msgid "statusbar_logininfo"
msgstr "Angemeldet als"
-#: waskaweb/templates/main.mako:73 waskaweb/templates/main.mako:103
+#: waskaweb/templates/main.mako:75 waskaweb/templates/main.mako:105
msgid "sm_menu_link_home"
msgstr "Schwarzes Brett"
-#: waskaweb/templates/main.mako:74
+#: waskaweb/templates/main.mako:76
msgid "sm_menu_link_help"
msgstr "Hilfe"
-#: waskaweb/templates/main.mako:75
+#: waskaweb/templates/main.mako:77
msgid "sm_menu_link_settings"
msgstr "Mein Konto"
-#: waskaweb/templates/main.mako:77
+#: waskaweb/templates/main.mako:79
msgid "sm_menu_link_logout"
msgstr "Abmelden"
-#: waskaweb/templates/main.mako:83 waskaweb/templates/main.mako:101
+#: waskaweb/templates/main.mako:85 waskaweb/templates/main.mako:103
msgid "np_root"
msgstr "Waska Start"
-#: waskaweb/templates/main.mako:106
+#: waskaweb/templates/main.mako:108
#: waskaweb/templates/appointments/dialogs/confirm.mako:4
#: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:5
msgid "menu_app_link_overview"
msgstr "Termine"
-#: waskaweb/templates/main.mako:109
+#: waskaweb/templates/main.mako:111
msgid "menu_doc_link_overview"
msgstr "Dokumente"
-#: waskaweb/templates/main.mako:118
+#: waskaweb/templates/main.mako:120
msgid "menu_header_cm"
msgstr "Case-Management"
-#: waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:122
msgid "menu_cm_link_overview"
msgstr "Fallakten\t"
-#: waskaweb/templates/main.mako:123
+#: waskaweb/templates/main.mako:125
msgid "menu_cm_link_new"
msgstr "Fallakte anlegen"
-#: waskaweb/templates/main.mako:125
+#: waskaweb/templates/main.mako:127
msgid "menu_cm_link_import"
msgstr "Fallakte importieren"
-#: waskaweb/templates/main.mako:128
+#: waskaweb/templates/main.mako:130
#: waskaweb/templates/casemanagement/evaluation.mako:8
msgid "cm_actions_link_evaluate"
msgstr "Auswertung"
-#: waskaweb/templates/main.mako:141
+#: waskaweb/templates/main.mako:143
msgid "menu_header_adm"
msgstr "Administration"
-#: waskaweb/templates/main.mako:143
+#: waskaweb/templates/main.mako:145
msgid "menu_adm_link_useroverview"
msgstr "Benutzer"
-#: waskaweb/templates/main.mako:146
+#: waskaweb/templates/main.mako:148
msgid "menu_adm_link_showsettings"
msgstr "Agentur"
-#: waskaweb/templates/main.mako:160
+#: waskaweb/templates/main.mako:161
msgid "main_formular_input_error"
msgstr "Fehlerhafte Formulareingabe"
-#: waskaweb/templates/main.mako:183
+#: waskaweb/templates/main.mako:173
msgid "footer_title"
msgstr "WASKA"
-#: waskaweb/templates/main.mako:183
+#: waskaweb/templates/main.mako:173
msgid "footer_version"
msgstr "10.01.08 | Beta 12"
@@ -157,7 +225,7 @@
#: waskaweb/templates/administration/delete_user_helper.mako:6
#: waskaweb/templates/administration/edit_settings.mako:5
#: waskaweb/templates/administration/edit_user.mako:5
-#: waskaweb/templates/administration/new_user.mako:5
+#: waskaweb/templates/administration/new_user.mako:13
#: waskaweb/templates/administration/new_user_result.mako:6
#: waskaweb/templates/administration/overview_user.mako:6
#: waskaweb/templates/administration/reset_password.mako:6
@@ -172,7 +240,7 @@
#: waskaweb/templates/administration/delete_user_helper.mako:7
#: waskaweb/templates/administration/edit_user.mako:6
-#: waskaweb/templates/administration/new_user.mako:6
+#: waskaweb/templates/administration/new_user.mako:14
#: waskaweb/templates/administration/new_user_result.mako:7
#: waskaweb/templates/administration/overview_user.mako:7
#: waskaweb/templates/administration/reset_password.mako:7
@@ -240,12 +308,12 @@
msgid "adm_form_settings_fkz"
msgstr "FKZ der KA"
-#: waskaweb/templates/administration/edit_settings.mako:54
+#: waskaweb/templates/administration/edit_settings.mako:53
#: waskaweb/templates/administration/show_settings.mako:34
msgid "adm_form_settings_anontransfer"
msgstr "Anonymisierte Fallakten übermitteln"
-#: waskaweb/templates/administration/edit_settings.mako:71
+#: waskaweb/templates/administration/edit_settings.mako:70
msgid "adm_form_settings_save"
msgstr "Einstellungen speichern"
@@ -273,7 +341,7 @@
msgstr "Zurück zu: Benutzeransicht"
#: waskaweb/templates/administration/edit_user.mako:27
-#: waskaweb/templates/administration/new_user.mako:28
+#: waskaweb/templates/administration/new_user.mako:36
#: waskaweb/templates/administration/new_user_result.mako:22
#: waskaweb/templates/administration/show_user_body.mako:2
#: waskaweb/templates/administration/userform_body.mako:4
@@ -281,19 +349,19 @@
msgstr "Angaben zur Person"
#: waskaweb/templates/administration/edit_user.mako:30
-#: waskaweb/templates/administration/new_user.mako:31
+#: waskaweb/templates/administration/new_user.mako:39
#: waskaweb/templates/administration/userform_body.mako:7
msgid "adm_form_user_firstname"
msgstr "Vorname"
#: waskaweb/templates/administration/edit_user.mako:38
-#: waskaweb/templates/administration/new_user.mako:39
+#: waskaweb/templates/administration/new_user.mako:47
#: waskaweb/templates/administration/userform_body.mako:12
msgid "adm_form_user_lastname"
msgstr "Nachname"
#: waskaweb/templates/administration/edit_user.mako:46
-#: waskaweb/templates/administration/new_user.mako:47
+#: waskaweb/templates/administration/new_user.mako:55
#: waskaweb/templates/administration/userform_body.mako:17
msgid "adm_form_user_telephone"
msgstr "Telefon"
@@ -303,61 +371,61 @@
msgstr "Raumnummer"
#: waskaweb/templates/administration/edit_user.mako:56
-#: waskaweb/templates/administration/new_user.mako:57
+#: waskaweb/templates/administration/new_user.mako:65
msgid "adm_form_user_branchoffice"
msgstr "Filiale"
#: waskaweb/templates/administration/edit_user.mako:60
-#: waskaweb/templates/administration/new_user.mako:61
-#: waskaweb/templates/administration/new_user_result.mako:45
+#: waskaweb/templates/administration/new_user.mako:69
+#: waskaweb/templates/administration/new_user_result.mako:46
#: waskaweb/templates/administration/userform_body.mako:21
#: waskaweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr "Angaben zum Konto"
#: waskaweb/templates/administration/edit_user.mako:78
-#: waskaweb/templates/administration/new_user.mako:79
+#: waskaweb/templates/administration/new_user.mako:87
#: waskaweb/templates/administration/userform_body.mako:28
msgid "adm_form_user_activated"
msgstr "Benutzer darf sich anmelden"
#: waskaweb/templates/administration/edit_user.mako:86
-#: waskaweb/templates/administration/new_user.mako:83
+#: waskaweb/templates/administration/new_user.mako:91
#: waskaweb/templates/administration/userform_body.mako:36
msgid "adm_form_user_newpass"
msgstr "Benutzer muss bei der nächsten Anmeldung das Passwort setzen"
#: waskaweb/templates/administration/edit_user.mako:89
-#: waskaweb/templates/administration/new_user.mako:86
+#: waskaweb/templates/administration/new_user.mako:94
#: waskaweb/templates/administration/userform_body.mako:54
msgid "adm_form_user_submit"
msgstr "Benutzer speichern"
-#: waskaweb/templates/administration/new_user.mako:7
+#: waskaweb/templates/administration/new_user.mako:15
#: waskaweb/templates/administration/new_user_result.mako:8
msgid "adm_np_newuser"
msgstr "Neuen Benutzer anlegen"
-#: waskaweb/templates/administration/new_user.mako:11
+#: waskaweb/templates/administration/new_user.mako:19
msgid "adm_header_newuser"
msgstr "Neuen Benutzer anlegen"
-#: waskaweb/templates/administration/new_user.mako:16
+#: waskaweb/templates/administration/new_user.mako:24
#: waskaweb/templates/administration/new_user_result.mako:17
#: waskaweb/templates/administration/show_user.mako:17
msgid "menu_adm_link_useroverview_back"
msgstr "Zurück zu: Benutzerübersicht"
-#: waskaweb/templates/administration/new_user.mako:52
+#: waskaweb/templates/administration/new_user.mako:60
msgid "adm_form_user_room"
msgstr "Raumnummer"
-#: waskaweb/templates/administration/new_user.mako:64
+#: waskaweb/templates/administration/new_user.mako:72
#: waskaweb/templates/administration/userform_body.mako:40
msgid "adm_form_user_login"
msgstr "Anmeldekennung"
-#: waskaweb/templates/administration/new_user.mako:71
+#: waskaweb/templates/administration/new_user.mako:79
msgid "adm_form_user_role"
msgstr "Benutzerrolle"
@@ -365,59 +433,63 @@
msgid "adm_header_newuser_Result"
msgstr "Benutzerdaten des neu angelegten Benutzers"
-#: waskaweb/templates/administration/new_user_result.mako:25
+#: waskaweb/templates/administration/new_user_result.mako:23
+msgid "adm_form_new_user_notice"
+msgstr "Bitte geben Sie Anmeldekennung und Passwort an den neuen Nutzer weiter."
+
+#: waskaweb/templates/administration/new_user_result.mako:26
msgid "adm_form_label_forename"
msgstr "Vorname"
-#: waskaweb/templates/administration/new_user_result.mako:29
+#: waskaweb/templates/administration/new_user_result.mako:30
msgid "adm_form_label_name"
msgstr "Name"
-#: waskaweb/templates/administration/new_user_result.mako:33
+#: waskaweb/templates/administration/new_user_result.mako:34
msgid "adm_form_label_phone"
msgstr "Telefon"
-#: waskaweb/templates/administration/new_user_result.mako:37
+#: waskaweb/templates/administration/new_user_result.mako:38
msgid "adm_form_label_room"
msgstr "Raumnummer"
-#: waskaweb/templates/administration/new_user_result.mako:41
+#: waskaweb/templates/administration/new_user_result.mako:42
msgid "adm_form_label_agency"
msgstr "Agentur"
-#: waskaweb/templates/administration/new_user_result.mako:48
+#: waskaweb/templates/administration/new_user_result.mako:49
msgid "adm_form_label_login"
-msgstr "Login"
+msgstr "Anmeldekennung"
-#: waskaweb/templates/administration/new_user_result.mako:52
+#: waskaweb/templates/administration/new_user_result.mako:53
msgid "adm_form_label_password"
msgstr "Passwort"
-#: waskaweb/templates/administration/new_user_result.mako:56
+#: waskaweb/templates/administration/new_user_result.mako:57
msgid "adm_form_label_role"
msgstr "Rolle"
-#: waskaweb/templates/administration/new_user_result.mako:60
+#: waskaweb/templates/administration/new_user_result.mako:61
msgid "adm_form_label_activated"
msgstr "Aktiviert"
-#: waskaweb/templates/administration/new_user_result.mako:63
+#: waskaweb/templates/administration/new_user_result.mako:64
msgid "adm_form_is_activated_yes"
msgstr "Ja"
-#: waskaweb/templates/administration/new_user_result.mako:65
+#: waskaweb/templates/administration/new_user_result.mako:66
msgid "adm_form_is_activated_no"
msgstr "Nein"
-#: waskaweb/templates/administration/new_user_result.mako:70
+#: waskaweb/templates/administration/new_user_result.mako:71
msgid "adm_form_label_login_pw"
msgstr "Bei Anmeldung neues Passwort verlangen"
-#: waskaweb/templates/administration/new_user_result.mako:73
+#: waskaweb/templates/administration/new_user_result.mako:74
msgid "adm_form_needs_pw_yes"
msgstr "Ja"
-#: waskaweb/templates/administration/new_user_result.mako:75
+#: waskaweb/templates/administration/new_user_result.mako:76
msgid "adm_form_needs_pw_no"
msgstr "Nein"
@@ -693,22 +765,16 @@
#: waskaweb/templates/appointments/overview_body.mako:4
#: waskaweb/templates/appointments/overview_body.mako:59
-#: waskaweb/templates/start/start.mako:31
-#: waskaweb/templates/start/start.mako:68
msgid "app_overview_tbl_header_date"
msgstr "Datum"
#: waskaweb/templates/appointments/overview_body.mako:5
#: waskaweb/templates/appointments/overview_body.mako:60
-#: waskaweb/templates/start/start.mako:32
-#: waskaweb/templates/start/start.mako:69
msgid "app_overview_tbl_header_desc"
msgstr "Beschreibung"
#: waskaweb/templates/appointments/overview_body.mako:6
#: waskaweb/templates/appointments/overview_body.mako:61
-#: waskaweb/templates/start/start.mako:33
-#: waskaweb/templates/start/start.mako:70
msgid "app_overview_tbl_header_actions"
msgstr "Aktionen"
@@ -777,7 +843,6 @@
#: waskaweb/templates/casemanagement/formular.mako:34
#: waskaweb/templates/casemanagement/new_appointment.mako:5
#: waskaweb/templates/casemanagement/organisation.mako:5
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:6
#: waskaweb/templates/documents/case_new.mako:4
#: waskaweb/templates/documents/case_overview.mako:5
msgid "cm_np_select"
@@ -1197,18 +1262,17 @@
msgstr "Fallaktenansicht"
#: waskaweb/templates/casemanagement/formular.mako:17
-#: waskaweb/templates/casemanagement/formular.mako:71
+#: waskaweb/templates/casemanagement/formular.mako:83
msgid "cm_actions_link_show"
msgstr "Bearbeitung beenden"
#: waskaweb/templates/casemanagement/formular.mako:19
-#: waskaweb/templates/casemanagement/formular.mako:73
+#: waskaweb/templates/casemanagement/formular.mako:85
msgid "cm_actions_link_edit"
msgstr "In Bearbeitung nehmen"
#: waskaweb/templates/casemanagement/formular.mako:22
-#: waskaweb/templates/casemanagement/formular.mako:76
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:18
+#: waskaweb/templates/casemanagement/formular.mako:88
msgid "cm_actions_link_printout"
msgstr "Druckversion"
@@ -1352,106 +1416,14 @@
msgstr ""
"Hier wird eine Auflistung der Fälle des angemeldeten Benutzers angezeigt"
-#: waskaweb/templates/casemanagement/overview.mako:18
+#: waskaweb/templates/casemanagement/overview.mako:17
msgid "cm_header_search"
msgstr "Suche"
-#: waskaweb/templates/casemanagement/overview.mako:23
+#: waskaweb/templates/casemanagement/overview.mako:22
msgid "cm_form_overview_search_submit"
msgstr "Suchen"
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:11
-msgid "cm_rg_aid_overview_header_overview_support_offer"
-msgstr "Übersicht Unterstützungsangebote"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:20
-msgid "cm_actions_link_printoutAidPlanStatement"
-msgstr "Förderplan drucken"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:32
-msgid "cm_rg_aid_overview_table_institution"
-msgstr "Institution"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:33
-msgid "cm_rg_aid_overview_table_offer_type"
-msgstr "Angebotsform"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:34
-msgid "cm_rg_aid_overview_table_actions"
-msgstr "Aktionen"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:46
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:48
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:63
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:65
-msgid "cm_rg_aid_overview_table_show"
-msgstr "Anzeigen"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:51
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:68
-msgid "cm_rg_aid_overview_table_"
-msgstr "Löschen"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:78
-msgid "cm_rg_aid_overview_table_no_offer_found"
-msgstr "Keine Angebote gefunden"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_legend"
-msgstr "Legende:"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_bb"
-msgstr "(BB)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_common_educational_area"
-msgstr "Allgemein bildenden Bereich"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_bv"
-msgstr "(BV)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_vocational_preparation"
-msgstr "Bereich der Berufsvorbereitung"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_bq"
-msgstr "(BQ)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_qualifications"
-msgstr "Berufliche Qualifizierung"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_lb"
-msgstr "(LB)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_life_skills"
-msgstr "Lebensbewältigung"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:88
-msgid "cm_rg_aid_overview_legend_new_offer"
-msgstr "Neues Angebot hinzufügen"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:90
-msgid "cm_rg_aid_overview_option_common_educational_area"
-msgstr "allg. bildender Bereich (BB)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:91
-msgid "cm_rg_aid_overview_option_vocational_preparation"
-msgstr "Berufsvorbereitung (BV)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:92
-msgid "cm_rg_aid_overview_option_qualifications"
-msgstr "berufl. Qualifizierung (BQ)"
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:93
-msgid "cm_rg_aid_overview_option_life_skills"
-msgstr "Lebensbewältigung (LB)"
-
#: waskaweb/templates/casemanagement/upload.mako:6
#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:6
msgid "cm_np_import"
@@ -1626,11 +1598,6 @@
msgid "start_header_blackboard"
msgstr "Schwarzes Brett"
-#: waskaweb/templates/start/start.mako:28
-#: waskaweb/templates/start/start.mako:65
-msgid "start_header_remind"
-msgstr "Erinnerungen"
-
#: waskaweb/templates/statement/edit.mako:3
msgid "statement_edit_header_statement"
msgstr "Einverständniserklärung"
@@ -1809,6 +1776,27 @@
msgid "usersettings_p_overview_personal_data"
msgstr "Hier sehen sie eine Übersicht Ihrer persönlichen Daten."
+#~ msgid "cm_rg_aid_overview_header_overview_support_offer"
+#~ msgstr "Übersicht Unterstützungsangebote"
+
+#~ msgid "cm_actions_link_printoutAidPlanStatement"
+#~ msgstr "Förderplan drucken"
+
+#~ msgid "cm_rg_aid_overview_option_common_educational_area"
+#~ msgstr "allg. bildender Bereich (BB)"
+
+#~ msgid "cm_rg_aid_overview_option_vocational_preparation"
+#~ msgstr "Berufsvorbereitung (BV)"
+
+#~ msgid "cm_rg_aid_overview_option_qualifications"
+#~ msgstr "berufl. Qualifizierung (BQ)"
+
+#~ msgid "cm_rg_aid_overview_option_life_skills"
+#~ msgstr "Lebensbewältigung (LB)"
+
+#~ msgid "start_header_remind"
+#~ msgstr "Erinnerungen"
+
#~ msgid "doc_np_root"
#~ msgstr "Dokumente"
Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:05:10 UTC (rev 18)
@@ -1,14 +1,14 @@
# Translations template for waskaweb.
-# Copyright (C) 2007 ORGANIZATION
+# Copyright (C) 2008 ORGANIZATION
# This file is distributed under the same license as the waskaweb project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2007.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2008.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2007-12-17 14:36+0100\n"
+"POT-Creation-Date: 2008-01-11 10:37+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,6 +17,74 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.1\n"
+#: waskaweb/lib/renderer.py:208
+msgid "cm_rg_aid_overview_table_institution"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:209
+msgid "cm_rg_aid_overview_table_offer_type"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:210
+msgid "cm_rg_aid_overview_table_actions"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:211
+msgid "cm_rg_aid_overview_table_show"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:212
+msgid "cm_rg_aid_overview_table_edit"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:213
+msgid "cm_rg_aid_overview_table_"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:214
+msgid "cm_rg_aid_overview_table_no_offer_found"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:215
+msgid "cm_rg_aid_overview_legend_legend"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:216
+msgid "cm_rg_aid_overview_legend_bb"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:217
+msgid "cm_rg_aid_overview_legend_common_educational_area"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:218
+msgid "cm_rg_aid_overview_legend_bv"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:219
+msgid "cm_rg_aid_overview_legend_vocational_preparation"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:220
+msgid "cm_rg_aid_overview_legend_bq"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:221
+msgid "cm_rg_aid_overview_legend_qualifications"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:222
+msgid "cm_rg_aid_overview_legend_lb"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:223
+msgid "cm_rg_aid_overview_legend_life_skills"
+msgstr ""
+
+#: waskaweb/lib/renderer.py:224
+msgid "cm_rg_aid_overview_legend_new_offer"
+msgstr ""
+
#: waskaweb/templates/login.mako:3
msgid "login_header_waska_login"
msgstr ""
@@ -49,82 +117,82 @@
msgid "logout_p_login_again"
msgstr ""
-#: waskaweb/templates/main.mako:66
+#: waskaweb/templates/main.mako:68
msgid "statusbar_logininfo"
msgstr ""
-#: waskaweb/templates/main.mako:73 waskaweb/templates/main.mako:103
+#: waskaweb/templates/main.mako:75 waskaweb/templates/main.mako:105
msgid "sm_menu_link_home"
msgstr ""
-#: waskaweb/templates/main.mako:74
+#: waskaweb/templates/main.mako:76
msgid "sm_menu_link_help"
msgstr ""
-#: waskaweb/templates/main.mako:75
+#: waskaweb/templates/main.mako:77
msgid "sm_menu_link_settings"
msgstr ""
-#: waskaweb/templates/main.mako:77
+#: waskaweb/templates/main.mako:79
msgid "sm_menu_link_logout"
msgstr ""
-#: waskaweb/templates/main.mako:83 waskaweb/templates/main.mako:101
+#: waskaweb/templates/main.mako:85 waskaweb/templates/main.mako:103
msgid "np_root"
msgstr ""
-#: waskaweb/templates/main.mako:106
+#: waskaweb/templates/main.mako:108
#: waskaweb/templates/appointments/dialogs/confirm.mako:4
#: waskaweb/templates/appointments/dialogs/notificate_delete_appointment.mako:5
msgid "menu_app_link_overview"
msgstr ""
-#: waskaweb/templates/main.mako:109
+#: waskaweb/templates/main.mako:111
msgid "menu_doc_link_overview"
msgstr ""
-#: waskaweb/templates/main.mako:118
+#: waskaweb/templates/main.mako:120
msgid "menu_header_cm"
msgstr ""
-#: waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:122
msgid "menu_cm_link_overview"
msgstr ""
-#: waskaweb/templates/main.mako:123
+#: waskaweb/templates/main.mako:125
msgid "menu_cm_link_new"
msgstr ""
-#: waskaweb/templates/main.mako:125
+#: waskaweb/templates/main.mako:127
msgid "menu_cm_link_import"
msgstr ""
-#: waskaweb/templates/main.mako:128
+#: waskaweb/templates/main.mako:130
#: waskaweb/templates/casemanagement/evaluation.mako:8
msgid "cm_actions_link_evaluate"
msgstr ""
-#: waskaweb/templates/main.mako:141
+#: waskaweb/templates/main.mako:143
msgid "menu_header_adm"
msgstr ""
-#: waskaweb/templates/main.mako:143
+#: waskaweb/templates/main.mako:145
msgid "menu_adm_link_useroverview"
msgstr ""
-#: waskaweb/templates/main.mako:146
+#: waskaweb/templates/main.mako:148
msgid "menu_adm_link_showsettings"
msgstr ""
-#: waskaweb/templates/main.mako:160
+#: waskaweb/templates/main.mako:161
msgid "main_formular_input_error"
msgstr ""
-#: waskaweb/templates/main.mako:183
+#: waskaweb/templates/main.mako:173
msgid "footer_title"
msgstr ""
-#: waskaweb/templates/main.mako:183
+#: waskaweb/templates/main.mako:173
msgid "footer_version"
msgstr ""
@@ -152,7 +220,7 @@
#: waskaweb/templates/administration/delete_user_helper.mako:6
#: waskaweb/templates/administration/edit_settings.mako:5
#: waskaweb/templates/administration/edit_user.mako:5
-#: waskaweb/templates/administration/new_user.mako:5
+#: waskaweb/templates/administration/new_user.mako:13
#: waskaweb/templates/administration/new_user_result.mako:6
#: waskaweb/templates/administration/overview_user.mako:6
#: waskaweb/templates/administration/reset_password.mako:6
@@ -167,7 +235,7 @@
#: waskaweb/templates/administration/delete_user_helper.mako:7
#: waskaweb/templates/administration/edit_user.mako:6
-#: waskaweb/templates/administration/new_user.mako:6
+#: waskaweb/templates/administration/new_user.mako:14
#: waskaweb/templates/administration/new_user_result.mako:7
#: waskaweb/templates/administration/overview_user.mako:7
#: waskaweb/templates/administration/reset_password.mako:7
@@ -231,12 +299,12 @@
msgid "adm_form_settings_fkz"
msgstr ""
-#: waskaweb/templates/administration/edit_settings.mako:54
+#: waskaweb/templates/administration/edit_settings.mako:53
#: waskaweb/templates/administration/show_settings.mako:34
msgid "adm_form_settings_anontransfer"
msgstr ""
-#: waskaweb/templates/administration/edit_settings.mako:71
+#: waskaweb/templates/administration/edit_settings.mako:70
msgid "adm_form_settings_save"
msgstr ""
@@ -264,7 +332,7 @@
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:27
-#: waskaweb/templates/administration/new_user.mako:28
+#: waskaweb/templates/administration/new_user.mako:36
#: waskaweb/templates/administration/new_user_result.mako:22
#: waskaweb/templates/administration/show_user_body.mako:2
#: waskaweb/templates/administration/userform_body.mako:4
@@ -272,19 +340,19 @@
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:30
-#: waskaweb/templates/administration/new_user.mako:31
+#: waskaweb/templates/administration/new_user.mako:39
#: waskaweb/templates/administration/userform_body.mako:7
msgid "adm_form_user_firstname"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:38
-#: waskaweb/templates/administration/new_user.mako:39
+#: waskaweb/templates/administration/new_user.mako:47
#: waskaweb/templates/administration/userform_body.mako:12
msgid "adm_form_user_lastname"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:46
-#: waskaweb/templates/administration/new_user.mako:47
+#: waskaweb/templates/administration/new_user.mako:55
#: waskaweb/templates/administration/userform_body.mako:17
msgid "adm_form_user_telephone"
msgstr ""
@@ -294,61 +362,61 @@
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:56
-#: waskaweb/templates/administration/new_user.mako:57
+#: waskaweb/templates/administration/new_user.mako:65
msgid "adm_form_user_branchoffice"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:60
-#: waskaweb/templates/administration/new_user.mako:61
-#: waskaweb/templates/administration/new_user_result.mako:45
+#: waskaweb/templates/administration/new_user.mako:69
+#: waskaweb/templates/administration/new_user_result.mako:46
#: waskaweb/templates/administration/userform_body.mako:21
#: waskaweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:78
-#: waskaweb/templates/administration/new_user.mako:79
+#: waskaweb/templates/administration/new_user.mako:87
#: waskaweb/templates/administration/userform_body.mako:28
msgid "adm_form_user_activated"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:86
-#: waskaweb/templates/administration/new_user.mako:83
+#: waskaweb/templates/administration/new_user.mako:91
#: waskaweb/templates/administration/userform_body.mako:36
msgid "adm_form_user_newpass"
msgstr ""
#: waskaweb/templates/administration/edit_user.mako:89
-#: waskaweb/templates/administration/new_user.mako:86
+#: waskaweb/templates/administration/new_user.mako:94
#: waskaweb/templates/administration/userform_body.mako:54
msgid "adm_form_user_submit"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:7
+#: waskaweb/templates/administration/new_user.mako:15
#: waskaweb/templates/administration/new_user_result.mako:8
msgid "adm_np_newuser"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:11
+#: waskaweb/templates/administration/new_user.mako:19
msgid "adm_header_newuser"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:16
+#: waskaweb/templates/administration/new_user.mako:24
#: waskaweb/templates/administration/new_user_result.mako:17
#: waskaweb/templates/administration/show_user.mako:17
msgid "menu_adm_link_useroverview_back"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:52
+#: waskaweb/templates/administration/new_user.mako:60
msgid "adm_form_user_room"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:64
+#: waskaweb/templates/administration/new_user.mako:72
#: waskaweb/templates/administration/userform_body.mako:40
msgid "adm_form_user_login"
msgstr ""
-#: waskaweb/templates/administration/new_user.mako:71
+#: waskaweb/templates/administration/new_user.mako:79
msgid "adm_form_user_role"
msgstr ""
@@ -356,59 +424,63 @@
msgid "adm_header_newuser_Result"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:25
+#: waskaweb/templates/administration/new_user_result.mako:23
+msgid "adm_form_new_user_notice"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:26
msgid "adm_form_label_forename"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:29
+#: waskaweb/templates/administration/new_user_result.mako:30
msgid "adm_form_label_name"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:33
+#: waskaweb/templates/administration/new_user_result.mako:34
msgid "adm_form_label_phone"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:37
+#: waskaweb/templates/administration/new_user_result.mako:38
msgid "adm_form_label_room"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:41
+#: waskaweb/templates/administration/new_user_result.mako:42
msgid "adm_form_label_agency"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:48
+#: waskaweb/templates/administration/new_user_result.mako:49
msgid "adm_form_label_login"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:52
+#: waskaweb/templates/administration/new_user_result.mako:53
msgid "adm_form_label_password"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:56
+#: waskaweb/templates/administration/new_user_result.mako:57
msgid "adm_form_label_role"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:60
+#: waskaweb/templates/administration/new_user_result.mako:61
msgid "adm_form_label_activated"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:63
+#: waskaweb/templates/administration/new_user_result.mako:64
msgid "adm_form_is_activated_yes"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:65
+#: waskaweb/templates/administration/new_user_result.mako:66
msgid "adm_form_is_activated_no"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:70
+#: waskaweb/templates/administration/new_user_result.mako:71
msgid "adm_form_label_login_pw"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:73
+#: waskaweb/templates/administration/new_user_result.mako:74
msgid "adm_form_needs_pw_yes"
msgstr ""
-#: waskaweb/templates/administration/new_user_result.mako:75
+#: waskaweb/templates/administration/new_user_result.mako:76
msgid "adm_form_needs_pw_no"
msgstr ""
@@ -684,19 +756,16 @@
#: waskaweb/templates/appointments/overview_body.mako:4
#: waskaweb/templates/appointments/overview_body.mako:59
-#: waskaweb/templates/start/start.mako:31 waskaweb/templates/start/start.mako:68
msgid "app_overview_tbl_header_date"
msgstr ""
#: waskaweb/templates/appointments/overview_body.mako:5
#: waskaweb/templates/appointments/overview_body.mako:60
-#: waskaweb/templates/start/start.mako:32 waskaweb/templates/start/start.mako:69
msgid "app_overview_tbl_header_desc"
msgstr ""
#: waskaweb/templates/appointments/overview_body.mako:6
#: waskaweb/templates/appointments/overview_body.mako:61
-#: waskaweb/templates/start/start.mako:33 waskaweb/templates/start/start.mako:70
msgid "app_overview_tbl_header_actions"
msgstr ""
@@ -765,7 +834,6 @@
#: waskaweb/templates/casemanagement/formular.mako:34
#: waskaweb/templates/casemanagement/new_appointment.mako:5
#: waskaweb/templates/casemanagement/organisation.mako:5
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:6
#: waskaweb/templates/documents/case_new.mako:4
#: waskaweb/templates/documents/case_overview.mako:5
msgid "cm_np_select"
@@ -1174,18 +1242,17 @@
msgstr ""
#: waskaweb/templates/casemanagement/formular.mako:17
-#: waskaweb/templates/casemanagement/formular.mako:71
+#: waskaweb/templates/casemanagement/formular.mako:83
msgid "cm_actions_link_show"
msgstr ""
#: waskaweb/templates/casemanagement/formular.mako:19
-#: waskaweb/templates/casemanagement/formular.mako:73
+#: waskaweb/templates/casemanagement/formular.mako:85
msgid "cm_actions_link_edit"
msgstr ""
#: waskaweb/templates/casemanagement/formular.mako:22
-#: waskaweb/templates/casemanagement/formular.mako:76
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:18
+#: waskaweb/templates/casemanagement/formular.mako:88
msgid "cm_actions_link_printout"
msgstr ""
@@ -1317,106 +1384,14 @@
msgid "cm_overview_con_list_dossiers_cm"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:18
+#: waskaweb/templates/casemanagement/overview.mako:17
msgid "cm_header_search"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:23
+#: waskaweb/templates/casemanagement/overview.mako:22
msgid "cm_form_overview_search_submit"
msgstr ""
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:11
-msgid "cm_rg_aid_overview_header_overview_support_offer"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:20
-msgid "cm_actions_link_printoutAidPlanStatement"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:32
-msgid "cm_rg_aid_overview_table_institution"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:33
-msgid "cm_rg_aid_overview_table_offer_type"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:34
-msgid "cm_rg_aid_overview_table_actions"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:46
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:48
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:63
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:65
-msgid "cm_rg_aid_overview_table_show"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:51
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:68
-msgid "cm_rg_aid_overview_table_"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:78
-msgid "cm_rg_aid_overview_table_no_offer_found"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_legend"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_bb"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_common_educational_area"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_bv"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_vocational_preparation"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_bq"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_qualifications"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_lb"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:83
-msgid "cm_rg_aid_overview_legend_life_skills"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:88
-msgid "cm_rg_aid_overview_legend_new_offer"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:90
-msgid "cm_rg_aid_overview_option_common_educational_area"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:91
-msgid "cm_rg_aid_overview_option_vocational_preparation"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:92
-msgid "cm_rg_aid_overview_option_qualifications"
-msgstr ""
-
-#: waskaweb/templates/casemanagement/rg_aid_overview.mako:93
-msgid "cm_rg_aid_overview_option_life_skills"
-msgstr ""
-
#: waskaweb/templates/casemanagement/upload.mako:6
#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:6
msgid "cm_np_import"
@@ -1591,10 +1566,6 @@
msgid "start_header_blackboard"
msgstr ""
-#: waskaweb/templates/start/start.mako:28 waskaweb/templates/start/start.mako:65
-msgid "start_header_remind"
-msgstr ""
-
#: waskaweb/templates/statement/edit.mako:3
msgid "statement_edit_header_statement"
msgstr ""
Modified: trunk/waskaweb/lib/helpers.py
===================================================================
--- trunk/waskaweb/lib/helpers.py 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/lib/helpers.py 2008-08-13 13:05:10 UTC (rev 18)
@@ -50,22 +50,28 @@
def getFormularHeaders(page_id):
navigation = session.get('navigation.tree')
- headers = navigation.getHeaders(page_id)
+ try:
+ headers = navigation.getHeaders(page_id)
+ except:
+ return ""
return headers
def getFormularName(page_id):
navigation = session.get('navigation.tree')
- ti = navigation.getTreeItem(page_id)
try:
+ ti = navigation.getTreeItem(page_id)
return "Akte: %s" % ti.description
- except AttributeError:
+ except:
pass
def getFormularErrors(page_id):
errors_on_page = {}
# Get treeitem
navigation = session.get('navigation.tree')
- ti = navigation.getTreeItem(page_id)
+ try:
+ ti = navigation.getTreeItem(page_id)
+ except:
+ return {}
errors = session.get('case').getFormErrors()
try:
for key, err in errors.iteritems():
Modified: trunk/waskaweb/lib/renderer.py
===================================================================
--- trunk/waskaweb/lib/renderer.py 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/lib/renderer.py 2008-08-13 13:05:10 UTC (rev 18)
@@ -1,4 +1,4 @@
-# -*- coding: latin1 -*-
+# -*- coding: utf-8 -*-
#
# Copyright (c) 2007 by Intevation GmbH
# Authors:
@@ -236,12 +236,12 @@
idset = True
for aid in self.aidList.getDatasets():
class_str = ""
- out.append(u"""<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>""" %
+ out.append(u"""<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td>""" %
(F.NA(aid.start_date), F.NA(aid.end_date), F.NA(aid.institution), F.NA(aid.type)))
- out.append(u"""<td class="table_action"><a href="/rg_aid/%s/%s/%s">%s</a>""" %
+ out.append(u"""<td class="table_action"><a href="/rg_aid/%s/%s/%s">%s</a>""" %
(action,aid.id, aid.page_id, s_show))
if not self.ro_mode and h.hasRole(['cm_ka']):
- out.append(u"""<a href="/rg_aid/delete/%s/%s/0">%s</a>""" % (aid.id, aid.page_id, s_delete))
+ out.append(u"""<a href="/rg_aid/delete/%s/%s/0">%s</a>""" % (aid.id, aid.type_id, s_delete))
out.append("""</td></tr>""")
if self.aidList.numDatasets() <= 0:
@@ -778,4 +778,4 @@
return "".join(out)
-# vim:set ts=4 sw=4 si et sta sts=4:
+# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8:
Modified: trunk/waskaweb/model/case.py
===================================================================
--- trunk/waskaweb/model/case.py 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/model/case.py 2008-08-13 13:05:10 UTC (rev 18)
@@ -21,28 +21,41 @@
from waskaweb.model.document import listDocuments
# SQL STATEMENTS
-LOAD_CASE_OVERVIEW_SQL = """SELECT id,
- name_1,
- vorname_1,
- kundennummer FROM master_tbl_view
- WHERE TRUE %s
+LOAD_CASE_OVERVIEW_SQL = \
+""" SELECT id,
+ name_1,
+ vorname_1,
+ kundennummer
+ FROM master_tbl_view
+ WHERE
+ TRUE
+ %s
ORDER by name_1"""
-EDITOR_CASE_OVERVIEW_SQL = """SELECT
- id,
- name_1,
- vorname_1,
- kundennummer FROM master_tbl_view WHERE bearbeiter_id = %%(editor)s
- %s
+EDITOR_CASE_OVERVIEW_SQL = \
+""" SELECT
+ id,
+ name_1,
+ vorname_1,
+ kundennummer
+ FROM master_tbl_view
+ WHERE
+ bearbeiter_id = %%(editor)s
+ %s
ORDER by name_1"""
-SEARCH_CASE_OVERVIEW_SQL = """SELECT
- id,
- name_1,
- vorname_1 FROM master_tbl_view WHERE vorname_1 ~* %%(needle)s
- OR name_1 ~* %%(needle)s
- OR kundennummer ~* %%(needle)s
- %s
+SEARCH_CASE_OVERVIEW_SQL = \
+""" SELECT
+ id,
+ name_1,
+ vorname_1,
+ kundennummer
+ FROM master_tbl_view
+ WHERE
+ vorname_1 ~* %%(needle)s
+ OR name_1 ~* %%(needle)s
+ OR kundennummer ~* %%(needle)s
+ %s
ORDER by name_1"""
LOAD_CASE_DIGEST_SQL = """SELECT name_1, vorname_1, kundennummer, date_part('year', age(geburtsdatum::timestamp)) as alter, plz, strasse, wohnort, vorwahl, telefon_1, einverstaendniserklaerung from master_tbl_view WHERE id = %(id)s"""
@@ -182,6 +195,9 @@
def sortByLastname(self):
def _cmp(a, b):
+ if a is None and b is None: return 0
+ if a is None: return -1
+ if b is None: return +1
return strcoll(a.last_name, b.last_name)
self.ds_list.sort(_cmp)
Modified: trunk/waskaweb/model/repeatgroup.py
===================================================================
--- trunk/waskaweb/model/repeatgroup.py 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/model/repeatgroup.py 2008-08-13 13:05:10 UTC (rev 18)
@@ -161,7 +161,7 @@
try:
conn = db.getConnection()
cur = conn.cursor()
- sql = (AID[str(self.type_id)][4]) # get delete function
+ sql = AID[str(self.type_id)][4] # get delete function
cur.execute(sql, { 'id': self.id })
conn.commit()
finally:
Modified: trunk/waskaweb/public/styles/screen.css
===================================================================
--- trunk/waskaweb/public/styles/screen.css 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/public/styles/screen.css 2008-08-13 13:05:10 UTC (rev 18)
@@ -549,7 +549,12 @@
margin-left:1em;
}
+#newpassword {
+ font-size: 1.5em;
+ font-weight: bold;
+}
+
/* Traeger */
.traeger {
Modified: trunk/waskaweb/templates/administration/new_user_result.mako
===================================================================
--- trunk/waskaweb/templates/administration/new_user_result.mako 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/templates/administration/new_user_result.mako 2008-08-13 13:05:10 UTC (rev 18)
@@ -20,6 +20,7 @@
</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>
@@ -46,11 +47,11 @@
<table>
<tr>
<td class="label table_header_v table_width_long">${_('adm_form_label_login')}</td>
- <td class="table_row_v table_description">${c.uo.getLogin()| F.NA, h}</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">${c.user_password| F.NA, h}</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>
Modified: trunk/waskaweb/templates/logout.mako
===================================================================
--- trunk/waskaweb/templates/logout.mako 2008-08-13 13:04:48 UTC (rev 17)
+++ trunk/waskaweb/templates/logout.mako 2008-08-13 13:05:10 UTC (rev 18)
@@ -2,5 +2,5 @@
<%inherit file="main_login.mako" />
<h1>${_('logout_header_waska_logout')}</h1>
<div id="waska_form_login">
-<p>${_('logout_p_logout successful')} <a href="/">${_('logout_a_login')}</a> ${_('logout_p_login_again')}.</p>
-</div>
\ No newline at end of file
+<p>${_('logout_p_logout successful')} <a href="/">${_('logout_a_login')}</a>${_('logout_p_login_again')}.</p>
+</div>
More information about the Mpuls-commits
mailing list