[Mpuls-commits] r10 - in trunk: . waskaweb/config waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model waskaweb/public/images waskaweb/public/styles waskaweb/templates waskaweb/templates/administration waskaweb/templates/appointments waskaweb/templates/casemanagement waskaweb/templates/documents waskaweb/templates/start waskaweb/templates/statement waskaweb/templates/statement/dialogs waskaweb/templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:03:17 CEST 2008
Author: thomas
Date: 2008-08-13 15:03:16 +0200 (Wed, 13 Aug 2008)
New Revision: 10
Modified:
trunk/ChangeLog.txt
trunk/development_wsgi.ini
trunk/waskaweb/config/middleware.py
trunk/waskaweb/controllers/administration.py
trunk/waskaweb/controllers/case.py
trunk/waskaweb/controllers/usersettings.py
trunk/waskaweb/controllers/waska.py
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/i18n/waskaweb.pot
trunk/waskaweb/lib/base.py
trunk/waskaweb/lib/casedata.py
trunk/waskaweb/lib/evaluation.py
trunk/waskaweb/lib/helpers.py
trunk/waskaweb/lib/security.py
trunk/waskaweb/lib/validators.py
trunk/waskaweb/model/user.py
trunk/waskaweb/public/images/BMFSFJ_C_M_web.jpg
trunk/waskaweb/public/images/eu_logo_4c_pos_web2.jpg
trunk/waskaweb/public/styles/all.css
trunk/waskaweb/public/styles/color3.css
trunk/waskaweb/public/styles/screen.css
trunk/waskaweb/templates/administration/account_deactivated.mako
trunk/waskaweb/templates/administration/edit_settings.mako
trunk/waskaweb/templates/administration/new_user.mako
trunk/waskaweb/templates/administration/new_user_result.mako
trunk/waskaweb/templates/administration/overview_user.mako
trunk/waskaweb/templates/administration/reset_password.mako
trunk/waskaweb/templates/administration/settings.mako
trunk/waskaweb/templates/administration/show_settings.mako
trunk/waskaweb/templates/administration/show_user_body.mako
trunk/waskaweb/templates/appointments/overview.mako
trunk/waskaweb/templates/appointments/overview_body.mako
trunk/waskaweb/templates/appointments/show.mako
trunk/waskaweb/templates/casemanagement/create_export_scheme.mako
trunk/waskaweb/templates/casemanagement/digest.mako
trunk/waskaweb/templates/casemanagement/evaluation_result.mako
trunk/waskaweb/templates/casemanagement/export.mako
trunk/waskaweb/templates/casemanagement/formular.mako
trunk/waskaweb/templates/casemanagement/help.mako
trunk/waskaweb/templates/casemanagement/main.mako
trunk/waskaweb/templates/casemanagement/new.mako
trunk/waskaweb/templates/casemanagement/organisation.mako
trunk/waskaweb/templates/casemanagement/overview.mako
trunk/waskaweb/templates/casemanagement/rg_aid_overview.mako
trunk/waskaweb/templates/documents/case_new.mako
trunk/waskaweb/templates/documents/case_overview.mako
trunk/waskaweb/templates/documents/global_overview.mako
trunk/waskaweb/templates/documents/global_upload.mako
trunk/waskaweb/templates/login.mako
trunk/waskaweb/templates/logout.mako
trunk/waskaweb/templates/main.mako
trunk/waskaweb/templates/main_login.mako
trunk/waskaweb/templates/start/responsible.mako
trunk/waskaweb/templates/statement/dialogs/missing_statement.mako
trunk/waskaweb/templates/statement/edit.mako
trunk/waskaweb/templates/usersettings/change_password.mako
trunk/waskaweb/templates/usersettings/change_password_login.mako
trunk/waskaweb/templates/usersettings/edit_standin.mako
trunk/waskaweb/templates/usersettings/show_settings.mako
Log:
Load f3c0b92f65ba into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/ChangeLog.txt 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,3 +1,84 @@
+2007-11-30 Torsten Irl�nder <torsten.irlaender at intevation.de>
+
+ * waskaweb/controllers/administration.py,
+ waskaweb/templates/main.mako,
+ waskaweb/templates/main_login.mako,
+ waskaweb/lib/security.py: Removed session variable which holds the
+ agency name. Removed agency name from website title.
+
+ * waskaweb/model/user.py,
+ waskaweb/templates/usersettings/edit_standin.mako: Modified selction
+ field for the standin. Value for non existend standin is now "-1"
+
+2007-11-29 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/config/middleware.py: Removed StaticJavascripts middleware.
+ We don't need this.
+
+2007-11-29 Torsten Irl�nder <torsten.irlaender at intevation.de>
+
+ * waskaweb/model/user.py: Added setAdm function again to the
+ userobjects as we rely on that the super admin can be treated as a
+ real existing user in some places. So "setAdm" setups the userobject
+ with appropriate data
+
+2007-11-29 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * development_wsgi.ini: Uses a local memcached to store the
+ session data.
+
+2007-11-29 Sascha L. Teichmann <teichmann at intevation.de>
+
+ * waskaweb/lib/evaluation.py: Recyle an open db connection
+ in evaluation #4 correctly.
+
+2007-11-28 Torsten Irl�nder <torsten.irlaender at intevation.de>
+ * waskaweb/lib/validators.py,
+ waskaweb/controllers/administration.py,
+ waskaweb/templates/administration/new_user.mako: Fixed issue174 and
+ issue175. For editing the usersettings (and only for this) I changed
+ the way how we render the formular page if formencode fails to check
+ the value. Now we make use of htmlfill which parses the rendere html
+ output, und sets the values in the formular page. This way we can clean
+ up the templates as setting values in the formular is now done by html
+ field in the controller.
+
+2007-11-28 Torsten Irl�nder <torsten.irlaender at intevation.de>
+
+ * waskaweb/controllers/case.py, waskaweb/controllers/usersettings.py,
+ waskaweb/controllers/waska.py, waskaweb/lib/base.py,
+ waskaweb/lib/casedata.py, waskaweb/lib/helpers.py,
+ waskaweb/lib/validators.py, waskaweb/model/user.py:
+ Changed the way how login and password of the user are stored. Both is
+ now stored within the sessionuser object, so the USER_AUTHORIZED
+ session variable do not need to store a tuple anymore.
+ Adopted the new access on the session at all places.
+
+2007-11-28 Torsten Irl�nder <torsten.irlaender at intevation.de>
+
+ * waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+ waskaweb/i18n/waskaweb.pot,
+ waskaweb/templates/casemanagement/evaluation_result.mako: Fixed
+ missing translation in the evalutaion result page
+
+ * waskaweb/lib/evaluation.py: Fixed wrong calculation which were
+ caused because some querys were on the wrong which return wrong
+ values
+
+2007-11-28 Benjamin Kirschner <benni at intevation.de>
+
+ * waskaweb/*.mako: substituted hardcoded strings with gettext calls at
+ variuos places in the mako templates. Fixed syntax errors
+
+2007-11-28 Torsten Irl�nder <torsten.irlaender at intevation.de>
+
+ * waskaweb/model/user.py,
+ waskaweb/lib/security.py,
+ waskaweb/lib/helpers.py: Refactored user class. Subclassed the user
+ class and created two new classes for the sessionuser.
+ Removed some orphaned code and adopted helper functions in the
+ helpers.py
+
2007-11-28 Sascha L. Teichmann <teichmann at intevation.de>
* waskaweb/model/document.py: Added a getName() method which
@@ -88,7 +169,7 @@
2007-11-22 Torsten Irlaender <torsten.irlaender at intevation.de>
* ChangeLog.txt:
- We hopefully now have Changelog! Migrated Frank's entrys from an older
+ We hopefully now have a Changelog! Migrated Frank's entrys from an older
Version.
2007-11-22 Torsten Irlaender <torsten.irlaender at intevation.de>
Modified: trunk/development_wsgi.ini
===================================================================
--- trunk/development_wsgi.ini 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/development_wsgi.ini 2008-08-13 13:03:16 UTC (rev 10)
@@ -36,9 +36,11 @@
full_stack = true
cache_dir = /usr/local/wsgi/waska_data
beaker.session.key = waskaweb
-beaker.session.secret = somesecret
+beaker.session.secret = viw6thohg1Eveesha1tah1Ihie5thu
beaker.session.timeout = 1800
#beaker.session.type = memory
+beaker.session.type = ext:memcached
+beaker.session.url = 127.0.0.1
#beaker.session.invalidate_corrupt = True
# If you'd like to fine-tune the individual locations of the cache data dirs
Modified: trunk/waskaweb/config/middleware.py
===================================================================
--- trunk/waskaweb/config/middleware.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/config/middleware.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -11,8 +11,9 @@
from pylons import config
from pylons.error import error_template
-from pylons.middleware import error_mapper, ErrorDocuments, ErrorHandler, \
- StaticJavascripts
+from pylons.middleware import error_mapper, ErrorDocuments, ErrorHandler
+#, \ StaticJavascripts
+
from pylons.wsgiapp import PylonsApp
#from waskaweb.lib.security import checkLogin
@@ -80,7 +81,8 @@
app = RegistryManager(app)
# Static files
- javascripts_app = StaticJavascripts()
+ ##javascripts_app = StaticJavascripts()
static_app = StaticURLParser(config['pylons.paths']['static_files'])
- app = Cascade([static_app, javascripts_app, app])
+ ##app = Cascade([static_app, javascripts_app, app])
+ app = Cascade([static_app, app])
return app
Modified: trunk/waskaweb/controllers/administration.py
===================================================================
--- trunk/waskaweb/controllers/administration.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/controllers/administration.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,7 +1,9 @@
import logging
import formencode
+from formencode import htmlfill
from waskaweb.lib.base import *
+from waskaweb.lib.security import getDbName
from waskaweb.lib.validators import NewUserForm, EditUserForm, NewPasswordForm, EditSettingsForm
from waskaweb.model.user import UserObject, UserListObject
from waskaweb.model.agency import Agency
@@ -94,7 +96,7 @@
# Set initial data which is needed to create a new user
login = c.form_result.get('login', '')
role = c.form_result.get('role', '')
- agency = session.get('agency_name', '')
+ agency = getDbName()
c.uo.setData(c.form_result)
# create user
c.user_password = c.uo.createLogin(login, role, agency)
@@ -102,7 +104,8 @@
except formencode.Invalid, error:
c.form_result = error.value
c.form_errors = error.error_dict or {}
- return render('/administration/new_user.mako')
+ form = render('/administration/new_user.mako')
+ return htmlfill.render(unicode(form, 'utf-8'), c.form_result, c.form_errors, auto_insert_errors=False)
except:
return render('/tests/trace.mako')
#return "Es ist ein Fehler beim Speichern des Benutzers aufgetreten."
Modified: trunk/waskaweb/controllers/case.py
===================================================================
--- trunk/waskaweb/controllers/case.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/controllers/case.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -692,7 +692,7 @@
list = UserListObject()
c.case = Dataset(id)
c.standin_list = c.case.getStandin()
- c.current_user = session['USER_AUTHORIZED'][2]
+ c.current_user = session['USER_AUTHORIZED']
c.editor = UserObject(c.case.getEditor())
# Get available users for standin. filter out admins and the current
# user
Modified: trunk/waskaweb/controllers/usersettings.py
===================================================================
--- trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -38,8 +38,9 @@
new_pass = c.uo.setPassword(form_result.get('passwd'))
if new_pass:
# Save new password in the session
- login, password, user = session['USER_AUTHORIZED']
- session['USER_AUTHORIZED'] = (login, new_pass, user)
+ user = session['USER_AUTHORIZED']
+ user.password = new_pass
+ session['USER_AUTHORIZED'] = user
session.save()
c.notification_for = SET_PASSWORD_NOTIFICATION_HEADER
c.notification_text = SET_PASSWORD_NOTIFICATION_TEXT
@@ -66,15 +67,18 @@
try:
try:
form_result = validator.to_python(request.params)
- login, password, user = session['USER_AUTHORIZED']
- new_pass = user.setPassword(form_result.get('passwd'))
+ uo = UserObject(form_result.get('uid'))
+ new_pass = uo.setPassword(form_result.get('passwd'))
if new_pass:
# Save new password in the session
- session['USER_AUTHORIZED'] = (login, new_pass, user)
+ session_user = session['USER_AUTHORIZED']
+ session_user.password = new_pass
+ session_user.needs_passrefresh = False
+ session['USER_AUTHORIZED'] = session_user
session.save()
c.notification_for = SET_PASSWORD_NOTIFICATION_HEADER
c.notification_text = SET_PASSWORD_NOTIFICATION_TEXT
- c.url_ok = h.url_for(controller="usersettings", action="showSettings", id=user.id)
+ c.url_ok = h.url_for(controller="usersettings", action="showSettings", id=session_user.id)
else:
return "Password could not be changed"
except formencode.Invalid, error:
@@ -90,7 +94,7 @@
c.form_result = {}
ulo = UserListObject()
c.uo = UserObject(id)
- user = session['USER_AUTHORIZED'][2]
+ user = session['USER_AUTHORIZED']
# Get available users for standin. filter out admins and the current
# user
filter = [u.id for u in ulo.getAdminList()]
Modified: trunk/waskaweb/controllers/waska.py
===================================================================
--- trunk/waskaweb/controllers/waska.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/controllers/waska.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -40,7 +40,7 @@
passwd = request.params.getone('password')
user = checkLogin(login, passwd)
if user:
- session['USER_AUTHORIZED'] = (login, passwd, user)
+ session['USER_AUTHORIZED'] = user
session.save()
redirect_to(action="start")
except KeyError:
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:03:16 UTC (rev 10)
@@ -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-11-21 14:48+0100\n"
+"POT-Creation-Date: 2007-11-28 04:58+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,11 +17,47 @@
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"Generated-By: Babel 0.9.1\n"
+#: waskaweb/templates/login.mako:3
+msgid "login_header_waska_login"
+msgstr "WASKA Login"
+
+#: waskaweb/templates/login.mako:5
+msgid "login_p_insert_pw_and_identifier"
+msgstr "Geben Sie bitte Anmeldekennung und Passwort ein, um sich anzumelden."
+
+#: waskaweb/templates/login.mako:8
+msgid "login_label_identifier"
+msgstr "Anmeldekennung:"
+
+#: waskaweb/templates/login.mako:15
+msgid "login_label_pw"
+msgstr "Passwort:"
+
+#: waskaweb/templates/logout.mako:3
+msgid "logout_header_waska_logout"
+msgstr "WASKA Abmeldung"
+
+#: waskaweb/templates/logout.mako:5
+msgid "logout_p_logout successful"
+msgstr "Sie haben sich erfolgreich abgemeldet. Klicken Sie auf"
+
+#: waskaweb/templates/logout.mako:5
+msgid "logout_a_login"
+msgstr "anmelden"
+
+#: waskaweb/templates/logout.mako:5
+msgid "logout_p_login_again"
+msgstr "um sich erneut in WASKA anzumelden."
+
+#: waskaweb/templates/main.mako:39
+msgid "np_text"
+msgstr "Sie sind hier: "
+
#: waskaweb/templates/main.mako:62
msgid "statusbar_logininfo"
msgstr "Angemeldet als"
-#: waskaweb/templates/main.mako:69 waskaweb/templates/main.mako:100
+#: waskaweb/templates/main.mako:69 waskaweb/templates/main.mako:99
msgid "sm_menu_link_home"
msgstr "Schwarzes Brett"
@@ -37,67 +73,89 @@
msgid "sm_menu_link_logout"
msgstr "Abmelden"
-#: waskaweb/templates/main.mako:79
-msgid "np_text"
-msgstr "Sie sind hier: "
-
-#: waskaweb/templates/main.mako:80 waskaweb/templates/main.mako:98
+#: waskaweb/templates/main.mako:79 waskaweb/templates/main.mako:97
msgid "np_root"
msgstr "Waska Start"
-#: waskaweb/templates/main.mako:103
+#: waskaweb/templates/main.mako:102
msgid "menu_app_link_overview"
msgstr "Termine"
-#: waskaweb/templates/main.mako:106
+#: waskaweb/templates/main.mako:105
msgid "menu_doc_link_overview"
msgstr "Dokumente"
-#: waskaweb/templates/main.mako:115
+#: waskaweb/templates/main.mako:114
msgid "menu_header_cm"
msgstr "Case-Management"
-#: waskaweb/templates/main.mako:117
+#: waskaweb/templates/main.mako:116
msgid "menu_cm_link_overview"
msgstr "Fallakten\t"
-#: waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:119
msgid "menu_cm_link_new"
msgstr "Fallakte anlegen"
-#: waskaweb/templates/main.mako:122
+#: waskaweb/templates/main.mako:121
msgid "menu_cm_link_import"
msgstr "Fallakte importieren"
-#: waskaweb/templates/main.mako:125
+#: waskaweb/templates/main.mako:124
#: waskaweb/templates/casemanagement/evaluation.mako:8
msgid "cm_actions_link_evaluate"
msgstr "Auswertung"
-#: waskaweb/templates/main.mako:134
+#: waskaweb/templates/main.mako:133
msgid "menu_header_adm"
msgstr "Administration"
-#: waskaweb/templates/main.mako:136
+#: waskaweb/templates/main.mako:135
msgid "menu_adm_link_useroverview"
msgstr "Benutzer"
-#: waskaweb/templates/main.mako:139
+#: waskaweb/templates/main.mako:138
msgid "menu_adm_link_showsettings"
msgstr "Agentur"
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:152
+msgid "main_formular_input_error"
+msgstr "Fehlerhafte Formulareingabe"
+
+#: waskaweb/templates/main.mako:175
msgid "footer_title"
msgstr "WASKA"
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:175
msgid "footer_version"
msgstr "23.11.07 | Beta 3"
+#: waskaweb/templates/main_login.mako:38
+#: waskaweb/templates/start/responsible.mako:71
+msgid "main_login_bmf_phrase"
+msgstr ""
+"Das Programm Kompetenzagenturen (Durchführungsphase) wird vom "
+"Bundesministerium für Familie, Senioren, Frauen und Jugend aus Mitteln des "
+"Europäischen Sozialfonds gefördert."
+
+#: waskaweb/templates/main_login.mako:59
+msgid "main_login_formular_input_error"
+msgstr "Fehlerhafte Formulareingabe"
+
#: waskaweb/templates/administration/account_deactivated.mako:3
msgid "adm_header_account_deactivated"
msgstr "Dieses Konto wurde deaktiviert"
+#: waskaweb/templates/administration/account_deactivated.mako:4
+msgid "adm_con_ad_account_deactivated"
+msgstr "Dieser Account wurde deaktiviert. Dies kann mehrere Ursachen haben:"
+
+#: waskaweb/templates/administration/account_deactivated.mako:10
+msgid "adm_con_ad_contact_admin"
+msgstr ""
+"Bitte setzen Sie sich in dieser Angelegenheit mit der Administration in "
+"Verbindung"
+
#: waskaweb/templates/administration/edit_settings.mako:5
#: waskaweb/templates/administration/edit_user.mako:4
#: waskaweb/templates/administration/new_user.mako:5
@@ -125,6 +183,10 @@
msgid "adm_actions_link_showsettings"
msgstr "Zurück zu: Agentureinstellungen"
+#: waskaweb/templates/administration/edit_settings.mako:22
+msgid "adm_con_es_editsettings"
+msgstr "Hier können Sie die agenturweiten Einstellungen bearbeiten."
+
#: waskaweb/templates/administration/edit_settings.mako:27
#: waskaweb/templates/administration/show_settings.mako:25
msgid "adm_form_settings_kaname"
@@ -168,13 +230,12 @@
msgstr "Benutzerpasswort zurücksetzen"
#: waskaweb/templates/administration/edit_user.mako:16
-#: waskaweb/templates/administration/edit_user.mako:16
msgid "menu_adm_link_useredit_back"
msgstr "Zurück zu: Benutzeransicht"
#: waskaweb/templates/administration/edit_user.mako:25
#: waskaweb/templates/administration/new_user.mako:28
-#: waskaweb/templates/administration/new_user_result.mako:22
+#: waskaweb/templates/administration/new_user_result.mako:21
#: waskaweb/templates/administration/show_user_body.mako:2
#: waskaweb/templates/administration/userform_body.mako:4
msgid "adm_form_legend_personal"
@@ -209,10 +270,8 @@
#: waskaweb/templates/administration/edit_user.mako:58
#: waskaweb/templates/administration/new_user.mako:61
-#: waskaweb/templates/administration/new_user_result.mako:45
-#: waskaweb/templates/administration/show_user_body.mako:29
+#: waskaweb/templates/administration/new_user_result.mako:44
#: waskaweb/templates/administration/userform_body.mako:21
-#: waskaweb/templates/usersettings/change_password.mako:19
#: waskaweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr "Angaben zum Konto"
@@ -267,6 +326,62 @@
msgid "adm_header_newuser_Result"
msgstr "Benutzerdaten des neu angelegten Benutzers"
+#: waskaweb/templates/administration/new_user_result.mako:24
+msgid "adm_form_label_forename"
+msgstr "Vorname"
+
+#: waskaweb/templates/administration/new_user_result.mako:28
+msgid "adm_form_label_name"
+msgstr "Name"
+
+#: waskaweb/templates/administration/new_user_result.mako:32
+msgid "adm_form_label_phone"
+msgstr "Telefon"
+
+#: waskaweb/templates/administration/new_user_result.mako:36
+msgid "adm_form_label_room"
+msgstr "Raumnummer"
+
+#: waskaweb/templates/administration/new_user_result.mako:40
+msgid "adm_form_label_agency"
+msgstr "Agentur"
+
+#: waskaweb/templates/administration/new_user_result.mako:47
+msgid "adm_form_label_login"
+msgstr "Login"
+
+#: waskaweb/templates/administration/new_user_result.mako:51
+msgid "adm_form_label_password"
+msgstr "Passwort"
+
+#: waskaweb/templates/administration/new_user_result.mako:55
+msgid "adm_form_label_role"
+msgstr "Rolle"
+
+#: waskaweb/templates/administration/new_user_result.mako:59
+msgid "adm_form_label_activated"
+msgstr "Aktiviert"
+
+#: waskaweb/templates/administration/new_user_result.mako:62
+msgid "adm_form_is_activated_yes"
+msgstr "Ja"
+
+#: waskaweb/templates/administration/new_user_result.mako:64
+msgid "adm_form_is_activated_no"
+msgstr "Nein"
+
+#: waskaweb/templates/administration/new_user_result.mako:69
+msgid "adm_form_label_login_pw"
+msgstr "Bei Anmeldung neues Passwort verlangen"
+
+#: waskaweb/templates/administration/new_user_result.mako:72
+msgid "adm_form_needs_pw_yes"
+msgstr "Ja"
+
+#: waskaweb/templates/administration/new_user_result.mako:74
+msgid "adm_form_needs_pw_no"
+msgstr "Nein"
+
#: waskaweb/templates/administration/overview_user.mako:12
msgid "adm_header_overview"
msgstr "Benutzerübersicht"
@@ -287,6 +402,23 @@
msgid "adm_overview_tbl_header_actions"
msgstr "Aktionen"
+#: waskaweb/templates/administration/overview_user.mako:33
+#: waskaweb/templates/appointments/overview_body.mako:14
+#: waskaweb/templates/appointments/overview_body.mako:22
+#: waskaweb/templates/appointments/overview_body.mako:30
+#: waskaweb/templates/appointments/overview_body.mako:37
+#: waskaweb/templates/appointments/overview_body.mako:48
+msgid "app_overview_body_table_show"
+msgstr "Anzeigen"
+
+#: waskaweb/templates/administration/overview_user.mako:34
+#: waskaweb/templates/appointments/overview_body.mako:15
+#: waskaweb/templates/appointments/overview_body.mako:23
+#: waskaweb/templates/appointments/overview_body.mako:38
+#: waskaweb/templates/appointments/overview_body.mako:49
+msgid "app_overview_body_table_delete"
+msgstr "Löschen"
+
#: waskaweb/templates/administration/reset_password.mako:7
#: waskaweb/templates/administration/show_user.mako:7
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:7
@@ -303,6 +435,22 @@
msgid "adm_header_resetpassword"
msgstr "Benutzerpasswort zurücksetzen"
+#: waskaweb/templates/administration/reset_password.mako:11
+msgid "adm_con_rp_the_password"
+msgstr "Das Password für den Benutzer"
+
+#: waskaweb/templates/administration/reset_password.mako:11
+msgid "adm_con_rp_has_been_changed"
+msgstr "wurde erfolgreich geändert."
+
+#: waskaweb/templates/administration/reset_password.mako:11
+msgid "adm_con_rp_new_pw"
+msgstr "Das neue Passwort lautet:"
+
+#: waskaweb/templates/administration/reset_password.mako:12
+msgid "adm_con_rp_to_useroverview"
+msgstr "Weiter zu: Benutzerübersicht"
+
#: waskaweb/templates/administration/settings.mako:5
msgid "adm_np_setting"
msgstr "Einstellungen"
@@ -311,6 +459,10 @@
msgid "adm_header_settings"
msgstr "Einstellungen"
+#: waskaweb/templates/administration/settings.mako:8
+msgid "adm_con_set_synchronisation"
+msgstr "Hier werden Sie Einstellungen zur Synchrnisation vornehmen können."
+
#: waskaweb/templates/administration/settings.mako:9
msgid "adm_header_synchronisation"
msgstr "Synchronisation"
@@ -327,6 +479,10 @@
msgid "adm_actions_link_editsettings"
msgstr "Einstellungen bearbeiten"
+#: waskaweb/templates/administration/show_settings.mako:22
+msgid "adm_con_ss_view_agency"
+msgstr "Hier können Sie die agenturweiten Einstellungen sehen."
+
#: waskaweb/templates/administration/show_settings.mako:36
msgid "adm_form_settings_anontransfer_yes"
msgstr "Ja"
@@ -343,6 +499,60 @@
msgid "adm_actions_link_edituser"
msgstr "In Bearbeitung nehmen"
+#: waskaweb/templates/administration/show_user_body.mako:5
+msgid "adm_form_table_forename"
+msgstr "Vorname"
+
+#: waskaweb/templates/administration/show_user_body.mako:9
+msgid "adm_form_table_name"
+msgstr "Name"
+
+#: waskaweb/templates/administration/show_user_body.mako:13
+msgid "adm_form_table_phone"
+msgstr "Telefon"
+
+#: waskaweb/templates/administration/show_user_body.mako:17
+msgid "adm_form_table_room"
+msgstr "Raumnummer"
+
+#: waskaweb/templates/administration/show_user_body.mako:21
+msgid "adm_form_table_agency"
+msgstr "Agentur"
+
+#: waskaweb/templates/administration/show_user_body.mako:25
+msgid "adm_form_table_replace"
+msgstr "Vertretung"
+
+#: waskaweb/templates/administration/show_user_body.mako:29
+msgid "adm_form_header_login"
+msgstr "Angaben zum Konto"
+
+#: waskaweb/templates/administration/show_user_body.mako:32
+msgid "adm_form_table_login"
+msgstr "Login"
+
+#: waskaweb/templates/administration/show_user_body.mako:36
+msgid "adm_form_table_role"
+msgstr "Rolle"
+
+#: waskaweb/templates/administration/show_user_body.mako:41
+msgid "adm_form_table_activated"
+msgstr "Aktiviert"
+
+#: waskaweb/templates/administration/show_user_body.mako:44
+#: waskaweb/templates/administration/show_user_body.mako:54
+msgid "adm_form_table_yes"
+msgstr "Ja"
+
+#: waskaweb/templates/administration/show_user_body.mako:46
+#: waskaweb/templates/administration/show_user_body.mako:56
+msgid "adm_form_table_no"
+msgstr "Nein"
+
+#: waskaweb/templates/administration/show_user_body.mako:51
+msgid "adm_form_label_new_login_new_pw"
+msgstr "Bei Anmeldung neues Passwort verlangen"
+
#: waskaweb/templates/administration/userform_body.mako:45
msgid "adm_form_user_passwd"
msgstr "Passwort"
@@ -351,6 +561,31 @@
msgid "adm_form_user_passwd_confirm"
msgstr "Passwortwiederholung"
+#: waskaweb/templates/administration/dialogs/alert.mako:5
+#: waskaweb/templates/casemanagement/evaluation.mako:4
+#: waskaweb/templates/casemanagement/evaluation_result.mako:5
+#: waskaweb/templates/casemanagement/main.mako:8
+#: waskaweb/templates/casemanagement/new.mako:5
+#: waskaweb/templates/casemanagement/overview.mako:6
+#: waskaweb/templates/casemanagement/upload.mako:4
+#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
+#: waskaweb/templates/statement/dialogs/confirm.mako:5
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
+msgid "cm_np_root"
+msgstr "Case-Management"
+
+#: waskaweb/templates/administration/dialogs/alert.mako:6
+#: waskaweb/templates/casemanagement/new.mako:6
+#: waskaweb/templates/casemanagement/dialogs/alert.mako:6
+#: waskaweb/templates/casemanagement/static_form/statement.mako:6
+msgid "cm_np_new"
+msgstr "Fallakte anlegen"
+
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:7
msgid "adm_np_delteuser"
msgstr "Benutzer löschen"
@@ -442,31 +677,38 @@
msgstr "Terminübersicht"
#: waskaweb/templates/appointments/overview.mako:10
-#: waskaweb/templates/appointments/overview.mako:25
+#: waskaweb/templates/appointments/overview.mako:24
#: waskaweb/templates/casemanagement/appointments.mako:10
msgid "app_header_overview"
msgstr "Terminübersicht"
#: waskaweb/templates/appointments/overview.mako:15
-#: waskaweb/templates/casemanagement/appointments.mako:16
+#: waskaweb/templates/casemanagement/appointments.mako:17
msgid "app_actions_link_newappointment"
msgstr "Neuen Termin anlegen"
+#: waskaweb/templates/appointments/overview.mako:27
+msgid "app_con_list_all_appointments"
+msgstr "Hier wird eine Auflistung aller Termine angezeigt"
+
#: waskaweb/templates/appointments/overview_body.mako:4
-#: waskaweb/templates/appointments/overview_body.mako:75
-#: waskaweb/templates/start/start.mako:14
+#: 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:76
-#: waskaweb/templates/start/start.mako:15
+#: 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:77
-#: waskaweb/templates/start/start.mako:16
+#: 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"
@@ -506,6 +748,18 @@
msgid "sm_menu_link_home_back"
msgstr "Zurück zu: Schwarzes Brett"
+#: waskaweb/templates/appointments/show.mako:25
+msgid "app_table_date"
+msgstr "Datum"
+
+#: waskaweb/templates/appointments/show.mako:29
+msgid "app_table_title"
+msgstr "Titel"
+
+#: waskaweb/templates/appointments/show.mako:33
+msgid "app_table_description"
+msgstr "Beschreibung"
+
#: waskaweb/templates/casemanagement/appointments.mako:4
#: waskaweb/templates/casemanagement/digest.mako:5
#: waskaweb/templates/casemanagement/formular.mako:34
@@ -521,6 +775,12 @@
msgid "cm_header_export_createscheme"
msgstr "Exportschema erstellen"
+#: waskaweb/templates/casemanagement/create_export_scheme.mako:3
+msgid "cm_cn_ec_decide_which_part_to_export"
+msgstr ""
+"Hier werden Sie festlegen können welche Teile der Akte exportiert werden "
+"sollen."
+
#: waskaweb/templates/casemanagement/digest.mako:6
msgid "cm_np_digest"
msgstr "Zusammenfassung der Fallakte"
@@ -529,63 +789,53 @@
msgid "cm_header_digest"
msgstr "Zusammenfassung der Fallakte"
-#: waskaweb/templates/casemanagement/digest.mako:17
+#: waskaweb/templates/casemanagement/digest.mako:14
+msgid "cm_digest_con_digest_dossier"
+msgstr ""
+"Hier wird eine Zusammenfassung der Fallakte angezeigt. Diese Zusammenfassung "
+"besteht aus einer Zusammenstellung verschiedener Felder aus dem "
+"Fallaktenformular"
+
+#: waskaweb/templates/casemanagement/digest.mako:15
msgid "cm_header_digest_personal"
msgstr "Angaben zur Person"
-#: waskaweb/templates/casemanagement/digest.mako:20
+#: waskaweb/templates/casemanagement/digest.mako:18
msgid "cm_digest_tbl_label_lastname"
msgstr "Name"
-#: waskaweb/templates/casemanagement/digest.mako:24
+#: waskaweb/templates/casemanagement/digest.mako:22
msgid "cm_digest_tbl_label_firstname"
msgstr "Vorname"
-#: waskaweb/templates/casemanagement/digest.mako:28
+#: waskaweb/templates/casemanagement/digest.mako:26
msgid "cm_digest_tbl_label_caseid"
msgstr "Kundennummer"
-#: waskaweb/templates/casemanagement/digest.mako:32
+#: waskaweb/templates/casemanagement/digest.mako:30
msgid "cm_digest_tbl_label_age"
msgstr "Alter"
-#: waskaweb/templates/casemanagement/digest.mako:36
+#: waskaweb/templates/casemanagement/digest.mako:34
msgid "cm_digest_header_address"
msgstr "Kontaktdaten"
-#: waskaweb/templates/casemanagement/digest.mako:39
+#: waskaweb/templates/casemanagement/digest.mako:37
msgid "cm_digest_tbl_label_street"
msgstr "Straße"
-#: waskaweb/templates/casemanagement/digest.mako:43
+#: waskaweb/templates/casemanagement/digest.mako:41
msgid "cm_digest_tbl_label_plz"
msgstr "PLZ"
-#: waskaweb/templates/casemanagement/digest.mako:47
+#: waskaweb/templates/casemanagement/digest.mako:45
msgid "cm_digest_tbl_label_city"
msgstr "Ort"
-#: waskaweb/templates/casemanagement/digest.mako:51
+#: waskaweb/templates/casemanagement/digest.mako:49
msgid "cm_digest_tbl_label_telephone"
msgstr "Telefon"
-#: waskaweb/templates/casemanagement/evaluation.mako:4
-#: waskaweb/templates/casemanagement/evaluation_result.mako:5
-#: waskaweb/templates/casemanagement/main.mako:8
-#: waskaweb/templates/casemanagement/new.mako:5
-#: waskaweb/templates/casemanagement/overview.mako:6
-#: waskaweb/templates/casemanagement/upload.mako:4
-#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
-#: waskaweb/templates/statement/dialogs/confirm.mako:5
-#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
-msgid "cm_np_root"
-msgstr "Case-Management"
-
#: waskaweb/templates/casemanagement/evaluation.mako:5
#: waskaweb/templates/casemanagement/evaluation_result.mako:6
msgid "cm_np_evaluate"
@@ -603,6 +853,34 @@
msgid "cm_header_evaluate_result"
msgstr "Ergebnis der Auswertung"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:11
+msgid "cm_eval_summary_header_1"
+msgstr "1. Verhältnis Beratungskunden/Aufnahmen in das CM"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:12
+msgid "cm_eval_summary_header_2"
+msgstr "2. Verweildauer im CM"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:13
+msgid "cm_eval_summary_header_3"
+msgstr "3. Alters- und Geschlechterstruktur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:14
+msgid "cm_eval_summary_header_4"
+msgstr "4. Migrationshintergrund"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:15
+msgid "cm_eval_summary_header_5"
+msgstr "5. Zugang zur Kompetenzagentur"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:16
+msgid "cm_eval_summary_header_6"
+msgstr "6. Förderbedarf"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:17
+msgid "cm_eval_summary_header_7"
+msgstr "7. Vermittlung"
+
#: waskaweb/templates/casemanagement/evaluation_result.mako:22
#: waskaweb/templates/casemanagement/evaluation_result.mako:23
#: waskaweb/templates/casemanagement/evaluation_result.mako:24
@@ -615,6 +893,124 @@
msgid "cm_actions_link_export_evaluate"
msgstr "Ergebnis der Auswertung exportieren"
+#: waskaweb/templates/casemanagement/evaluation_result.mako:35
+msgid "cm_eval_header_1"
+msgstr "1. Anzahl der Beratungskunden, davon % ins CM aufgenommen"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:38
+msgid "cm_eval_table_consult_customer"
+msgstr "Beratungskunden"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:44
+msgid "cm_eval_table_taken_over_to_cm"
+msgstr "Ins CM übernommen"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:50
+#: waskaweb/templates/casemanagement/evaluation_result.mako:70
+#: waskaweb/templates/casemanagement/evaluation_result.mako:95
+#: waskaweb/templates/casemanagement/evaluation_result.mako:107
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:134
+#: waskaweb/templates/casemanagement/evaluation_result.mako:146
+#: waskaweb/templates/casemanagement/evaluation_result.mako:160
+#: waskaweb/templates/casemanagement/evaluation_result.mako:175
+#: waskaweb/templates/casemanagement/evaluation_result.mako:187
+msgid "cm_eval_table_to_overview"
+msgstr "Zur Übersicht"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:50
+#: waskaweb/templates/casemanagement/evaluation_result.mako:70
+#: waskaweb/templates/casemanagement/evaluation_result.mako:95
+#: waskaweb/templates/casemanagement/evaluation_result.mako:107
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:134
+#: waskaweb/templates/casemanagement/evaluation_result.mako:146
+#: waskaweb/templates/casemanagement/evaluation_result.mako:160
+#: waskaweb/templates/casemanagement/evaluation_result.mako:175
+#: waskaweb/templates/casemanagement/evaluation_result.mako:187
+msgid "cm_eval_table_export_analysis"
+msgstr "Auswertung exportieren"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:53
+msgid "cm_eval_header_2"
+msgstr ""
+"2. Anzahl der Jugendlichen im CM, davon % abgeschlossen nach "
+"durchschnittlich x Monaten"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:56
+msgid "cm_eval_table_month"
+msgstr "Monat"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:57
+msgid "cm_eval_table_completed"
+msgstr "Abgeschlossen"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:58
+msgid "cm_eval_table_aborted"
+msgstr "Abgebrochen"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:73
+msgid "cm_eval_header_3"
+msgstr "3. Alters- und Geschlechterstruktur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:74
+msgid "cm_eval_header_on_gender"
+msgstr "Angaben zur Geschlechtsstruktur"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:77
+msgid "cm_eval_label_male"
+msgstr "männlich"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:83
+msgid "cm_eval_label_female"
+msgstr "weiblich"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:89
+msgid "cm_eval_label_intersexual"
+msgstr "intersexuell"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:96
+msgid "cm_eval_header_on_age"
+msgstr "Angaben zur Altersverteilung"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:110
+msgid "cm_eval_header_4"
+msgstr ""
+"4. Migrationshintergrund in % (Staatsangehörigkeit nicht Deutsch oder Mutter/"
+"Vater nicht in Deutschland geboren)"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:113
+msgid "cm_eval_label_migration_background"
+msgstr "Migrationshintergrund"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:122
+msgid "cm_eval_header_5"
+msgstr "5. Angaben zum Zugang des Jugendlichen zur Kompetenzagentur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:123
+msgid "cm_eval_header_access_youngster_to_agency"
+msgstr "Zugang des Jugendlichen zur Kompetenzagentur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:135
+msgid "cm_eval_head_law_access_agency"
+msgstr "Rechtskreis der Jugendlichen beim Zugang zur Kompetenzagentur in %"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:149
+msgid "cm_eval_header_6"
+msgstr "6. Förderbedarf in % nach den vier Bereichen 4.2.1 - 4.2.4"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:163
+msgid "cm_eval_header_7"
+msgstr "7. Angaben zur Vermittlung der Jugendlichen"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:164
+msgid "cm_eval_head_where_to_place_youngster"
+msgstr "Wohin wurden die Jugendlichen vermittlelt?"
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:176
+msgid "cm_eval_header_law_changed_after_place"
+msgstr "Angaben zur Veränderung des Rechtskreises nach der Vermittlung"
+
#: waskaweb/templates/casemanagement/export.mako:4
msgid "cm_np_root<"
msgstr "Fallakten"
@@ -631,6 +1027,10 @@
msgid "cm_actions_link_createexportscheme"
msgstr "Exportschema festlegen"
+#: waskaweb/templates/casemanagement/export.mako:15
+msgid "cm_export_con_can_export_a_dossier"
+msgstr "Hier werden Sie eine Fallakte exportieren können."
+
#: waskaweb/templates/casemanagement/formular.mako:5
msgid "cm_header_form_edit"
msgstr "Fallakte Bearbeitung"
@@ -652,10 +1052,17 @@
#: waskaweb/templates/casemanagement/formular.mako:22
#: waskaweb/templates/casemanagement/formular.mako:79
#: waskaweb/templates/casemanagement/rg_aid_overview.mako:18
-#: waskaweb/templates/start/help.mako:10
msgid "cm_actions_link_printout"
msgstr "Druckversion"
+#: waskaweb/templates/casemanagement/formular.mako:41
+msgid "cm_error_header_false_forminput"
+msgstr "Fehlerhafte Formulareingabe"
+
+#: waskaweb/templates/casemanagement/help.mako:3
+msgid "cm_help_header_help_for_dossier"
+msgstr "Hilfe zum Fallakten-Formular"
+
#: waskaweb/templates/casemanagement/main.mako:9
#: waskaweb/templates/casemanagement/overview.mako:7
msgid "cm_np_overview"
@@ -669,6 +1076,14 @@
msgid "cm_info_nr"
msgstr "Kundennr."
+#: waskaweb/templates/casemanagement/main.mako:33
+msgid "cm_main_print_statement"
+msgstr "Erklärung drucken"
+
+#: waskaweb/templates/casemanagement/main.mako:34
+msgid "cm_main_set_statement"
+msgstr "Erklärung setzen"
+
#: waskaweb/templates/casemanagement/main.mako:44
msgid "cm_menu_header_cases"
msgstr "Fallakte"
@@ -705,12 +1120,21 @@
msgid "cm_menu_header_structure"
msgstr "Gliederung"
-#: waskaweb/templates/casemanagement/new.mako:6
-#: waskaweb/templates/casemanagement/dialogs/alert.mako:6
-#: waskaweb/templates/casemanagement/static_form/statement.mako:6
-msgid "cm_np_new"
-msgstr "Fallakte anlegen"
+#: waskaweb/templates/casemanagement/new.mako:32
+msgid "cm_new_p_please_consider_statement"
+msgstr ""
+"Bitte beachten Sie, dass die Einverständniserklärung die Grundlage zur "
+"Erfassung personenbezogener Daten ist. Klicken Sie hierzu auf die Auswahl "
+"'Erklärung drucken'. Bitte nutzen Sie den 'Zurück'-Knopf Ihres Browsers, um "
+"nach dem Drucken auf diese Seite zurückzukehren."
+#: waskaweb/templates/casemanagement/new.mako:35
+msgid "cm_new_con_acceptance_statement_true"
+msgstr ""
+"Die Einwilligungserklärung für die Erfassung, Verarbeitung und Nutzung "
+"personenbezogener Daten wurde bereits zur Eingangsamnese bzw. Beratung vor "
+"dem Case Management eingeholt."
+
#: waskaweb/templates/casemanagement/new_appointment.mako:16
msgid "cm_menu_link_appointment_back"
msgstr "Zurück zu: Terminübersicht"
@@ -723,66 +1147,184 @@
msgid "cm_header_organisation"
msgstr "Organisation"
-#: waskaweb/templates/casemanagement/organisation.mako:15
+#: waskaweb/templates/casemanagement/organisation.mako:13
+msgid "cm_organisation_con_whois_cm_replace"
+msgstr ""
+"Diese Seite zeigt an, wer der Mitarbeiter dieser Fallakte ist und wer die "
+"Vertretung für die Bearbeitung übernimmt."
+
+#: waskaweb/templates/casemanagement/organisation.mako:14
msgid "cm_header_organisation_editor"
msgstr "Bearbeiter"
-#: waskaweb/templates/casemanagement/organisation.mako:18
+#: waskaweb/templates/casemanagement/organisation.mako:17
msgid "cm_organisation_tbl_label_lastname"
msgstr "Nachname"
-#: waskaweb/templates/casemanagement/organisation.mako:21
+#: waskaweb/templates/casemanagement/organisation.mako:20
msgid "cm_organisation_tbl_label_firstname"
msgstr "Vorname"
-#: waskaweb/templates/casemanagement/organisation.mako:24
+#: waskaweb/templates/casemanagement/organisation.mako:23
msgid "cm_organisation_tbl_label_telephone"
msgstr "Telefon"
-#: waskaweb/templates/casemanagement/organisation.mako:35
+#: waskaweb/templates/casemanagement/organisation.mako:34
msgid "cm_form_editor_submit"
msgstr "Fallakte übertragen"
-#: waskaweb/templates/casemanagement/organisation.mako:38
+#: waskaweb/templates/casemanagement/organisation.mako:37
msgid "cm_header_standin"
msgstr "Vertretung"
-#: waskaweb/templates/casemanagement/organisation.mako:58
+#: waskaweb/templates/casemanagement/organisation.mako:57
msgid "cm_form_standin_submit"
msgstr "Vertretung ändern"
+#: waskaweb/templates/casemanagement/organisation.mako:62
+msgid "cm_organisation_table_cm"
+msgstr "Bearbeiter"
+
#: waskaweb/templates/casemanagement/overview.mako:9
msgid "cm_header_overview"
msgstr "Fallaktenübersicht"
-#: waskaweb/templates/casemanagement/overview.mako:12
+#: waskaweb/templates/casemanagement/overview.mako:11
+msgid "cm_overview_con_list_dossiers_admin"
+msgstr ""
+"Hier wird eine Auflistung aller Fallakten der Kompetenzagenturder Fälle des "
+"angemeldeten Benutzers angezeigt"
+
+#: waskaweb/templates/casemanagement/overview.mako:15
+msgid "cm_overview_con_list_dossiers_cm"
+msgstr ""
+"Hier wird eine Auflistung der Fälle des angemeldeten Benutzers angezeigt"
+
+#: waskaweb/templates/casemanagement/overview.mako:18
msgid "cm_header_search"
msgstr "Suche"
-#: waskaweb/templates/casemanagement/overview.mako:16
+#: waskaweb/templates/casemanagement/overview.mako:22
msgid "cm_form_overview_search_submit"
msgstr "Suchen"
-#: waskaweb/templates/casemanagement/overview.mako:24
+#: waskaweb/templates/casemanagement/overview.mako:30
msgid "cm_overview_tbl_header_id"
msgstr "Knr."
-#: waskaweb/templates/casemanagement/overview.mako:25
+#: waskaweb/templates/casemanagement/overview.mako:31
msgid "cm_overview_tbl_header_firstname"
msgstr "Vorname"
-#: waskaweb/templates/casemanagement/overview.mako:26
+#: waskaweb/templates/casemanagement/overview.mako:32
msgid "cm_overview_tbl_header_lastname"
msgstr "Name"
-#: waskaweb/templates/casemanagement/overview.mako:27
+#: waskaweb/templates/casemanagement/overview.mako:33
msgid "cm_overview_tbl_header_actions"
msgstr "Aktionen"
+#: waskaweb/templates/casemanagement/overview.mako:56
+msgid "cm_overview_a_show"
+msgstr "Anzeigen"
+
+#: waskaweb/templates/casemanagement/overview.mako:58
+msgid "cm_overview_a_delete"
+msgstr "Löschen"
+
+#: waskaweb/templates/casemanagement/overview.mako:66
+msgid "cm_overview_tbl_no_data_found"
+msgstr "Es wurden keine Datensätze gefunden."
+
+#: 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:44
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:46
+msgid "cm_rg_aid_overview_table_show"
+msgstr "Anzeigen"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:49
+msgid "cm_rg_aid_overview_table_"
+msgstr "Löschen"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:56
+msgid "cm_rg_aid_overview_table_no_offer_found"
+msgstr "Keine Angebote gefunden"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_legend"
+msgstr "Legende:"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_bb"
+msgstr "(BB)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_common_educational_area"
+msgstr "Allgemein bildenden Bereich"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_bv"
+msgstr "(BV)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_vocational_preparation"
+msgstr "Bereich der Berufsvorbereitung"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_bq"
+msgstr "(BQ)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_qualifications"
+msgstr "Berufliche Qualifizierung"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_lb"
+msgstr "(LB)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_life_skills"
+msgstr "Lebensbewältigung"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:66
+msgid "cm_rg_aid_overview_legend_new_offer"
+msgstr "Neues Angebot hinzufügen"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:68
+msgid "cm_rg_aid_overview_option_common_educational_area"
+msgstr "allg. bildender Bereich (BB)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:69
+msgid "cm_rg_aid_overview_option_vocational_preparation"
+msgstr "Berufsvorbereitung (BV)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:70
+msgid "cm_rg_aid_overview_option_qualifications"
+msgstr "berufl. Qualifizierung (BQ)"
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:71
+msgid "cm_rg_aid_overview_option_life_skills"
+msgstr "Lebensbewältigung (LB)"
+
#: waskaweb/templates/casemanagement/upload.mako:5
#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:6
msgid "cm_np_import"
@@ -857,13 +1399,13 @@
msgid "cm_menu_link_document_back"
msgstr "Zurück zu: Anlagenübersicht"
-#: waskaweb/templates/documents/case_new.mako:26
+#: waskaweb/templates/documents/case_new.mako:25
#: waskaweb/templates/documents/global_upload.mako:23
#: waskaweb/templates/documents/upload_body.mako:5
msgid "doc_form_upload_label_file"
msgstr "Datei"
-#: waskaweb/templates/documents/case_new.mako:28
+#: waskaweb/templates/documents/case_new.mako:27
#: waskaweb/templates/documents/global_upload.mako:25
#: waskaweb/templates/documents/upload_body.mako:8
msgid "doc_form_upload_submit"
@@ -877,22 +1419,32 @@
msgid "cm_actions_link_doc_new"
msgstr "Neue Anlage hinzufügen"
-#: waskaweb/templates/documents/case_overview.mako:28
-#: waskaweb/templates/documents/global_overview.mako:28
+#: waskaweb/templates/documents/case_overview.mako:27
+#: waskaweb/templates/documents/global_overview.mako:27
msgid "doc_overview_tbl_header_filename"
msgstr "Dateiname"
-#: waskaweb/templates/documents/case_overview.mako:29
-#: waskaweb/templates/documents/global_overview.mako:29
+#: waskaweb/templates/documents/case_overview.mako:28
+#: waskaweb/templates/documents/global_overview.mako:28
msgid "doc_overview_tbl_header_filesize"
msgstr "Dateigröße"
-#: waskaweb/templates/documents/case_overview.mako:30
-#: waskaweb/templates/documents/global_overview.mako:30
+#: waskaweb/templates/documents/case_overview.mako:29
+#: waskaweb/templates/documents/global_overview.mako:29
msgid "doc_overview_tbl_header_actions"
msgstr "Aktionen"
-#: waskaweb/templates/documents/case_overview.mako:47
+#: waskaweb/templates/documents/case_overview.mako:40
+#: waskaweb/templates/documents/global_overview.mako:37
+msgid "doc_overview_tbl_show"
+msgstr "Anzeigen"
+
+#: waskaweb/templates/documents/case_overview.mako:41
+#: waskaweb/templates/documents/global_overview.mako:39
+msgid "doc_overview_tbl_delete"
+msgstr "Löschen"
+
+#: waskaweb/templates/documents/case_overview.mako:48
#: waskaweb/templates/documents/global_overview.mako:47
msgid "doc_overview_nofilesfound"
msgstr "Es wurden keine Dateien gefunden"
@@ -926,14 +1478,68 @@
msgid "menu_doc_link_overview_back"
msgstr "Zurück zu: Dokumentenübersicht"
+#: waskaweb/templates/start/responsible.mako:4
+msgid "responsible_info_sponsorship"
+msgstr "Information zur Trägerschaft"
+
+#: waskaweb/templates/start/responsible.mako:7
+msgid "responsible_project_sponsorship"
+msgstr "Projektträger"
+
+#: waskaweb/templates/start/responsible.mako:48
+msgid "responsible_realisation"
+msgstr "Realisation"
+
#: waskaweb/templates/start/start.mako:6
msgid "start_header_blackboard"
msgstr "Schwarzes Brett"
-#: waskaweb/templates/start/start.mako:11
+#: 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"
+
+#: waskaweb/templates/statement/edit.mako:5
+msgid "statement_edit_p_no_statement"
+msgstr ""
+"Für die gewählte Fallakte liegt aktuell noch keine Einverständniserklärung "
+"zur Erfassung, Verarbeitung und Nutzung personenbezogener Daten seitens des "
+"Jugendlichen vor."
+
+#: waskaweb/templates/statement/edit.mako:9
+msgid "statement_edit_p_statement_decision"
+msgstr ""
+"Sie können in diesem Dialog bestätigen, dass die Einverständniserklärung nun "
+"vorliegt. Alternativ können Sie angeben, dass die Erklärung sicher nicht vom "
+"Jugendlichen abgegeben wird. In diesem Fall wird die gewählte Fallakte "
+"anonymisiert und ist nicht mehr bearbeitbar."
+
+#: waskaweb/templates/statement/edit.mako:13
+msgid "statement_edit_p_statement_form"
+msgstr ""
+"Bitte beachten Sie, dass die Einverständniserklärung der schriftlichen Form "
+"bedarf. Dazu steht Ihnen eine"
+
+#: waskaweb/templates/statement/edit.mako:13
+msgid "statement_edit_a_statement_form_printversion"
+msgstr " Druckversion dieser Erklärung"
+
+#: waskaweb/templates/statement/edit.mako:13
+msgid "statement_edit_p_statement_form_end"
+msgstr "zur Verfügung."
+
+#: waskaweb/templates/statement/edit.mako:20
+msgid "statement_label_statement_yes"
+msgstr "Die Einwilligungserklärung liegt vor."
+
+#: waskaweb/templates/statement/edit.mako:24
+msgid "statement_label_statement_no"
+msgstr "Die Einwilligungserklärung liegt nicht vor."
+
#: waskaweb/templates/statement/dialogs/confirm.mako:6
msgid "statement_np_edit"
msgstr "Einverständniserklärung setzen"
@@ -942,6 +1548,51 @@
msgid "cm_np_show"
msgstr "Fallakte anzeigen"
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:9
+msgid "statement_dialog_header_statement_no"
+msgstr "Fehlende Einverständniserklärung"
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:10
+msgid "statement_dialog_p_statement_no_explanation"
+msgstr ""
+"Für die gewählte Fallakte liegt noch keine Einverständniserklärung seitens "
+"des Jugendlichen vor. Die Fallakte darf daher keine personenbezogenen Daten "
+"enthalten. Die entsprechende Einhaltung der gesetzlichen Bestimmungen liegt "
+"in Ihrer Verantwortung."
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:12
+msgid "statement_dialog_p_options"
+msgstr "Sie haben nun folgende Möglichkeiten:"
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:14
+msgid "statement_dialog_li_statement_set"
+msgstr "Erklärung jetzt setzen"
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:14
+msgid "statement_dialog_li_statement_set_explanation"
+msgstr ""
+", wenn der Status zur Einverständniserklärung inzwischen geklärt wurde."
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:15
+msgid "statement_dialog_li_statement_not_set"
+msgstr "Erklärung weiterhin unklar"
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:15
+msgid "statement_dialog_li_statement_not_set_explanation"
+msgstr ", wenn die Einverständniserklärung noch eingeholt werden soll."
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:18
+msgid "statement_dialog_a_statement_set"
+msgstr "Erklärung jetzt setzen"
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:19
+msgid "statement_dialog_a_statement_not_set"
+msgstr "Erklärung weiterhin unklar"
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:23
+msgid "statement_dialog_a_ok"
+msgstr "OK"
+
#: waskaweb/templates/usersettings/change_password.mako:6
msgid "adm_header_changepassword"
msgstr "Benutzerpasswort ändern"
@@ -951,17 +1602,17 @@
msgid "sm_menu_link_settings_back"
msgstr "Zurück zu: Mein Konto"
-#: waskaweb/templates/usersettings/change_password.mako:22
+#: waskaweb/templates/usersettings/change_password.mako:21
#: waskaweb/templates/usersettings/change_password_login.mako:20
msgid "adm_form_newuser_passwd"
msgstr "Passwort"
-#: waskaweb/templates/usersettings/change_password.mako:30
+#: waskaweb/templates/usersettings/change_password.mako:29
#: waskaweb/templates/usersettings/change_password_login.mako:28
msgid "adm_form_newuser_passwd_confirm"
msgstr "Passwort (Wiederholung)"
-#: waskaweb/templates/usersettings/change_password.mako:38
+#: waskaweb/templates/usersettings/change_password.mako:36
#: waskaweb/templates/usersettings/change_password_login.mako:36
msgid "adm_form_changepassword_submit"
msgstr "Passwort ändern"
@@ -970,6 +1621,30 @@
msgid "adm_header_changepassword_needed"
msgstr "Passwortänderung erforderlich"
+#: waskaweb/templates/usersettings/change_password_login.mako:7
+msgid "usersettings_p_set_new_pw"
+msgstr "Sie müssen Ihr Passwort neu setzen. Dies kann folgende Ursachen haben:"
+
+#: waskaweb/templates/usersettings/change_password_login.mako:9
+msgid "usersettings_li_set_new_pw_first_login"
+msgstr ""
+"Sie melden sich zum ersten Mal mit einem initialen Passwort auf dem System "
+"an."
+
+#: waskaweb/templates/usersettings/change_password_login.mako:10
+msgid "usersettings_li_set_new_pw_same_pw"
+msgstr ""
+"Sie haben über einen langen Zeitraum das selbe Passwort verwendet. Dies ist "
+"aus Gründen der Sicherheit nicht zulässig."
+
+#: waskaweb/templates/usersettings/change_password_login.mako:11
+msgid "usersettings_li_set_new_pw_adm_pw_force"
+msgstr "Das Passwort wurde durch die Administration zurückgesetzt."
+
+#: waskaweb/templates/usersettings/change_password_login.mako:13
+msgid "usersettings_p_insert_new_pw"
+msgstr "Bitte geben Sie nun das von Ihnen gewünschte Passwort ein."
+
#: waskaweb/templates/usersettings/edit_standin.mako:6
msgid "usrset_header_changestandin"
msgstr "Vertretung setzen"
@@ -982,14 +1657,26 @@
"ebenfalls Zugriff neu von Ihnen angelegte Fallakten. Diese Einstellung hat "
"keine Auswirkung auf bereits von Ihnen angelegte Fallakten."
-#: waskaweb/templates/usersettings/edit_standin.mako:22
+#: waskaweb/templates/usersettings/edit_standin.mako:23
msgid "usrset_form_changestandin_standin"
msgstr "VertreterIn"
-#: waskaweb/templates/usersettings/edit_standin.mako:35
+#: waskaweb/templates/usersettings/edit_standin.mako:36
msgid "usrset_form_changestandin_submit"
msgstr "Vertretung setzen"
+#: waskaweb/templates/usersettings/show_settings.mako:12
+msgid "usersettings_a_change_pw"
+msgstr "Benutzerpasswort ändern"
+
+#: waskaweb/templates/usersettings/show_settings.mako:14
+msgid "usersettings_a_change_replace"
+msgstr "Vertretung ändern"
+
+#: waskaweb/templates/usersettings/show_settings.mako:20
+msgid "usersettings_p_overview_personal_data"
+msgstr "Hier sehen sie eine Übersicht Ihrer persönlichen Daten."
+
#~ msgid "start_header_appointments_period"
#~ msgstr "Termine"
Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:03:16 UTC (rev 10)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2007-11-21 14:48+0100\n"
+"POT-Creation-Date: 2007-11-28 04:58+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,11 +17,47 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.1\n"
+#: waskaweb/templates/login.mako:3
+msgid "login_header_waska_login"
+msgstr ""
+
+#: waskaweb/templates/login.mako:5
+msgid "login_p_insert_pw_and_identifier"
+msgstr ""
+
+#: waskaweb/templates/login.mako:8
+msgid "login_label_identifier"
+msgstr ""
+
+#: waskaweb/templates/login.mako:15
+msgid "login_label_pw"
+msgstr ""
+
+#: waskaweb/templates/logout.mako:3
+msgid "logout_header_waska_logout"
+msgstr ""
+
+#: waskaweb/templates/logout.mako:5
+msgid "logout_p_logout successful"
+msgstr ""
+
+#: waskaweb/templates/logout.mako:5
+msgid "logout_a_login"
+msgstr ""
+
+#: waskaweb/templates/logout.mako:5
+msgid "logout_p_login_again"
+msgstr ""
+
+#: waskaweb/templates/main.mako:39
+msgid "np_text"
+msgstr ""
+
#: waskaweb/templates/main.mako:62
msgid "statusbar_logininfo"
msgstr ""
-#: waskaweb/templates/main.mako:69 waskaweb/templates/main.mako:100
+#: waskaweb/templates/main.mako:69 waskaweb/templates/main.mako:99
msgid "sm_menu_link_home"
msgstr ""
@@ -37,67 +73,84 @@
msgid "sm_menu_link_logout"
msgstr ""
-#: waskaweb/templates/main.mako:79
-msgid "np_text"
-msgstr ""
-
-#: waskaweb/templates/main.mako:80 waskaweb/templates/main.mako:98
+#: waskaweb/templates/main.mako:79 waskaweb/templates/main.mako:97
msgid "np_root"
msgstr ""
-#: waskaweb/templates/main.mako:103
+#: waskaweb/templates/main.mako:102
msgid "menu_app_link_overview"
msgstr ""
-#: waskaweb/templates/main.mako:106
+#: waskaweb/templates/main.mako:105
msgid "menu_doc_link_overview"
msgstr ""
-#: waskaweb/templates/main.mako:115
+#: waskaweb/templates/main.mako:114
msgid "menu_header_cm"
msgstr ""
-#: waskaweb/templates/main.mako:117
+#: waskaweb/templates/main.mako:116
msgid "menu_cm_link_overview"
msgstr ""
-#: waskaweb/templates/main.mako:120
+#: waskaweb/templates/main.mako:119
msgid "menu_cm_link_new"
msgstr ""
-#: waskaweb/templates/main.mako:122
+#: waskaweb/templates/main.mako:121
msgid "menu_cm_link_import"
msgstr ""
-#: waskaweb/templates/main.mako:125
+#: waskaweb/templates/main.mako:124
#: waskaweb/templates/casemanagement/evaluation.mako:8
msgid "cm_actions_link_evaluate"
msgstr ""
-#: waskaweb/templates/main.mako:134
+#: waskaweb/templates/main.mako:133
msgid "menu_header_adm"
msgstr ""
-#: waskaweb/templates/main.mako:136
+#: waskaweb/templates/main.mako:135
msgid "menu_adm_link_useroverview"
msgstr ""
-#: waskaweb/templates/main.mako:139
+#: waskaweb/templates/main.mako:138
msgid "menu_adm_link_showsettings"
msgstr ""
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:152
+msgid "main_formular_input_error"
+msgstr ""
+
+#: waskaweb/templates/main.mako:175
msgid "footer_title"
msgstr ""
-#: waskaweb/templates/main.mako:165
+#: waskaweb/templates/main.mako:175
msgid "footer_version"
msgstr ""
+#: waskaweb/templates/main_login.mako:38
+#: waskaweb/templates/start/responsible.mako:71
+msgid "main_login_bmf_phrase"
+msgstr ""
+
+#: waskaweb/templates/main_login.mako:59
+msgid "main_login_formular_input_error"
+msgstr ""
+
#: waskaweb/templates/administration/account_deactivated.mako:3
msgid "adm_header_account_deactivated"
msgstr ""
+#: waskaweb/templates/administration/account_deactivated.mako:4
+msgid "adm_con_ad_account_deactivated"
+msgstr ""
+
+#: waskaweb/templates/administration/account_deactivated.mako:10
+msgid "adm_con_ad_contact_admin"
+msgstr ""
+
#: waskaweb/templates/administration/edit_settings.mako:5
#: waskaweb/templates/administration/edit_user.mako:4
#: waskaweb/templates/administration/new_user.mako:5
@@ -125,6 +178,10 @@
msgid "adm_actions_link_showsettings"
msgstr ""
+#: waskaweb/templates/administration/edit_settings.mako:22
+msgid "adm_con_es_editsettings"
+msgstr ""
+
#: waskaweb/templates/administration/edit_settings.mako:27
#: waskaweb/templates/administration/show_settings.mako:25
msgid "adm_form_settings_kaname"
@@ -173,7 +230,7 @@
#: waskaweb/templates/administration/edit_user.mako:25
#: waskaweb/templates/administration/new_user.mako:28
-#: waskaweb/templates/administration/new_user_result.mako:22
+#: waskaweb/templates/administration/new_user_result.mako:21
#: waskaweb/templates/administration/show_user_body.mako:2
#: waskaweb/templates/administration/userform_body.mako:4
msgid "adm_form_legend_personal"
@@ -208,10 +265,8 @@
#: waskaweb/templates/administration/edit_user.mako:58
#: waskaweb/templates/administration/new_user.mako:61
-#: waskaweb/templates/administration/new_user_result.mako:45
-#: waskaweb/templates/administration/show_user_body.mako:29
+#: waskaweb/templates/administration/new_user_result.mako:44
#: waskaweb/templates/administration/userform_body.mako:21
-#: waskaweb/templates/usersettings/change_password.mako:19
#: waskaweb/templates/usersettings/change_password_login.mako:17
msgid "adm_form_legend_login"
msgstr ""
@@ -266,6 +321,62 @@
msgid "adm_header_newuser_Result"
msgstr ""
+#: waskaweb/templates/administration/new_user_result.mako:24
+msgid "adm_form_label_forename"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:28
+msgid "adm_form_label_name"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:32
+msgid "adm_form_label_phone"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:36
+msgid "adm_form_label_room"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:40
+msgid "adm_form_label_agency"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:47
+msgid "adm_form_label_login"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:51
+msgid "adm_form_label_password"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:55
+msgid "adm_form_label_role"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:59
+msgid "adm_form_label_activated"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:62
+msgid "adm_form_is_activated_yes"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:64
+msgid "adm_form_is_activated_no"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:69
+msgid "adm_form_label_login_pw"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:72
+msgid "adm_form_needs_pw_yes"
+msgstr ""
+
+#: waskaweb/templates/administration/new_user_result.mako:74
+msgid "adm_form_needs_pw_no"
+msgstr ""
+
#: waskaweb/templates/administration/overview_user.mako:12
msgid "adm_header_overview"
msgstr ""
@@ -286,6 +397,23 @@
msgid "adm_overview_tbl_header_actions"
msgstr ""
+#: waskaweb/templates/administration/overview_user.mako:33
+#: waskaweb/templates/appointments/overview_body.mako:14
+#: waskaweb/templates/appointments/overview_body.mako:22
+#: waskaweb/templates/appointments/overview_body.mako:30
+#: waskaweb/templates/appointments/overview_body.mako:37
+#: waskaweb/templates/appointments/overview_body.mako:48
+msgid "app_overview_body_table_show"
+msgstr ""
+
+#: waskaweb/templates/administration/overview_user.mako:34
+#: waskaweb/templates/appointments/overview_body.mako:15
+#: waskaweb/templates/appointments/overview_body.mako:23
+#: waskaweb/templates/appointments/overview_body.mako:38
+#: waskaweb/templates/appointments/overview_body.mako:49
+msgid "app_overview_body_table_delete"
+msgstr ""
+
#: waskaweb/templates/administration/reset_password.mako:7
#: waskaweb/templates/administration/show_user.mako:7
#: waskaweb/templates/administration/dialogs/confirm_resetpassword.mako:7
@@ -302,6 +430,22 @@
msgid "adm_header_resetpassword"
msgstr ""
+#: waskaweb/templates/administration/reset_password.mako:11
+msgid "adm_con_rp_the_password"
+msgstr ""
+
+#: waskaweb/templates/administration/reset_password.mako:11
+msgid "adm_con_rp_has_been_changed"
+msgstr ""
+
+#: waskaweb/templates/administration/reset_password.mako:11
+msgid "adm_con_rp_new_pw"
+msgstr ""
+
+#: waskaweb/templates/administration/reset_password.mako:12
+msgid "adm_con_rp_to_useroverview"
+msgstr ""
+
#: waskaweb/templates/administration/settings.mako:5
msgid "adm_np_setting"
msgstr ""
@@ -310,6 +454,10 @@
msgid "adm_header_settings"
msgstr ""
+#: waskaweb/templates/administration/settings.mako:8
+msgid "adm_con_set_synchronisation"
+msgstr ""
+
#: waskaweb/templates/administration/settings.mako:9
msgid "adm_header_synchronisation"
msgstr ""
@@ -326,6 +474,10 @@
msgid "adm_actions_link_editsettings"
msgstr ""
+#: waskaweb/templates/administration/show_settings.mako:22
+msgid "adm_con_ss_view_agency"
+msgstr ""
+
#: waskaweb/templates/administration/show_settings.mako:36
msgid "adm_form_settings_anontransfer_yes"
msgstr ""
@@ -342,6 +494,60 @@
msgid "adm_actions_link_edituser"
msgstr ""
+#: waskaweb/templates/administration/show_user_body.mako:5
+msgid "adm_form_table_forename"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:9
+msgid "adm_form_table_name"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:13
+msgid "adm_form_table_phone"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:17
+msgid "adm_form_table_room"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:21
+msgid "adm_form_table_agency"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:25
+msgid "adm_form_table_replace"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:29
+msgid "adm_form_header_login"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:32
+msgid "adm_form_table_login"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:36
+msgid "adm_form_table_role"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:41
+msgid "adm_form_table_activated"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:44
+#: waskaweb/templates/administration/show_user_body.mako:54
+msgid "adm_form_table_yes"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:46
+#: waskaweb/templates/administration/show_user_body.mako:56
+msgid "adm_form_table_no"
+msgstr ""
+
+#: waskaweb/templates/administration/show_user_body.mako:51
+msgid "adm_form_label_new_login_new_pw"
+msgstr ""
+
#: waskaweb/templates/administration/userform_body.mako:45
msgid "adm_form_user_passwd"
msgstr ""
@@ -350,6 +556,31 @@
msgid "adm_form_user_passwd_confirm"
msgstr ""
+#: waskaweb/templates/administration/dialogs/alert.mako:5
+#: waskaweb/templates/casemanagement/evaluation.mako:4
+#: waskaweb/templates/casemanagement/evaluation_result.mako:5
+#: waskaweb/templates/casemanagement/main.mako:8
+#: waskaweb/templates/casemanagement/new.mako:5
+#: waskaweb/templates/casemanagement/overview.mako:6
+#: waskaweb/templates/casemanagement/upload.mako:4
+#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
+#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
+#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement.mako:5
+#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
+#: waskaweb/templates/statement/dialogs/confirm.mako:5
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
+msgid "cm_np_root"
+msgstr ""
+
+#: waskaweb/templates/administration/dialogs/alert.mako:6
+#: waskaweb/templates/casemanagement/new.mako:6
+#: waskaweb/templates/casemanagement/dialogs/alert.mako:6
+#: waskaweb/templates/casemanagement/static_form/statement.mako:6
+msgid "cm_np_new"
+msgstr ""
+
#: waskaweb/templates/administration/dialogs/confirm_deleteuser.mako:7
msgid "adm_np_delteuser"
msgstr ""
@@ -441,31 +672,35 @@
msgstr ""
#: waskaweb/templates/appointments/overview.mako:10
-#: waskaweb/templates/appointments/overview.mako:25
+#: waskaweb/templates/appointments/overview.mako:24
#: waskaweb/templates/casemanagement/appointments.mako:10
msgid "app_header_overview"
msgstr ""
#: waskaweb/templates/appointments/overview.mako:15
-#: waskaweb/templates/casemanagement/appointments.mako:16
+#: waskaweb/templates/casemanagement/appointments.mako:17
msgid "app_actions_link_newappointment"
msgstr ""
+#: waskaweb/templates/appointments/overview.mako:27
+msgid "app_con_list_all_appointments"
+msgstr ""
+
#: waskaweb/templates/appointments/overview_body.mako:4
-#: waskaweb/templates/appointments/overview_body.mako:75
-#: waskaweb/templates/start/start.mako:14
+#: 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:76
-#: waskaweb/templates/start/start.mako:15
+#: 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:77
-#: waskaweb/templates/start/start.mako:16
+#: 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 ""
@@ -505,6 +740,18 @@
msgid "sm_menu_link_home_back"
msgstr ""
+#: waskaweb/templates/appointments/show.mako:25
+msgid "app_table_date"
+msgstr ""
+
+#: waskaweb/templates/appointments/show.mako:29
+msgid "app_table_title"
+msgstr ""
+
+#: waskaweb/templates/appointments/show.mako:33
+msgid "app_table_description"
+msgstr ""
+
#: waskaweb/templates/casemanagement/appointments.mako:4
#: waskaweb/templates/casemanagement/digest.mako:5
#: waskaweb/templates/casemanagement/formular.mako:34
@@ -520,6 +767,10 @@
msgid "cm_header_export_createscheme"
msgstr ""
+#: waskaweb/templates/casemanagement/create_export_scheme.mako:3
+msgid "cm_cn_ec_decide_which_part_to_export"
+msgstr ""
+
#: waskaweb/templates/casemanagement/digest.mako:6
msgid "cm_np_digest"
msgstr ""
@@ -528,63 +779,50 @@
msgid "cm_header_digest"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:17
+#: waskaweb/templates/casemanagement/digest.mako:14
+msgid "cm_digest_con_digest_dossier"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/digest.mako:15
msgid "cm_header_digest_personal"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:20
+#: waskaweb/templates/casemanagement/digest.mako:18
msgid "cm_digest_tbl_label_lastname"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:24
+#: waskaweb/templates/casemanagement/digest.mako:22
msgid "cm_digest_tbl_label_firstname"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:28
+#: waskaweb/templates/casemanagement/digest.mako:26
msgid "cm_digest_tbl_label_caseid"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:32
+#: waskaweb/templates/casemanagement/digest.mako:30
msgid "cm_digest_tbl_label_age"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:36
+#: waskaweb/templates/casemanagement/digest.mako:34
msgid "cm_digest_header_address"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:39
+#: waskaweb/templates/casemanagement/digest.mako:37
msgid "cm_digest_tbl_label_street"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:43
+#: waskaweb/templates/casemanagement/digest.mako:41
msgid "cm_digest_tbl_label_plz"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:47
+#: waskaweb/templates/casemanagement/digest.mako:45
msgid "cm_digest_tbl_label_city"
msgstr ""
-#: waskaweb/templates/casemanagement/digest.mako:51
+#: waskaweb/templates/casemanagement/digest.mako:49
msgid "cm_digest_tbl_label_telephone"
msgstr ""
-#: waskaweb/templates/casemanagement/evaluation.mako:4
-#: waskaweb/templates/casemanagement/evaluation_result.mako:5
-#: waskaweb/templates/casemanagement/main.mako:8
-#: waskaweb/templates/casemanagement/new.mako:5
-#: waskaweb/templates/casemanagement/overview.mako:6
-#: waskaweb/templates/casemanagement/upload.mako:4
-#: waskaweb/templates/casemanagement/dialogs/alert.mako:5
-#: waskaweb/templates/casemanagement/dialogs/confirm.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:5
-#: waskaweb/templates/casemanagement/dialogs/notificate_printall.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement.mako:5
-#: waskaweb/templates/casemanagement/static_form/statement_print.mako:5
-#: waskaweb/templates/statement/dialogs/confirm.mako:5
-#: waskaweb/templates/statement/dialogs/missing_statement.mako:5
-msgid "cm_np_root"
-msgstr ""
-
#: waskaweb/templates/casemanagement/evaluation.mako:5
#: waskaweb/templates/casemanagement/evaluation_result.mako:6
msgid "cm_np_evaluate"
@@ -602,6 +840,34 @@
msgid "cm_header_evaluate_result"
msgstr ""
+#: waskaweb/templates/casemanagement/evaluation_result.mako:11
+msgid "cm_eval_summary_header_1"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:12
+msgid "cm_eval_summary_header_2"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:13
+msgid "cm_eval_summary_header_3"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:14
+msgid "cm_eval_summary_header_4"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:15
+msgid "cm_eval_summary_header_5"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:16
+msgid "cm_eval_summary_header_6"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:17
+msgid "cm_eval_summary_header_7"
+msgstr ""
+
#: waskaweb/templates/casemanagement/evaluation_result.mako:22
#: waskaweb/templates/casemanagement/evaluation_result.mako:23
#: waskaweb/templates/casemanagement/evaluation_result.mako:24
@@ -614,6 +880,120 @@
msgid "cm_actions_link_export_evaluate"
msgstr ""
+#: waskaweb/templates/casemanagement/evaluation_result.mako:35
+msgid "cm_eval_header_1"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:38
+msgid "cm_eval_table_consult_customer"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:44
+msgid "cm_eval_table_taken_over_to_cm"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:50
+#: waskaweb/templates/casemanagement/evaluation_result.mako:70
+#: waskaweb/templates/casemanagement/evaluation_result.mako:95
+#: waskaweb/templates/casemanagement/evaluation_result.mako:107
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:134
+#: waskaweb/templates/casemanagement/evaluation_result.mako:146
+#: waskaweb/templates/casemanagement/evaluation_result.mako:160
+#: waskaweb/templates/casemanagement/evaluation_result.mako:175
+#: waskaweb/templates/casemanagement/evaluation_result.mako:187
+msgid "cm_eval_table_to_overview"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:50
+#: waskaweb/templates/casemanagement/evaluation_result.mako:70
+#: waskaweb/templates/casemanagement/evaluation_result.mako:95
+#: waskaweb/templates/casemanagement/evaluation_result.mako:107
+#: waskaweb/templates/casemanagement/evaluation_result.mako:119
+#: waskaweb/templates/casemanagement/evaluation_result.mako:134
+#: waskaweb/templates/casemanagement/evaluation_result.mako:146
+#: waskaweb/templates/casemanagement/evaluation_result.mako:160
+#: waskaweb/templates/casemanagement/evaluation_result.mako:175
+#: waskaweb/templates/casemanagement/evaluation_result.mako:187
+msgid "cm_eval_table_export_analysis"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:53
+msgid "cm_eval_header_2"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:56
+msgid "cm_eval_table_month"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:57
+msgid "cm_eval_table_completed"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:58
+msgid "cm_eval_table_aborted"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:73
+msgid "cm_eval_header_3"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:74
+msgid "cm_eval_header_on_gender"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:77
+msgid "cm_eval_label_male"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:83
+msgid "cm_eval_label_female"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:89
+msgid "cm_eval_label_intersexual"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:96
+msgid "cm_eval_header_on_age"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:110
+msgid "cm_eval_header_4"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:113
+msgid "cm_eval_label_migration_background"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:122
+msgid "cm_eval_header_5"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:123
+msgid "cm_eval_header_access_youngster_to_agency"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:135
+msgid "cm_eval_head_law_access_agency"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:149
+msgid "cm_eval_header_6"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:163
+msgid "cm_eval_header_7"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:164
+msgid "cm_eval_head_where_to_place_youngster"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/evaluation_result.mako:176
+msgid "cm_eval_header_law_changed_after_place"
+msgstr ""
+
#: waskaweb/templates/casemanagement/export.mako:4
msgid "cm_np_root<"
msgstr ""
@@ -630,6 +1010,10 @@
msgid "cm_actions_link_createexportscheme"
msgstr ""
+#: waskaweb/templates/casemanagement/export.mako:15
+msgid "cm_export_con_can_export_a_dossier"
+msgstr ""
+
#: waskaweb/templates/casemanagement/formular.mako:5
msgid "cm_header_form_edit"
msgstr ""
@@ -651,10 +1035,17 @@
#: waskaweb/templates/casemanagement/formular.mako:22
#: waskaweb/templates/casemanagement/formular.mako:79
#: waskaweb/templates/casemanagement/rg_aid_overview.mako:18
-#: waskaweb/templates/start/help.mako:10
msgid "cm_actions_link_printout"
msgstr ""
+#: waskaweb/templates/casemanagement/formular.mako:41
+msgid "cm_error_header_false_forminput"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/help.mako:3
+msgid "cm_help_header_help_for_dossier"
+msgstr ""
+
#: waskaweb/templates/casemanagement/main.mako:9
#: waskaweb/templates/casemanagement/overview.mako:7
msgid "cm_np_overview"
@@ -668,6 +1059,14 @@
msgid "cm_info_nr"
msgstr ""
+#: waskaweb/templates/casemanagement/main.mako:33
+msgid "cm_main_print_statement"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/main.mako:34
+msgid "cm_main_set_statement"
+msgstr ""
+
#: waskaweb/templates/casemanagement/main.mako:44
msgid "cm_menu_header_cases"
msgstr ""
@@ -704,12 +1103,14 @@
msgid "cm_menu_header_structure"
msgstr ""
-#: waskaweb/templates/casemanagement/new.mako:6
-#: waskaweb/templates/casemanagement/dialogs/alert.mako:6
-#: waskaweb/templates/casemanagement/static_form/statement.mako:6
-msgid "cm_np_new"
+#: waskaweb/templates/casemanagement/new.mako:32
+msgid "cm_new_p_please_consider_statement"
msgstr ""
+#: waskaweb/templates/casemanagement/new.mako:35
+msgid "cm_new_con_acceptance_statement_true"
+msgstr ""
+
#: waskaweb/templates/casemanagement/new_appointment.mako:16
msgid "cm_menu_link_appointment_back"
msgstr ""
@@ -722,66 +1123,179 @@
msgid "cm_header_organisation"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:15
+#: waskaweb/templates/casemanagement/organisation.mako:13
+msgid "cm_organisation_con_whois_cm_replace"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/organisation.mako:14
msgid "cm_header_organisation_editor"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:18
+#: waskaweb/templates/casemanagement/organisation.mako:17
msgid "cm_organisation_tbl_label_lastname"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:21
+#: waskaweb/templates/casemanagement/organisation.mako:20
msgid "cm_organisation_tbl_label_firstname"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:24
+#: waskaweb/templates/casemanagement/organisation.mako:23
msgid "cm_organisation_tbl_label_telephone"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:35
+#: waskaweb/templates/casemanagement/organisation.mako:34
msgid "cm_form_editor_submit"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:38
+#: waskaweb/templates/casemanagement/organisation.mako:37
msgid "cm_header_standin"
msgstr ""
-#: waskaweb/templates/casemanagement/organisation.mako:58
+#: waskaweb/templates/casemanagement/organisation.mako:57
msgid "cm_form_standin_submit"
msgstr ""
+#: waskaweb/templates/casemanagement/organisation.mako:62
+msgid "cm_organisation_table_cm"
+msgstr ""
+
#: waskaweb/templates/casemanagement/overview.mako:9
msgid "cm_header_overview"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:12
+#: waskaweb/templates/casemanagement/overview.mako:11
+msgid "cm_overview_con_list_dossiers_admin"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/overview.mako:15
+msgid "cm_overview_con_list_dossiers_cm"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/overview.mako:18
msgid "cm_header_search"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:16
+#: waskaweb/templates/casemanagement/overview.mako:22
msgid "cm_form_overview_search_submit"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:24
+#: waskaweb/templates/casemanagement/overview.mako:30
msgid "cm_overview_tbl_header_id"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:25
+#: waskaweb/templates/casemanagement/overview.mako:31
msgid "cm_overview_tbl_header_firstname"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:26
+#: waskaweb/templates/casemanagement/overview.mako:32
msgid "cm_overview_tbl_header_lastname"
msgstr ""
-#: waskaweb/templates/casemanagement/overview.mako:27
+#: waskaweb/templates/casemanagement/overview.mako:33
msgid "cm_overview_tbl_header_actions"
msgstr ""
+#: waskaweb/templates/casemanagement/overview.mako:56
+msgid "cm_overview_a_show"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/overview.mako:58
+msgid "cm_overview_a_delete"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/overview.mako:66
+msgid "cm_overview_tbl_no_data_found"
+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:44
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:46
+msgid "cm_rg_aid_overview_table_show"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:49
+msgid "cm_rg_aid_overview_table_"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:56
+msgid "cm_rg_aid_overview_table_no_offer_found"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_legend"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_bb"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_common_educational_area"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_bv"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_vocational_preparation"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_bq"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_qualifications"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_lb"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:61
+msgid "cm_rg_aid_overview_legend_life_skills"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:66
+msgid "cm_rg_aid_overview_legend_new_offer"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:68
+msgid "cm_rg_aid_overview_option_common_educational_area"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:69
+msgid "cm_rg_aid_overview_option_vocational_preparation"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:70
+msgid "cm_rg_aid_overview_option_qualifications"
+msgstr ""
+
+#: waskaweb/templates/casemanagement/rg_aid_overview.mako:71
+msgid "cm_rg_aid_overview_option_life_skills"
+msgstr ""
+
#: waskaweb/templates/casemanagement/upload.mako:5
#: waskaweb/templates/casemanagement/dialogs/notificate_import_dub.mako:6
msgid "cm_np_import"
@@ -856,13 +1370,13 @@
msgid "cm_menu_link_document_back"
msgstr ""
-#: waskaweb/templates/documents/case_new.mako:26
+#: waskaweb/templates/documents/case_new.mako:25
#: waskaweb/templates/documents/global_upload.mako:23
#: waskaweb/templates/documents/upload_body.mako:5
msgid "doc_form_upload_label_file"
msgstr ""
-#: waskaweb/templates/documents/case_new.mako:28
+#: waskaweb/templates/documents/case_new.mako:27
#: waskaweb/templates/documents/global_upload.mako:25
#: waskaweb/templates/documents/upload_body.mako:8
msgid "doc_form_upload_submit"
@@ -876,22 +1390,32 @@
msgid "cm_actions_link_doc_new"
msgstr ""
+#: waskaweb/templates/documents/case_overview.mako:27
+#: waskaweb/templates/documents/global_overview.mako:27
+msgid "doc_overview_tbl_header_filename"
+msgstr ""
+
#: waskaweb/templates/documents/case_overview.mako:28
#: waskaweb/templates/documents/global_overview.mako:28
-msgid "doc_overview_tbl_header_filename"
+msgid "doc_overview_tbl_header_filesize"
msgstr ""
#: waskaweb/templates/documents/case_overview.mako:29
#: waskaweb/templates/documents/global_overview.mako:29
-msgid "doc_overview_tbl_header_filesize"
+msgid "doc_overview_tbl_header_actions"
msgstr ""
-#: waskaweb/templates/documents/case_overview.mako:30
-#: waskaweb/templates/documents/global_overview.mako:30
-msgid "doc_overview_tbl_header_actions"
+#: waskaweb/templates/documents/case_overview.mako:40
+#: waskaweb/templates/documents/global_overview.mako:37
+msgid "doc_overview_tbl_show"
msgstr ""
-#: waskaweb/templates/documents/case_overview.mako:47
+#: waskaweb/templates/documents/case_overview.mako:41
+#: waskaweb/templates/documents/global_overview.mako:39
+msgid "doc_overview_tbl_delete"
+msgstr ""
+
+#: waskaweb/templates/documents/case_overview.mako:48
#: waskaweb/templates/documents/global_overview.mako:47
msgid "doc_overview_nofilesfound"
msgstr ""
@@ -925,14 +1449,58 @@
msgid "menu_doc_link_overview_back"
msgstr ""
+#: waskaweb/templates/start/responsible.mako:4
+msgid "responsible_info_sponsorship"
+msgstr ""
+
+#: waskaweb/templates/start/responsible.mako:7
+msgid "responsible_project_sponsorship"
+msgstr ""
+
+#: waskaweb/templates/start/responsible.mako:48
+msgid "responsible_realisation"
+msgstr ""
+
#: waskaweb/templates/start/start.mako:6
msgid "start_header_blackboard"
msgstr ""
-#: waskaweb/templates/start/start.mako:11
+#: 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 ""
+
+#: waskaweb/templates/statement/edit.mako:5
+msgid "statement_edit_p_no_statement"
+msgstr ""
+
+#: waskaweb/templates/statement/edit.mako:9
+msgid "statement_edit_p_statement_decision"
+msgstr ""
+
+#: waskaweb/templates/statement/edit.mako:13
+msgid "statement_edit_p_statement_form"
+msgstr ""
+
+#: waskaweb/templates/statement/edit.mako:13
+msgid "statement_edit_a_statement_form_printversion"
+msgstr ""
+
+#: waskaweb/templates/statement/edit.mako:13
+msgid "statement_edit_p_statement_form_end"
+msgstr ""
+
+#: waskaweb/templates/statement/edit.mako:20
+msgid "statement_label_statement_yes"
+msgstr ""
+
+#: waskaweb/templates/statement/edit.mako:24
+msgid "statement_label_statement_no"
+msgstr ""
+
#: waskaweb/templates/statement/dialogs/confirm.mako:6
msgid "statement_np_edit"
msgstr ""
@@ -941,6 +1509,46 @@
msgid "cm_np_show"
msgstr ""
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:9
+msgid "statement_dialog_header_statement_no"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:10
+msgid "statement_dialog_p_statement_no_explanation"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:12
+msgid "statement_dialog_p_options"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:14
+msgid "statement_dialog_li_statement_set"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:14
+msgid "statement_dialog_li_statement_set_explanation"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:15
+msgid "statement_dialog_li_statement_not_set"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:15
+msgid "statement_dialog_li_statement_not_set_explanation"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:18
+msgid "statement_dialog_a_statement_set"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:19
+msgid "statement_dialog_a_statement_not_set"
+msgstr ""
+
+#: waskaweb/templates/statement/dialogs/missing_statement.mako:23
+msgid "statement_dialog_a_ok"
+msgstr ""
+
#: waskaweb/templates/usersettings/change_password.mako:6
msgid "adm_header_changepassword"
msgstr ""
@@ -950,17 +1558,17 @@
msgid "sm_menu_link_settings_back"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:22
+#: waskaweb/templates/usersettings/change_password.mako:21
#: waskaweb/templates/usersettings/change_password_login.mako:20
msgid "adm_form_newuser_passwd"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:30
+#: waskaweb/templates/usersettings/change_password.mako:29
#: waskaweb/templates/usersettings/change_password_login.mako:28
msgid "adm_form_newuser_passwd_confirm"
msgstr ""
-#: waskaweb/templates/usersettings/change_password.mako:38
+#: waskaweb/templates/usersettings/change_password.mako:36
#: waskaweb/templates/usersettings/change_password_login.mako:36
msgid "adm_form_changepassword_submit"
msgstr ""
@@ -969,6 +1577,26 @@
msgid "adm_header_changepassword_needed"
msgstr ""
+#: waskaweb/templates/usersettings/change_password_login.mako:7
+msgid "usersettings_p_set_new_pw"
+msgstr ""
+
+#: waskaweb/templates/usersettings/change_password_login.mako:9
+msgid "usersettings_li_set_new_pw_first_login"
+msgstr ""
+
+#: waskaweb/templates/usersettings/change_password_login.mako:10
+msgid "usersettings_li_set_new_pw_same_pw"
+msgstr ""
+
+#: waskaweb/templates/usersettings/change_password_login.mako:11
+msgid "usersettings_li_set_new_pw_adm_pw_force"
+msgstr ""
+
+#: waskaweb/templates/usersettings/change_password_login.mako:13
+msgid "usersettings_p_insert_new_pw"
+msgstr ""
+
#: waskaweb/templates/usersettings/edit_standin.mako:6
msgid "usrset_header_changestandin"
msgstr ""
@@ -977,11 +1605,23 @@
msgid "usrset_explain_changestandin"
msgstr ""
-#: waskaweb/templates/usersettings/edit_standin.mako:22
+#: waskaweb/templates/usersettings/edit_standin.mako:23
msgid "usrset_form_changestandin_standin"
msgstr ""
-#: waskaweb/templates/usersettings/edit_standin.mako:35
+#: waskaweb/templates/usersettings/edit_standin.mako:36
msgid "usrset_form_changestandin_submit"
msgstr ""
+#: waskaweb/templates/usersettings/show_settings.mako:12
+msgid "usersettings_a_change_pw"
+msgstr ""
+
+#: waskaweb/templates/usersettings/show_settings.mako:14
+msgid "usersettings_a_change_replace"
+msgstr ""
+
+#: waskaweb/templates/usersettings/show_settings.mako:20
+msgid "usersettings_p_overview_personal_data"
+msgstr ""
+
Modified: trunk/waskaweb/lib/base.py
===================================================================
--- trunk/waskaweb/lib/base.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/lib/base.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -44,15 +44,15 @@
# Check if the user is already authorized.
# If not then redirect the user to the login page
try:
- login, passwd, user = session['USER_AUTHORIZED']
+ user = session['USER_AUTHORIZED']
dbname = getDbName()
self.db = db.DB(
dbname = DBNAME % dbname,
host = HOST,
port = PORT,
- user = USER % (dbname, login),
- password = passwd)
+ user = USER % (dbname, user.login),
+ password = user.password)
db.enter(self.db)
Modified: trunk/waskaweb/lib/casedata.py
===================================================================
--- trunk/waskaweb/lib/casedata.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/lib/casedata.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -570,7 +570,7 @@
def initData(self):
conn, cur = None, None
try:
- login, passwd, user = session['USER_AUTHORIZED']
+ user = session['USER_AUTHORIZED']
agency = Agency()
fields = {
'ka_name': agency.getName(),
Modified: trunk/waskaweb/lib/evaluation.py
===================================================================
--- trunk/waskaweb/lib/evaluation.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/lib/evaluation.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -169,7 +169,7 @@
def perform(self):
result = {}
sql = """select t.id, count(v.zugang_kompetenzagentur), t.value
- from master_tbl_view v
+ from master_tbl_eval_total_view v
right join zugang_kompetenzagentur_tbl t
on v.zugang_kompetenzagentur = t.id
group by t.id, t.value having t.id is not null
@@ -197,7 +197,7 @@
except StandardError, err:
print >> sys.stderr, str(err)
finally:
- db.recycleConnection(con, c1)
+ db.recycleConnection(conn, c1)
except:
print >> sys.stderr, "No results for eval 4"
return result
@@ -215,7 +215,7 @@
def perform(self):
result = {}
- sql = """select r.id, count(m.rechtlicher_kontext), r.value from master_tbl_view m
+ sql = """select r.id, count(m.rechtlicher_kontext), r.value from master_tbl_eval_total_view m
right join rechtlicher_kontext_tbl r
on m.rechtlicher_kontext = r.id
group by r.id, r.value having r.id is not null
Modified: trunk/waskaweb/lib/helpers.py
===================================================================
--- trunk/waskaweb/lib/helpers.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/lib/helpers.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -9,53 +9,36 @@
from webhelpers import *
def hasRole(rolelist):
- # available rolenames:
- # * admin_ka
- # * cm_ka
- # * pt_dlr
try:
- user = session['USER_AUTHORIZED'][2]
- return user.role in rolelist
+ user = session['USER_AUTHORIZED']
+ return user.getPermissionRole() in rolelist
except KeyError:
return False
def getRole():
- # Translate Roles:
- # * admin_ka -> Admin-KA
- # * cm_ka -> CM-KA
- # * pt_dlr -> PT-DLR
try:
- user = session['USER_AUTHORIZED'][2]
+ user = session['USER_AUTHORIZED']
return user.getRole()
- #role = user.role
- #if role == 'cm_ka':
- # return 'CM-KA'
- #elif role == 'admin_ka':
- # return 'Admin-KA'
- #elif role == 'pt_dlr':
- # return 'PT-DLR'
- #else:
- # return ''
except KeyError:
return ''
def getUserFullname():
try:
- user = session['USER_AUTHORIZED'][2]
+ user = session['USER_AUTHORIZED']
return "%s, %s" % (user.last_name, user.first_name)
except KeyError:
return ''
def getLogin():
try:
- user = session['USER_AUTHORIZED'][2]
+ user = session['USER_AUTHORIZED']
return user.login
except KeyError:
return ''
def getUserId():
try:
- user = session['USER_AUTHORIZED'][2]
+ user = session['USER_AUTHORIZED']
return user.id
except KeyError:
return ''
Modified: trunk/waskaweb/lib/security.py
===================================================================
--- trunk/waskaweb/lib/security.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/lib/security.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -19,6 +19,8 @@
check_re = re.compile(r"^[a-z_0-9]+$")
ROLE_SQL = """select groname from pg_group where getOID() = ANY (grolist)"""
+ROLE_SQL = """select where getOID() = ANY (grolist)"""
+FETCH_USER_DATA_SQL = """SELECT id, vorname, nachname, passwort_aendern, aktiviert, rolle from ka_benutzer_tbl_view WHERE login = %(login)s"""
def checkLogin(user, password):
@@ -41,27 +43,31 @@
try:
conn = db.getConnection()
cursor = conn.cursor()
- cursor.execute(ROLE_SQL)
+ login = "ka_%s_%s" % (getDbName(), user)
+ fields = {'login': login}
+ cursor.execute(FETCH_USER_DATA_SQL, fields)
try:
- # Get role of the current logged in user
- result = cursor.fetchone()[0]
- tok = result.split('_')
- role = "_".join(tok[-2:])
+ result = cursor.fetchone()
+ data = {}
+ data['id'] = result[0]
+ data['firstname'] = unicode(str(result[1]), 'utf-8')
+ data['lastname'] = unicode(str(result[2]), 'utf-8')
+ data['newpass'] = result[3]
+ data['activated'] = result[4]
+ data['role'] = unicode(str(result[5]), 'utf-8')
except:
- print >> sys.stderr, "No role found"
- role = None
+ data = None
finally:
db.recycleConnection(conn, cursor)
-
try:
- from waskaweb.model.user import UserObject
- userobject = UserObject()
- if user == 'adm':
- userobject.setAdmUser()
+ from waskaweb.model.user import SessionUser, SessionSuperAdmin
+ if data:
+ userobject = SessionUser(login, password)
+ userobject.setData(data)
+ elif user == 'adm':
+ userobject = SessionSuperAdmin(login, password)
else:
- userobject.loadByName(user)
- userobject.role = role
-
+ return None
return userobject
except StandardError, err:
traceback.print_exc(file=sys.stderr)
@@ -71,14 +77,12 @@
mydb.closeConnections()
except:
traceback.print_exc(file=sys.stderr)
- return None
+ return None
def getDbName():
dbname = None
try:
dbname = request.environ['SSL_CLIENT_S_DN_CN'].split(' ')[3].lower()
- session['agency_name'] = dbname
- session.save()
return dbname
except:
print >> sys.stderr, "Could not fetch database name from client certificate"
Modified: trunk/waskaweb/lib/validators.py
===================================================================
--- trunk/waskaweb/lib/validators.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/lib/validators.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -43,14 +43,14 @@
messages = {
'too_long': u'Der Loginname darf nicht länger als %(max)i '
u'Zeichen lang sein',
- 'invalid_char': u'Der Loginname darf nur Buchstaben, Zahlen oder Unterstriche enthalten'
+ 'invalid_char': u'Der Loginname darf nur Kleinbuchstaben, Zahlen oder Unterstriche enthalten'
}
def _to_python(self, value, state):
# _to_python gets run before validate_python. Here we
# strip whitespace off the password, because leading and
# trailing whitespace in a password is too elite.
- user = session['USER_AUTHORIZED'][2]
+ user = session['USER_AUTHORIZED']
agency = user.getAgency()
prefix_str = "ka_%s_" % agency
prefix_length = len(prefix_str)
Modified: trunk/waskaweb/model/user.py
===================================================================
--- trunk/waskaweb/model/user.py 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/model/user.py 2008-08-13 13:03:16 UTC (rev 10)
@@ -4,12 +4,10 @@
from pylons import config, session
import sys
-FETCH_USER_LIST_SQL = """SELECT id from ka_benutzer_tbl_view order by nachname"""
+FETCH_USER_LIST_SQL = """SELECT id, vorname, nachname, rolle from ka_benutzer_tbl_view order by nachname"""
FETCH_USER_DATA_SQL = """SELECT id, vorname, nachname, telefon, aktiviert, passwort_aendern, login, raumnummer, filiale, usesysid, vertreter, rolle from ka_benutzer_tbl_view WHERE id = %s"""
-FETCH_USER_ID_SQL = """SELECT id from ka_benutzer_tbl_view WHERE login = %(login)s"""
FETCH_USER_SYS_ID_SQL = """SELECT usesysid FROM pg_user WHERE usename = '%s'"""
CREATE_USER_SQL_M = """SELECT ka_create_role(%(agency)s, %(grouprole)s, %(loginname)s, %(firstname)s, %(surname)s, %(phone)s, %(room)s, %(branchoffice)s, %(activated)s , %(setpassword)s)"""
-CREATE_USER_SQL_KA = """SELECT create_benutzer_ds(%(login)s)"""
RESET_USER_PASSWORD_SQL = """SELECT waska_reset_password(%(login)s, %(agency)s)"""
ALTER_USER_PASSWORD_SQL = """SELECT ka_set_password(%(login)s, %(password)s)"""
ALTER_USER_STANDIN_SQL = """SELECT ka_set_standin(%(standin)s, %(userid)s)"""
@@ -26,7 +24,12 @@
cur = conn.cursor()
cur.execute(FETCH_USER_LIST_SQL)
for r in cur.fetchall():
- self.user.append(UserObject(r[0]))
+ firstname = unicode(str(r[1]), 'utf-8')
+ lastname = unicode(str(r[2]), 'utf-8')
+ data = {'id': r[0], 'firstname': firstname, 'lastname': lastname, 'role': r[3]}
+ uo = UserObject()
+ uo.setData(data)
+ self.user.append(uo)
finally:
db.recycleConnection(conn, cur)
except StandardError, err:
@@ -44,51 +47,55 @@
return [e for e in self.user if e.id not in filter]
else:
return self.user
-
-class UserObject:
+class User:
def __init__(self, id=None):
-
+ self.id = id
+ #self.oid = ''
self.login = ''
+ self.full_login = '' #full login: ka_dbname_login
self.role = ''
- self.oid = ''
self.agency = ''
- self.full_login = ''
-
- self.id = None
self.last_name = ''
self.first_name = ''
- self.telephone = ''
- self.room = ''
- self.branchoffice = ''
- self.telephone = ''
self.activated = True
self.needs_passrefresh = True
- self.standin = ''
- # Load existing user?
- if id:
- if id == '0':
- self.setAdmUser()
- else:
- self._fetchData(id)
-
- def _processLoginString(self):
- tok = self.full_login.split('_')
- self.login = "_".join(tok[2:])
- self.agency = tok[1]
-
def getLogin(self):
- if self.login: return self.login
- else:
- self._processLoginString()
- return self.login
+ return self.login
def getAgency(self):
- if self.agency: return self.agency
+ return self.agency
+
+ def getPermissionRole(self):
+ '''Returns the users permissionrole
+ Available rolenames:
+ * admin_ka
+ * cm_ka
+ * pt_dlr
+ '''
+ try:
+ tok = self.role.split('_')
+ return "_".join(tok[-2:])
+ except:
+ return None
+
+ def getRole(self):
+ '''Returns the string of the users role which is meant to be displayed in the ui
+ Translate Roles:
+ * admin_ka -> Admin-KA
+ * cm_ka -> CM-KA
+ * pt_dlr -> PT-DLR
+ '''
+ permrole = self.getPermissionRole()
+ if permrole == 'cm_ka':
+ return 'CM-KA'
+ elif permrole == 'admin_ka':
+ return 'Admin-KA'
+ elif permrole == 'pt_dlr':
+ return 'PT-DLR'
else:
- self.processLoginString()
- return self.agency
-
+ return permrole
+
def isActivated(self):
return self.activated
@@ -98,18 +105,62 @@
def isAdmin(self):
return (self.getRole() == "Admin-KA")
- def getRole(self):
- tok = self.role.split('_')
- role = "_".join(tok[-2:])
- if role == 'cm_ka':
- return 'CM-KA'
- elif role == 'admin_ka':
- return 'Admin-KA'
- elif role == 'pt_dlr':
- return 'PT-DLR'
- else:
- return role
+class SessionUser(User):
+ def __init__(self, lname, password):
+ User.__init__(self, None)
+ tok = lname.split('_')
+ self.full_login = lname
+ self.login = "_".join(tok[2:])
+ self.agency = tok[1]
+ self.password = password
+ def setData(self, data):
+ self.id = data.get('id', '')
+ self.first_name = data.get('firstname', '')
+ self.last_name = data.get('lastname', '')
+ self.activated = data.get('activated', False)
+ self.needs_passrefresh = data.get('newpass', True)
+ self.role = data.get('role', '')
+
+class SessionSuperAdmin(User):
+ def __init__(self, lname, password):
+ User.__init__(self, 0)
+ self.last_name = 'Zentrale Administration'
+ self.needs_passrefresh = False
+ self.role = 'ka_%s_admin_ka' % getDbName()
+ self.full_login = lname
+ tok = lname.split('_')
+ self.login = "_".join(tok[2:])
+ self.agency = tok[1]
+ self.password = password
+
+class UserObject(User):
+ def __init__(self, id=None):
+ User.__init__(self, id)
+
+ self.telephone = ''
+ self.room = ''
+ self.branchoffice = ''
+ self.telephone = ''
+ self.standin = -1
+
+ # Load existing user?
+ if (not id is None) and (str(id) != '-1'):
+ #SuperAdmin
+ if str(id) == '0':
+ self.setAdmUser()
+ else:
+ self._fetchData(id)
+
+ def setAdmUser(self):
+ self.last_name = 'Zentrale Administration'
+ self.needs_passrefresh = False
+ self.role = 'ka_%s_admin_ka' % getDbName()
+ self.full_login = 'ka_%s_adm' % getDbName()
+ tok = self.full_login.split('_')
+ self.login = "_".join(tok[2:])
+ self.agency = tok[1]
+
def setPassword(self, password):
conn, cur = None, None
try:
@@ -164,47 +215,12 @@
self.oid = ud[9]
self.standin = ud[10]
self.role = ud[11]
- self._processLoginString()
+ tok = self.full_login.split('_')
+ self.login = "_".join(tok[2:])
+ self.agency = tok[1]
finally:
db.recycleConnection(conn, cur)
- def setAdmUser(self):
- lname = "ka_%s_adm" % (getDbName())
- conn, cur = None, None
- try:
- conn = db.getConnection()
- cur = conn.cursor()
- fields = {'login': '''%s''' % lname}
- cmd = FETCH_USER_SYS_ID_SQL % lname
- cur.execute(cmd)
- uid = cur.fetchone()[0]
- self.id = 0
- self.first_name = ''
- self.last_name = 'Zentrale Administration'
- self.activated = True
- self.needs_passrefresh = False
- self.full_login = lname
- self.oid = uid
- self.role = 'admin_ka'
- self._processLoginString()
- finally:
- db.recycleConnection(conn, cur)
-
-
- def loadByName(self, name):
- # build long loginname as it is stored in the db
- lname = "ka_%s_%s" % (getDbName(), name)
- conn, cur = None, None
- try:
- conn = db.getConnection()
- cur = conn.cursor()
- fields = {'login': lname}
- cur.execute(FETCH_USER_ID_SQL, fields)
- id = cur.fetchone()
- self._fetchData(id)
- finally:
- db.recycleConnection(conn, cur)
-
def setStandin(self, uid):
con, cur = None, None
fields = {'userid': self.id, 'standin':uid}
@@ -218,7 +234,9 @@
def setData(self, data):
"""Eats dictionary holding valid data returned from the formencode validation"""
+ self.id = data.get('id', self.id)
self.first_name = data.get('firstname', self.first_name)
+ self.role = data.get('role', self.role)
self.last_name= data.get('lastname', self.last_name)
self.telephone = data.get('telephone', self.telephone)
self.room = data.get('room', self.room)
@@ -254,20 +272,6 @@
db.recycleConnection(conn, cur)
return password
- def _init_ka_benutzer(self, username):
- id = None
- conn, cur = None, None
- try:
- conn = db.getConnection()
- cur = conn.cursor()
- fields = {'login': username}
- cur.execute(CREATE_USER_SQL_KA, fields)
- id = cur.fetchone()[0]
- conn.commit()
- finally:
- db.recycleConnection(conn, cur)
- return id
-
def store(self):
fields = {
'vorname': self.first_name,
Modified: trunk/waskaweb/public/images/BMFSFJ_C_M_web.jpg
===================================================================
(Binary files differ)
Modified: trunk/waskaweb/public/images/eu_logo_4c_pos_web2.jpg
===================================================================
(Binary files differ)
Modified: trunk/waskaweb/public/styles/all.css
===================================================================
--- trunk/waskaweb/public/styles/all.css 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/public/styles/all.css 2008-08-13 13:03:16 UTC (rev 10)
@@ -51,6 +51,7 @@
}
+
/*----------------------*/
/* 2. Evaluation Formats*/
/*----------------------*/
@@ -69,6 +70,18 @@
text-align: left;
}
+.table_width_50 {
+ width:3em;
+}
+
+.table_width_100 {
+ width:6em;
+}
+
+.table_width_150 {
+ width:9em;
+}
+
div.evaluation {
padding: 0.5em 0.5em 1.5em 0.5em;
}
Modified: trunk/waskaweb/public/styles/color3.css
===================================================================
--- trunk/waskaweb/public/styles/color3.css 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/public/styles/color3.css 2008-08-13 13:03:16 UTC (rev 10)
@@ -114,6 +114,10 @@
border-color: #000;
}
+div.form_errors a {
+ color: #a5103b;
+}
+
div.form_errors h1 {
color: #a5103b;
}
Modified: trunk/waskaweb/public/styles/screen.css
===================================================================
--- trunk/waskaweb/public/styles/screen.css 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/public/styles/screen.css 2008-08-13 13:03:16 UTC (rev 10)
@@ -414,7 +414,7 @@
}
#waska_form_login #login_btn {
-padding-top:0.1em;
+ padding-top:0.1em;
}
#wrapper_login {
@@ -508,3 +508,42 @@
list-style-type:square;
margin-left:1em;
}
+
+
+/* Traeger */
+
+.traeger {
+ margin-bottom:1em;
+ height:auto;
+ float:left;
+}
+
+.traeger_contact {
+ margin-top:0.4em;
+ float:left;
+ width:100%;
+}
+
+.traeger_contact_field {
+ width:50%;
+ font-weight:normal;
+}
+
+.traeger_name {
+ width:100%;
+}
+
+.traeger_name_text {
+ width:65%;
+ float:left;
+}
+
+.traeger_name_img {
+ width:30%;
+ float:left;
+ padding-left:0.5em;
+}
+
+.traeger_name_img img{
+ margin-bottom:0.4em;
+}
\ No newline at end of file
Modified: trunk/waskaweb/templates/administration/account_deactivated.mako
===================================================================
--- trunk/waskaweb/templates/administration/account_deactivated.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/account_deactivated.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,11 +1,11 @@
## -*- coding: utf-8 -*-
<%inherit file="../main_login.mako" />
<h1>${_('adm_header_account_deactivated')}</h1>
-<p>Dieser Account wurde deaktiviert. Dies kann mehrere Ursachen haben:
+<p>${_('adm_con_ad_account_deactivated')}
<ul>
<li>Option 1</li>
<li>Option 2</li>
<li>Option 3</li>
</ul>
-Bitte setzen Sie sich in dieser Angelegenheit mit der Administration in Verbindung
+${_('adm_con_ad_contact_admin')}
</p>
Modified: trunk/waskaweb/templates/administration/edit_settings.mako
===================================================================
--- trunk/waskaweb/templates/administration/edit_settings.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/edit_settings.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -19,7 +19,7 @@
</div>
</div>
<div id="admin_edit_settings">
-<p>Hier können Sie die agenturweiten Einstellungen bearbeiten.</p>
+<p>${_('adm_con_es_editsettings')}</p>
<div class="waska_form">
<form action="/administration/editSettingsAction" method="POST">
<div class="waska_form_element w50">
@@ -46,7 +46,7 @@
% endif
% if c.agency.isAnonTransfer():
- <input id="anon_transfer" name="anon_transfer" type="checkbox" checked/>
+ <input id="anon_transfer" name="anon_transfer" type="checkbox" checked />
% else:
<input id="anon_transfer" name="anon_transfer" type="checkbox"/>
% endif
@@ -72,4 +72,6 @@
</form>
</div>
</div>
-<div id="clearer" ><div>
+</div>
+<div class="clearer" ><div>
+</div>
\ No newline at end of file
Modified: trunk/waskaweb/templates/administration/new_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/new_user.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/new_user.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -32,7 +32,7 @@
% if c.form_errors.get('firstname'):
<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
% endif
- <input type="text" class="field" id="firstname" name="firstname" value="${c.form_result.get('firstname', '')}">
+ <input type="text" class="field" id="firstname" name="firstname">
</div>
<div class="w75">
<label
@@ -40,22 +40,22 @@
% if c.form_errors.get('lastname'):
<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
% endif
- <input type="text" class="field" id="lasttname" name="lastname" value="${c.form_result.get('lastname', '')}">
+ <input type="text" class="field" id="lasttname" name="lastname">
</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', '')}">
+ <input type="text" class="field" id="telephone" name="telephone">
</div>
<div class="w75">
<label
for="room">${_('adm_form_user_room')}</label><br>
- <input type="text" class="field" id="room" name="room" value="${c.form_result.get('room', '')}">
+ <input type="text" class="field" id="room" name="room">
</div>
<div class="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', '')}">
+ <input type="text" class="field" id="branchoffice" name="branchoffice">
</div>
</fieldset>
<fieldset><legend>${_('adm_form_legend_login')}</legend>
@@ -65,22 +65,22 @@
% if c.form_errors.get('login'):
<a href="#error_list"><img class="smallicon" src="/images/error_small.png"></a>
% endif
- <input type="text" class="field" id="login" name="login" value="${c.form_result.get('login', '')}">
+ <input type="text" class="field" id="login" name="login">
</div>
<div class="w50">
<label for="role">${_('adm_form_user_role')}</label><br>
<select name="role" id="role">
- <option value="CM-KA">CM-Ka</option>
+ <option value="CM-KA" >CM-Ka</option>
<option value="Admin-KA">Admin-Ka</option>
</select>
</div>
<div class="w100">
- <input type="checkbox" name="activated" id="activated" value="1" checked>
- <label for="activated">${_('adm_form_user_activated')}</label>
+ <input type="checkbox" name="activated" id="activated" value="1" checked>
+ <label for="activated">${_('adm_form_user_activated')}</label>
</div>
<div class="w100">
- <input type="checkbox" name="newpass" id="newpass" value="1" checked>
- <label for="newpass">${_('adm_form_user_newpass')}</label>
+ <input type="checkbox" name="newpass" id="newpass" value="1" checked>
+ <label for="newpass">${_('adm_form_user_newpass')}</label>
</div>
</fieldset>
<input type="submit" value="${_('adm_form_user_submit')}">
Modified: trunk/waskaweb/templates/administration/new_user_result.mako
===================================================================
--- trunk/waskaweb/templates/administration/new_user_result.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/new_user_result.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -14,7 +14,6 @@
<div class="actions">
<ul>
<li><a href="${h.url_for(controller='administration', action='overviewUser')}">${self.buildIco()} ${_('menu_adm_link_useroverview_back')}</a></li>
- </a>
</ul>
</div>
</div>
@@ -22,57 +21,57 @@
<h2>${_('adm_form_legend_personal')}</h2>
<table>
<tr>
- <td class="label">Vorname</td>
+ <td class="label">${_('adm_form_label_forename')}</td>
<td>${c.uo.first_name}</td>
</tr>
<tr>
- <td class="label">Nachname</td>
+ <td class="label">${_('adm_form_label_name')}</td>
<td>${c.uo.last_name}</td>
</tr>
<tr>
- <td class="label">Telefon</td>
+ <td class="label">${_('adm_form_label_phone')}</td>
<td>${c.uo.telephone}</td>
</tr>
<tr>
- <td class="label">Raumnummer</td>
+ <td class="label">${_('adm_form_label_room')}</td>
<td>${c.uo.room}</td>
</tr>
<tr>
- <td class="label">Filiale</td>
+ <td class="label">${_('adm_form_label_agency')}</td>
<td>${c.uo.branchoffice}</td>
</tr>
</table>
<h2>${_('adm_form_legend_login')}</h2>
<table>
<tr>
- <td class="label">Login</td>
+ <td class="label">${_('adm_form_label_login')}</td>
<td>${c.uo.getLogin()}</td>
</tr>
<tr>
- <td class="label">Passwort</td>
+ <td class="label">${_('adm_form_label_password')}</td>
<td>${c.user_password}</td>
</tr>
<tr>
- <td class="label">Rolle</td>
+ <td class="label">${_('adm_form_label_role')}</td>
<td>${c.uo.role}</td>
</tr>
<tr>
- <td class="label">Aktiviert</td>
+ <td class="label">${_('adm_form_label_activated')}</td>
<td>
% if c.uo.isActivated():
- Ja
+ ${_('adm_form_is_activated_yes')}
% else:
- Nein
+ ${_('adm_form_is_activated_no')}
% endif
</td>
</tr>
<tr>
- <td class="label">Bei Anmeldung neues Passwort verlangen</td>
+ <td class="label">${_('adm_form_label_login_pw')}</td>
<td>
% if c.uo.needsNewPass():
- Ja
+ ${_('adm_form_needs_pw_yes')}
% else:
- Nein
+ ${_('adm_form_needs_pw_no')}
% endif
</td>
</tr>
Modified: trunk/waskaweb/templates/administration/overview_user.mako
===================================================================
--- trunk/waskaweb/templates/administration/overview_user.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/overview_user.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -30,8 +30,8 @@
<td>${user.last_name}</td>
<td>${user.first_name}</td>
<td>
- <a href="/administration/showUser/${user.id}">Anzeigen</a>
- <a href="/administration/deleteUser/${user.id}">Löschen</a>
+ <a href="/administration/showUser/${user.id}">${_('app_overview_body_table_show')}</a>
+ <a href="/administration/deleteUser/${user.id}">${_('app_overview_body_table_delete')}</a>
</td>
</tr>
% endfor
Modified: trunk/waskaweb/templates/administration/reset_password.mako
===================================================================
--- trunk/waskaweb/templates/administration/reset_password.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/reset_password.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -8,5 +8,5 @@
<li><a href="#">${_('adm_np_resetpassword')}</a></li>
</%def>
<h1>${_('adm_header_resetpassword')}</h1>
-<p>Das Password für den Benutzer <strong>${c.uo.first_name} ${c.uo.last_name}</strong> wurde erfolgreich geändert.<br>Das neue Passwort lautet: <strong>${c.new_password}</strong></p>
-<p>Weiter zur <a href="/administration/overviewUser">Benutzerübersicht</a></p>
+<p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name} ${c.uo.last_name}</strong>${_('adm_con_rp_has_been_changed')}<br>${_('adm_con_rp_new_pw')} <strong>${c.new_password}</strong></p>
+<p><a href="/administration/overviewUser">${_('adm_con_rp_to_useroverview')}</a></p>
Modified: trunk/waskaweb/templates/administration/settings.mako
===================================================================
--- trunk/waskaweb/templates/administration/settings.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/settings.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -5,7 +5,7 @@
<li><a href="/administration/settings">${_('adm_np_setting')}</a></li>
</%def>
<h1>${_('adm_header_settings')}</h1>
-<p>Hier werden Sie Einstellungen zur Synchrnisation vornehmen können.</p>
+<p>${_('adm_con_set_synchronisation')}</p>
<h2>${_('adm_header_synchronisation')}</h2>
<form action="saveSync">
<div id="waska_form">
Modified: trunk/waskaweb/templates/administration/show_settings.mako
===================================================================
--- trunk/waskaweb/templates/administration/show_settings.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/show_settings.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -13,13 +13,13 @@
<div id="modusfield">
<div class="actions">
<ul>
- <a href="/administration/editSettings">${self.buildIco()} ${_('adm_actions_link_editsettings')}</a>
+ <li><a href="/administration/editSettings">${self.buildIco()} ${_('adm_actions_link_editsettings')}</a></li>
</ul>
</div>
</div>
</div>
-<p>Hier können Sie die agenturweiten Einstellungen sehen.</p>
+<p>${_('adm_con_ss_view_agency')}</p>
<table>
<tr>
<td class="label">${_('adm_form_settings_kaname')}</td>
Modified: trunk/waskaweb/templates/administration/show_user_body.mako
===================================================================
--- trunk/waskaweb/templates/administration/show_user_body.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/administration/show_user_body.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -2,58 +2,58 @@
<h2>${_('adm_form_legend_personal')}</h2>
<table>
<tr>
- <td class="label">Vorname</td>
+ <td class="label">${_('adm_form_table_forename')}</td>
<td>${c.uo.first_name | F.NA, h}</td>
</tr>
<tr>
- <td class="label">Nachname</td>
+ <td class="label">${_('adm_form_table_name')}</td>
<td>${c.uo.last_name | F.NA, h}</td>
</tr>
<tr>
- <td class="label">Telefon</td>
+ <td class="label">${_('adm_form_table_phone')}</td>
<td>${c.uo.telephone | F.NA, h}</td>
</tr>
<tr>
- <td class="label">Raumnummer</td>
+ <td class="label">${_('adm_form_table_room')}</td>
<td>${c.uo.room | F.NA, h}</td>
</tr>
<tr>
- <td class="label">Filiale</td>
+ <td class="label">${_('adm_form_table_agency')}</td>
<td>${c.uo.branchoffice | F.NA, h}</td>
</tr>
<tr>
- <td class="label">Vertreter</td>
+ <td class="label">${_('adm_form_table_replace')}</td>
<td>${c.vuo.first_name | F.NA, h} ${c.vuo.last_name | F.NA, h}</td>
</tr>
</table>
-<h2>${_('adm_form_legend_login')}</h2>
+<h2>${_('adm_form_header_login')}</h2>
<table>
<tr>
- <td class="label">Login</td>
+ <td class="label">${_('adm_form_table_login')}</td>
<td>${c.uo.getLogin()}</td>
</tr>
<tr>
- <td class="label">Rolle</td>
+ <td class="label">${_('adm_form_table_role')}</td>
<td>${c.uo.getRole()}</td>
</tr>
% if h.hasRole(['admin_ka']):
<tr>
- <td class="label">Aktiviert</td>
+ <td class="label">${_('adm_form_table_activated')}</td>
<td>
% if c.uo.isActivated():
- Ja
+ ${_('adm_form_table_yes')}
% else:
- Nein
+ ${_('adm_form_table_no')}
% endif
</td>
</tr>
<tr>
- <td class="label">Bei Anmeldung neues Passwort verlangen</td>
+ <td class="label">${_('adm_form_label_new_login_new_pw')}</td>
<td>
% if c.uo.needsNewPass():
- Ja
+ ${_('adm_form_table_yes')}
% else:
- Nein
+ ${_('adm_form_table_no')}
% endif
</td>
</tr>
Modified: trunk/waskaweb/templates/appointments/overview.mako
===================================================================
--- trunk/waskaweb/templates/appointments/overview.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/appointments/overview.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -13,7 +13,6 @@
<div class="actions">
<ul>
<li><a href="/appointment/create">${self.buildIco()} ${_('app_actions_link_newappointment')}</a></li>
- </a>
</ul>
</div>
</div>
@@ -25,6 +24,6 @@
${_('app_header_overview')}
</div>
</div>
-<p>Hier wird eine Auflistung aller Termine angezeigt. Termine sind Benutzern oder Fallakten zugeordnet.</p>
+<p>${_('app_con_list_all_appointments')}</p>
% endif
<%include file="overview_body.mako" />
Modified: trunk/waskaweb/templates/appointments/overview_body.mako
===================================================================
--- trunk/waskaweb/templates/appointments/overview_body.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/appointments/overview_body.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -11,31 +11,31 @@
<td>07.12.2007</td>
<td>Akte prüfen </td>
<td>
- <a href="#">Anzeigen</a>
- <a href="#">Löschen</a>
+ <a href="/appointment/show/5">${_('app_overview_body_table_show')}</a>
+ <a href="/appointment/delete/5">${_('app_overview_body_table_delete')}</a>
</td>
</tr>
<tr>
<td>17.12.2007</td>
<td>Auswertung Fallakten vorbereiten</td>
<td>
- <a href="#">Anzeigen</a>
- <a href="#">Löschen</a>
+ <a href="/appointment/show/6">${_('app_overview_body_table_show')}</a>
+ <a href="/appointment/delete/6">${_('app_overview_body_table_delete')}</a>
</td>
</tr>
<tr>
<td>21.12.2007</td>
<td>Weihnachtsfeier</td>
<td>
- <a href="#">Anzeigen</a>
+ <a href="/appointment/show/7">${_('app_overview_body_table_show')}</a>
</td>
</tr>
<tr>
<td>14.01.2008</td>
<td>Gespräch mit Peter Koch</td>
<td>
- <a href="#">Anzeigen</a>
- <a href="#">Löschen</a>
+ <a href="/appointment/show/9">${_('app_overview_body_table_show')}</a>
+ <a href="/appointment/delete/9">${_('app_overview_body_table_delete')}</a>
</td>
</tr>
% endif
@@ -45,8 +45,8 @@
<td>21.12.2007</td>
<td>Weihnachtsfeier</td>
<td>
- <a href="/appointment/show/7">Anzeigen</a>
- <a href="/appointment/delete/7">Löschen</a>
+ <a href="/appointment/show/7">${_('app_overview_body_table_show')}</a>
+ <a href="/appointment/delete/7">${_('app_overview_body_table_delete')}</a>
</td>
</tr>
% endif
Modified: trunk/waskaweb/templates/appointments/show.mako
===================================================================
--- trunk/waskaweb/templates/appointments/show.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/appointments/show.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -22,15 +22,15 @@
<!-- Fake table -->
<table>
<tbody><tr>
- <td class="label">Datum</td>
+ <td class="label">${_('app_table_date')}</td>
<td>07.12.2007</td>
</tr>
<tr>
- <td class="label">Titel</td>
+ <td class="label">${_('app_table_title')}</td>
<td>Wiedervorlage Akte</td>
</tr>
<tr>
- <td class="label">Beschreibung</td>
+ <td class="label">${_('app_table_description')}</td>
<td>Akte von Herrn Bauer vorlegen und Fördermaßnahmen beraten.</td>
</tr>
</tbody></table>
Modified: trunk/waskaweb/templates/casemanagement/create_export_scheme.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/create_export_scheme.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/create_export_scheme.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,4 +1,3 @@
<%inherit file="../main.mako" />
<h1>${_('cm_header_export_createscheme')}</h1>
-<p>Hier werden Sie festlegen können welche Teile der Akte exportiert
-werden sollen.</p>
+<p>${_('cm_cn_ec_decide_which_part_to_export')}</p>
Modified: trunk/waskaweb/templates/casemanagement/digest.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/digest.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/digest.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -11,9 +11,7 @@
${_('cm_header_digest')}
</div>
</div>
-<p>Hier wird eine Zusammenfassung der Fallakte angezeigt. Diese
-Zusammenfassung besteht aus einer Zusammenstellung verschiedener Felder aus
-dem Fallaktenformular</p>
+<p>${_('cm_digest_con_digest_dossier')}</p>
<h2>${_('cm_header_digest_personal')}</h2>
<table>
<tr>
Modified: trunk/waskaweb/templates/casemanagement/evaluation_result.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/evaluation_result.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/evaluation_result.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -8,13 +8,13 @@
</%def>
<h1><a name="top">${_('cm_header_evaluate_result')}</a></h1>
<ul>
- <li><a href="#eval_1">1. Verhältnis Beratungskunden/Aufnahmen in das CM</a></li>
- <li><a href="#eval_2">2. Verweildauer im CM</a></li>
- <li><a href="#eval_3">3. Alters- und Geschlechterstruktur in %</a></li>
- <li><a href="#eval_4">4. Migrationshintergrund</a></li>
- <li><a href="#eval_5">5. Zugang zur Kompetenzagentur</a></li>
- <li><a href="#eval_6">6. Förderbedarf</a></li>
- <li><a href="#eval_7">7. Vermittlung</a></li>
+ <li><a href="#eval_1">${_('cm_eval_summary_header_1')}</a></li>
+ <li><a href="#eval_2">${_('cm_eval_summary_header_2')}</a></li>
+ <li><a href="#eval_3">${_('cm_eval_summary_header_3')}</a></li>
+ <li><a href="#eval_4">${_('cm_eval_summary_header_4')}</a></li>
+ <li><a href="#eval_5">${_('cm_eval_summary_header_5')}</a></li>
+ <li><a href="#eval_6">${_('cm_eval_summary_header_6')}</a></li>
+ <li><a href="#eval_7">${_('cm_eval_summary_header_7')}</a></li>
</ul>
<!--
<div class="actions">
@@ -32,30 +32,30 @@
</div>
-->
<div class="evaluation odd-row first-row">
-<h3><a name="eval_1">1. Anzahl der Beratungskunden, davon % ins CM aufgenommen</a></h3>
+<h3><a name="eval_1">${_('cm_eval_header_1')}</a></h3>
<table class="evaluation">
<tr>
- <td class="label">Beratungskunden</td>
- <td width="50px">${c.eval_1_total}</td>
- <td width="100px">(100%)</td>
+ <td class="label">${_('cm_eval_table_consult_customer')}</td>
+ <td class="table_width_50">${c.eval_1_total}</td>
+ <td class="table_width_100">(100%)</td>
<td></td>
</tr>
<tr>
- <td class="label">Ins CM übernommen</td>
+ <td class="label">${_('cm_eval_table_taken_over_to_cm')}</td>
<td>${c.eval_1_cm}</td>
<td>(${c.eval_1_percent}%)</td>
<td></td>
</tr>
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_1/auswertung_1_beratung.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_1/auswertung_1.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
<div class="evaluation even-row">
-<h3><a name="eval_2">2. Anzahl der Jugendlichen im CM, davon % abgeschlossen nach durchschnittlich x Monaten</a></h3>
+<h3><a name="eval_2">${_('cm_eval_header_2')}</a></h3>
<table class="evaluation">
<tr>
- <th>Monat</th>
- <th width="150px">Abgeschlossen</th>
- <th width="150px">Abgebrochen</th>
+ <th>${_('cm_eval_table_month')}</th>
+ <th class="table_width_150">${_('cm_eval_table_completed')}</th>
+ <th class="table_width_150">${_('cm_eval_table_aborted')}</th>
<th></th>
</tr>
% for r in c.eval_10:
@@ -67,122 +67,122 @@
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_10/auswertung_2_abgeschlossen.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_10/auswertung_10.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
<div class="evaluation odd-row">
-<h3><a name="eval_3">3. Alters- und Geschlechterstruktur in %</a></h3>
-<h4>Angaben zur Geschlechterstruktur </h4>
+<h3><a name="eval_3">${_('cm_eval_header_3')}</a></h3>
+<h4>${_('cm_eval_header_on_gender')} </h4>
<table class="evaluation">
<tr>
- <td class="label">Männlich</td>
- <td width="50px">${c.eval_2_m[0]}</td>
- <td width="100px">(${c.eval_2_m[1]}%)</td>
+ <td class="label">${_('cm_eval_label_male')}</td>
+ <td class="table_width_50">${c.eval_2_m[0]}</td>
+ <td class="table_width_100">(${c.eval_2_m[1]}%)</td>
<td></td>
</tr>
<tr>
- <td class="label">Weiblich</td>
+ <td class="label">${_('cm_eval_label_female')}</td>
<td>${c.eval_2_w[0]}</td>
- <td width="100px">(${c.eval_2_w[1]}%)</td>
+ <td class="table_width_100">(${c.eval_2_w[1]}%)</td>
<td></td>
</tr>
<tr>
- <td class="label">Intersexuell</td>
+ <td class="label">${_('cm_eval_label_intersexual')}</td>
<td>${c.eval_2_i[0]}</td>
- <td width="100px">(${c.eval_2_i[1]}%)</td>
+ <td class="table_width_100">(${c.eval_2_i[1]}%)</td>
<td></td>
</tr>
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_2/auswertung_3_geschlecht.csv">Auswertung exportieren</a>
-<h4>Angaben zur Altersverteilung</h4>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_2/auswertung_2.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>${_('cm_eval_header_on_age')}</h4>
<table class="evaluation">
% for v in c.eval_8:
<tr>
<td class="label">${v[0]}</td>
- <td width="50px">${v[1]}</td>
- <td width="100px">${v[2]}%</td>
+ <td class="table_width_50">${v[1]}</td>
+ <td class="table_width_100">${v[2]}%</td>
<td></td>
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_8/auswertung_3_alter.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_8/auswertung_8.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
<div class="evaluation even-row">
-<h3><a name="eval_4">4. Migrationshintergrund in % (Staatsangehörigkeit nicht Deutsch oder Mutter/Vater nicht in Deutschland geboren)</a></h3>
+<h3><a name="eval_4">${_('cm_eval_header_4')}</a></h3>
<table class="evaluation">
<tr>
- <td class="label">Migrations- Hintergrund</td>
- <td width="50px">${c.eval_3[0]}</td>
- <td width="100px">(${c.eval_3[1]}%)</td>
+ <td class="label">${_('cm_eval_label_migration_background')}</td>
+ <td class="table_width_50">${c.eval_3[0]}</td>
+ <td class="table_width_100">(${c.eval_3[1]}%)</td>
<td></td>
</tr>
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_3/auswertung_4_migration.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_3/auswertung_3.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
<div class="evaluation odd-row">
-<h3><a name="eval_5">5. Angaben zum Zugang des Jugendlichen zur Kompetenzagentur in %</a></h3>
-<h4>Zugang des Jugendlichen zur Kompetenzagentur in %</h4>
+<h3><a name="eval_5">${_('cm_eval_header_5')}</a></h3>
+<h4>${_('cm_eval_header_access_youngster_to_agency')}</h4>
<table class="evaluation">
% for r in c.eval_4.itervalues():
<tr>
<td class="label">${r[0]}</td>
- <td width="50px">${r[1]}</td>
- <td width="100px">(${r[2]}%)</td>
+ <td class="table_width_50">${r[1]}</td>
+ <td class="table_width_100">(${r[2]}%)</td>
<td></td>
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_4/auswertung_5_zugang.csv">Auswertung exportieren</a>
-<h4>Rechtskreis der Jugendlichen beim Zugang zur Kompetenzagentur in %</h4>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_4/auswertung_4.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>${_('cm_eval_head_law_access_agency')}</h4>
<table class="evaluation">
% for r in c.eval_5.itervalues():
<tr>
<td class="label">${r[0]}</td>
- <td width="50px">${r[1]}</td>
- <td width="100px">(${r[2]}%)</td>
+ <td class="table_width_50">${r[1]}</td>
+ <td class="table_width_100">(${r[2]}%)</td>
<td></td>
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_5/auswertung_5_rechtskreis.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_5/auswertung_5.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
<div class="evaluation even-row">
-<h3><a name="eval_6">6. Förderbedarf in % nach den vier Bereichen 4.2.1 - 4.2.4</a></h3>
+<h3><a name="eval_6">${_('cm_eval_header_6')}</a></h3>
<table class="evaluation">
% for r in c.eval_9:
<tr>
<td class="label">${r[0]}</td>
- <td width="50px">${r[1]}</td>
- <td width="100px">(${r[2]}%)</td>
+ <td class="table_width_50">${r[1]}</td>
+ <td class="table_width_100">(${r[2]}%)</td>
<td></td>
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_9/auswertung_6_bedarf.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_9/auswertung_9.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
<div class="evaluation odd-row">
-<h3><a name="eval_7">7. Angaben zur Vermittlung der Jugendlichen</a></h3>
-<h4>Wohin wurden die Jugendlichen vermittlelt?</h4>
+<h3><a name="eval_7">${_('cm_eval_header_7')}</a></h3>
+<h4>${_('cm_eval_head_where_to_place_youngster')}</h4>
<table class="evaluation">
% for r in c.eval_6.itervalues():
<tr>
<td class="label">${r[0]}</td>
- <td width="50px">${r[1]}</td>
- <td width="100px">(${r[2]}%)</td>
+ <td class="table_width_50">${r[1]}</td>
+ <td class="table_width_100">(${r[2]}%)</td>
<td></td>
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_6/auswertung_7_vermittelt.csv">Auswertung exportieren</a>
-<h4>Angaben zur Veränderung des Rechtskreises nach der Vermittlung</h4>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_6/auswertung_6.csv">${_('cm_eval_table_export_analysis')}</a>
+<h4>${_('cm_eval_header_law_changed_after_place')}</h4>
<table class="evaluation">
% for r in c.eval_7.itervalues():
<tr>
<td class="label">${r[0]}</td>
- <td width="50px">${r[1]}</td>
- <td width="100px">(${r[2]}%)</td>
+ <td class="table_width_50">${r[1]}</td>
+ <td class="table_width_100">(${r[2]}%)</td>
<td></td>
</tr>
% endfor
</table>
-<a href="#top">Zur Übersicht</a> | <a href="/evaluate/exportEvaluation_7/auswertung_7_rechtskreis.csv">Auswertung exportieren</a>
+<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_7/auswertung_7.csv">${_('cm_eval_table_export_analysis')}</a>
</div>
Modified: trunk/waskaweb/templates/casemanagement/export.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/export.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/export.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -12,4 +12,4 @@
</li>
</ul>
</div>
-<p>Hier werden Sie eine Fallakte exportieren können.</p>
+<p>${_('cm_export_con_can_export_a_dossier')}</p>
Modified: trunk/waskaweb/templates/casemanagement/formular.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/formular.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/formular.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -28,7 +28,7 @@
${c.formular}
<!-- End Form -->
</div>
-<div id="clearer" ></div>
+<div class="clearer" ></div>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/select/${session.get('case_id')}/1" onclick="return checkModification();">${_('cm_np_select')}</a></li>
@@ -38,7 +38,7 @@
<%def name="buildFormErrors()">
% if len(h.getFormularErrors(c.page_id)) > 0:
<div class="form_errors">
- <a name="error_list"><h1>Fehlerhafte Formulareingabe</h1></a>
+ <a name="error_list"><h1>${_('cm_error_header_false_forminput')}</h1></a>
<ul>
% for key, error in h.getFormularErrors(c.page_id).iteritems():
<li><a href="#${key}">${error.getName()}</a>: ${"<br>".join(error.getMessages())}</a></li>
Modified: trunk/waskaweb/templates/casemanagement/help.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/help.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/help.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,4 +1,4 @@
## -*- coding: utf-8 -*-
<%inherit file="../main_login.mako" />
-<h1>Hilfe zum Fallakten-Formular</h1>
+<h1>${_('cm_help_header_help_for_dossier')}</h1>
<p>${c.helpdata}</p>
Modified: trunk/waskaweb/templates/casemanagement/main.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/main.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/main.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -30,8 +30,8 @@
<div class="actions">
<div id="marked">
<ul>
- <li><a href="/statement/printPrivacyStatement/${session.get('case_id', None)}" target="_blank" onclick="return checkModification();">${self.buildIco()} Erklärung drucken</a></li>
- <li><a href="/statement/setPrivacyStatement/${session.get('case_id', None)}" onclick="return checkModification();">${self.buildIco()} Erklärung setzen</a></li>
+ <li><a href="/statement/printPrivacyStatement/${session.get('case_id', None)}" target="_blank" onclick="return checkModification();">${self.buildIco()} ${_('cm_main_print_statement')}</a></li>
+ <li><a href="/statement/setPrivacyStatement/${session.get('case_id', None)}" onclick="return checkModification();">${self.buildIco()} ${_('cm_main_set_statement')}</a></li>
</ul>
</div>
</div>
Modified: trunk/waskaweb/templates/casemanagement/new.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/new.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/new.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -29,11 +29,10 @@
<input class="field" type="text" size="50" maxlength="60" name="wohnort" id="wohnort" value="${session.get('case_city', "")}">
</div>
<div style="padding: 1em 0;">
-<p>Bitte beachten Sie, dass die Einverständniserklärung die Grundlage zur Erfassung personenbezogener Daten ist. Klicken Sie hierzu auf die Auswahl "Erklärung drucken". Bitte nutzen Sie den "Zurück"-Knopf Ihres Browsers, um nach dem Drucken auf diese Seite zurückzukehren.
-</p>
+<p>${_('cm_new_p_please_consider_statement')}</p>
</div>
<div class="waska_form_element w100">
-<input type="checkbox" name="statement_signed"><label for="statement">Die Einwilligungserklärung für die Erfassung, Verarbeitung und Nutzung personenbezogener Daten wurde bereits zur Eingangsamnese bzw. Beratung vor dem Case Management eingeholt.</label></div>
+<input type="checkbox" name="statement_signed"><label for="statement">${_('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">
Modified: trunk/waskaweb/templates/casemanagement/organisation.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/organisation.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/organisation.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -10,8 +10,7 @@
${_('cm_header_organisation')}
</div>
</div>
-<p>Diese Seite zeigt an, wer der Mitarbeiter dieser Fallakte ist und wer die
-Vertretung für die Bearbeitung übernimmt.</p>
+<p>${_('cm_organisation_con_whois_cm_replace')}</p>
<h2>${_('cm_header_organisation_editor')}</h2>
<table>
<tr>
@@ -60,7 +59,7 @@
% else:
<table>
<tr>
- <th>Bearbeiter</th>
+ <th>${_('cm_organisation_table_cm')}</th>
</tr>
% for user in c.user_list:
% if user.id in c.standin_list:
Modified: trunk/waskaweb/templates/casemanagement/overview.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/overview.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/overview.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -7,8 +7,14 @@
<li><a href="/case/overview/">${_('cm_np_overview')}</a></li>
</%def>
<h1>${_('cm_header_overview')}</h1>
-<p>Hier wird eine Auflistung der Fälle des angemeldeten Benutzers
-angezeigt</p>
+% if h.hasRole(['admin_ka']):
+<p>${_('cm_overview_con_list_dossiers_admin')}</p>
+% endif
+
+% if h.hasRole(['cm_ka']):
+<p>${_('cm_overview_con_list_dossiers_cm')}</p>
+%endif
+
<h2>${_('cm_header_search')}</h2>
<div class="waska_form">
<form name="case_search" action="/case/search/">
@@ -47,9 +53,9 @@
<td>${case.first_name| F.NA, h}</td>
<td>${case.last_name | F.NA, h}</td>
<td>
- <a href="/case/select/${case.id}/0/">Anzeigen</a>
+ <a href="/case/select/${case.id}/0/">${_('cm_overview_a_show')}</a>
% if h.hasRole('admin_ka'):
- <a href="/case/delete/${case.id}/0/">Löschen</a>
+ <a href="/case/delete/${case.id}/0/">${_('cm_overview_a_delete')}</a>
% endif
</td>
</tr>
@@ -57,7 +63,7 @@
% if len(c.cases.getDatasets()) == 0:
<tr>
<td colspan="6">
- Es wurden keine Datensätze gefunden.
+ ${_('cm_overview_tbl_no_data_found')}
</td>
</tr>
% endif
Modified: trunk/waskaweb/templates/casemanagement/rg_aid_overview.mako
===================================================================
--- trunk/waskaweb/templates/casemanagement/rg_aid_overview.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/casemanagement/rg_aid_overview.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -8,7 +8,7 @@
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
-Übersicht Unterstützungsangebote
+${_('cm_rg_aid_overview_header_overview_support_offer')}
</div>
% if h.hasRole(['cm_ka']):
<div id="modusfield">
@@ -29,9 +29,9 @@
<tr>
<th width="100">Von</th>
<th width="100">Bis</th>
- <th>Institution</th>
- <th>Angebotsform</th>
- <th>Aktionen</th>
+ <th>${_('cm_rg_aid_overview_table_institution')}</th>
+ <th>${_('cm_rg_aid_overview_table_offer_type')}</th>
+ <th>${_('cm_rg_aid_overview_table_actions')}</th>
</tr>
% for aid in c.rg_list.getDatasets():
<tr>
@@ -41,33 +41,34 @@
<td>${aid.type}</td>
<td>
% if session['case_modus'] == "show":
- <a href="/case/show/${aid.id}/${aid.page_id}">Anzeigen</a>
+ <a href="/case/show/${aid.id}/${aid.page_id}">${_('cm_rg_aid_overview_table_show')}</a>
% else:
- <a href="/case/edit/${aid.id}/${aid.page_id}">Anzeigen</a>
+ <a href="/case/edit/${aid.id}/${aid.page_id}">${_('cm_rg_aid_overview_table_show')}</a>
% endif
% if h.hasRole(['cm_ka']):
- <a href="/case/deleteAid/${aid.id}/${aid.type_id}/0">Löschen</a>
+ <a href="/case/deleteAid/${aid.id}/${aid.type_id}/0">${_('cm_rg_aid_overview_table_')}</a>
% endif
</td>
</tr>
% endfor
% if c.rg_list.numDatasets() <= 0:
<tr>
- <td colspan="5">Keine Angebote gefunden</td>
+ <td colspan="5">${_('cm_rg_aid_overview_table_no_offer_found')}</td>
</tr>
% endif
</table>
<div class="legend">
-Legende: <strong>(BB)</strong>: Allgemein bildenden Bereich <strong>(BV)</strong>: Bereich der Berufsvorbereitung <strong>(BQ)</strong>: Berufliche Qualifizierung <strong>(LB)</strong>: Lebensbewältigung</div>
+${_('cm_rg_aid_overview_legend_legend')}<strong>${_('cm_rg_aid_overview_legend_bb')}</strong>: ${_('cm_rg_aid_overview_legend_common_educational_area')}<strong>${_('cm_rg_aid_overview_legend_bv')}</strong>: ${_('cm_rg_aid_overview_legend_vocational_preparation')}<strong>${_('cm_rg_aid_overview_legend_bq')}</strong>: ${_('cm_rg_aid_overview_legend_qualifications')}<strong>${_('cm_rg_aid_overview_legend_lb')}</strong>:${_('cm_rg_aid_overview_legend_life_skills')}
+</div>
% if h.hasRole(['cm_ka']):
<div class="waska_form">
<form name="new_unterstuetzung" action="/case/newAidAction" method="POST">
- <label for="angebot">Neues Angebot hinzufügen</label><br>
+ <label for="angebot">${_('cm_rg_aid_overview_legend_new_offer')}</label><br>
<select name="aid_type" id="angebot">
- <option value="0">allg. bildender Bereich (BB)</option>
- <option value="1">Berufsvorbereitung (BV)</option>
- <option value="2">berufl. Qualifizierung (BQ)</option>
- <option value="3">Lebensbewältigung (LB)</option>
+ <option value="0">${_('cm_rg_aid_overview_option_common_educational_area')}</option>
+ <option value="1">${_('cm_rg_aid_overview_option_vocational_preparation')}</option>
+ <option value="2">${_('cm_rg_aid_overview_option_qualifications')}</option>
+ <option value="3">${_('cm_rg_aid_overview_option_life_skills')}</option>
</select>
<input type="hidden" name="page_id" value="${c.page_id}">
<input type="hidden" name="case_id" value="${c.ds_id}">
Modified: trunk/waskaweb/templates/documents/case_new.mako
===================================================================
--- trunk/waskaweb/templates/documents/case_new.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/documents/case_new.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -22,7 +22,6 @@
<div id="document">
<div id="waska_form">
${h.form(h.url(controller="document", action='caseUploadAction'), multipart=True)}
-<div class="w100">
<label for="file">${_('doc_form_upload_label_file')}:</label><br>
${h.file_field('file')}<br>
${h.submit(_('doc_form_upload_submit'))}
Modified: trunk/waskaweb/templates/documents/case_overview.mako
===================================================================
--- trunk/waskaweb/templates/documents/case_overview.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/documents/case_overview.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -37,8 +37,8 @@
<tr>
<td>${ f.getName() | F.shorten, h}</td>
<td class="number_field">${kb(f.size)} KB</td>
- <td><a href="/document/caseShow/${f.id}/${f.getName() | F.H}" target="_blank">Anzeigen</a>
- <a href="/document/caseDelete/${f.id}/${myid}/0">Löschen</a>
+ <td><a href="/document/caseShow/${f.id}/${f.getName() | F.H}" target="_blank">${_('doc_overview_tbl_show')}</a>
+ <a href="/document/caseDelete/${f.id}/${myid}/0">${_('doc_overview_tbl_delete')}</a>
</td>
</tr>
% endfor
Modified: trunk/waskaweb/templates/documents/global_overview.mako
===================================================================
--- trunk/waskaweb/templates/documents/global_overview.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/documents/global_overview.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -15,7 +15,6 @@
<div class="actions">
<ul>
<li><a href="/document/globalUpload/">${self.buildIco()} ${_('doc_actions_link_new')}</a></li>
- </a>
</ul>
</div>
@@ -35,9 +34,9 @@
<tr>
<td>${ f.getName() | F.shorten, h}</td>
<td class="number_field">${kb(f.size)} KB</td>
- <td><a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">Anzeigen</a>
+ <td><a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${_('doc_overview_tbl_show')}</a>
% if h.hasRole(['admin_ka']):
- <a href="/document/globalDelete/${f.id}">Löschen</a>
+ <a href="/document/globalDelete/${f.id}">${_('doc_overview_tbl_delete')}</a>
% endif
</td>
</tr>
Modified: trunk/waskaweb/templates/documents/global_upload.mako
===================================================================
--- trunk/waskaweb/templates/documents/global_upload.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/documents/global_upload.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -19,10 +19,10 @@
<div id="document">
<div id="waska_form">
${h.form(h.url(controller="document", action='globalUploadAction'), multipart=True)}
-<div class="w100">
+
<label for="file">${_('doc_form_upload_label_file')}:</label><br>
${h.file_field('file')}<br>
${h.submit(_('doc_form_upload_submit'))}
${h.end_form()}
</div>
-</div>
+</div>
\ No newline at end of file
Modified: trunk/waskaweb/templates/login.mako
===================================================================
--- trunk/waskaweb/templates/login.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/login.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,26 +1,26 @@
## -*- coding: utf-8 -*-
<%inherit file="main_login.mako" />
-<h1>WASKA Anmeldung</h1>
+<h1>${_('login_header_waska_login')}</h1>
<div id="waska_form_login">
-<p>Geben Sie bitte Anmeldekennung und Passwort ein, um sich anzumelden.</p>
+<p>${_('login_p_insert_pw_and_identifier')}</p>
<form name="login" action="${h.url_for(controller='waska', action='loginAction')}" method="POST">
<div class="label">
- <label for="login">Anmeldekennung:</label>
+ <label for="login">${_('login_label_identifier')}</label>
</div>
<div class="input">
<input type="text" size="20" name="username">
</div>
-<div id="clearer"> </div>
+<div class="clearer"> </div>
<div class="label">
- <label for="pass">Passwort:</label>
+ <label for="pass">${_('login_label_pw')}</label>
</div>
<div class="input">
<input type="password" size="20" name="password">
</div>
-<div id="clearer"> </div>
+<div class="clearer"> </div>
<p id="login_btn">
<input type="submit" value="Anmelden" name="authform">
</p>
</form>
-</div>
\ No newline at end of file
+</div>
Modified: trunk/waskaweb/templates/logout.mako
===================================================================
--- trunk/waskaweb/templates/logout.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/logout.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="main_login.mako" />
-<h1>WASKA Abmeldung</h1>
+<h1>${_('logout_header_waska_logout')}</h1>
<div id="waska_form_login">
-<p>Sie haben sich erfolgreich abgemeldet. Klicken Sie auf <a href="/">anmelden</a> um sich erneut in WASKA anzumelden.</p>
+<p>${_('logout_p_logout successful')} <a href="/">${_('logout_a_login')}</a> ${_('logout_p_login_again')}.</p>
</div>
\ No newline at end of file
Modified: trunk/waskaweb/templates/main.mako
===================================================================
--- trunk/waskaweb/templates/main.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/main.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -2,7 +2,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>WASKA ${session.get('agency_name', "")}</title>
+ <title>WASKA</title>
<meta name="generator" content="vim">
<meta name="author" content="Torsten Irlaender">
<meta name="date" content="2007-08-07">
@@ -48,7 +48,7 @@
<div class="navigation">
${self.buildPrivacyfield()}
${next.buildNavigation()}
- <div id="content" class="right">
+ <div id="content" class="right">
${self.buildUeberschrift()}
${self.buildModusfield()}
${self.body()}
@@ -149,7 +149,7 @@
<%def name="buildFormErrors()">
% if len(c.form_errors) > 0:
<div class="form_errors">
- <h1><a name="error_list">Fehlerhafte Formulareingabe</a></h1>
+ <h1><a name="error_list">${_('main_formular_input_error')}</a></h1>
<%
# Please fill this dictionary in the templates if you want to substitute
# the formular identifier
@@ -170,6 +170,7 @@
</%def>
<%def name="buildFooter()">
+
<div id="footer">
${_('footer_title')} | ${_('footer_version')}
</div>
Modified: trunk/waskaweb/templates/main_login.mako
===================================================================
--- trunk/waskaweb/templates/main_login.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/main_login.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -2,7 +2,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
- <title>WASKA ${session.get('agency_name', "")}</title>
+ <title>WASKA</title>
<meta name="generator" content="vim">
<meta name="author" content="Torsten Irlaender">
<meta name="date" content="2007-08-07">
@@ -35,7 +35,7 @@
${self.body()}
</div>
<div id="footer_login">
- <p>Das Programm Kompetenzagenturen (Durchführungsphase) wird vom Bundesministerium für Familie, Senioren, Frauen und Jugend aus Mitteln des Europäischen Sozialfonds gefördert.</p>
+ <p>${_('main_login_bmf_phrase')}</p>
<a target="_blank" href="http://www.bmfsfj.de">
<img src="/images/BMFSFJ_C_M_web.jpg" alt="Logo Bundesministerium für Familie, Senioren, Frauen und Jugend" border="0">
</a>
@@ -56,7 +56,7 @@
%>
% if len(c.form_errors) > 0:
<div class="form_errors">
- <a name="error_list"><h1>Fehlerhafte Formulareingabe</h1></a>
+ <a name="error_list"><h1>${_('main_login_formular_input_error')}</h1></a>
<ul>
% for key, value in c.form_errors.iteritems():
<li>${_(formular_labels.get(key, '%s' % key))}: ${value}</li>
Modified: trunk/waskaweb/templates/start/responsible.mako
===================================================================
--- trunk/waskaweb/templates/start/responsible.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/start/responsible.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,91 +1,90 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
+<div>
+<h1>${_('responsible_info_sponsorship')}</h1>
+<div class="traeger">
+<div class="traeger_name">
+<h2>${_('responsible_project_sponsorship')}</h2>
+ <div class="traeger_name_text">
+ Deutsches Zentrum für Luft- undRaumfahrt e. V. (DLR)<br>
+ Projektträger im DLR, Bildungsforschung, Chancengleichheit Bonn
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.dlr.de/" target="_blank"><img class="" title="Logo Deutsches Luft- und Raumfahrtzentrum"
+ alt="Logo Deutsches Luft- und Raumfahrtzentrum" src="/images/logo_dlr.png" style="border:0">
+ </a>
+ </div>
+</div>
-<h1>Informationen zur Trägerschaft</h1>
-<p>
-<strong>
-Das Programm "Kompetenzagenturen" (Durchführungsphase) wird vom
-Bundesministerium für Familie, Senioren, Frauen und Jugend aus Mitteln des
-Europäischen Sozialfonds gefördert.<br>
-</strong>
-</p>
+<div class="traeger_contact">
+ <p>Besucheradresse</p>
+ <div class="traeger_contact_field">
+ <p>Heinrich-Konen-Str. 1,
+ 53227 Bonn</p>
+ </div>
+ <div class="traeger_contact_field">
+ <p>Tel.: +49 228 3821-600</p>
+ </div>
+ <div class="traeger_contact_field">
+ <p>E-Mail: <a href="mailto:kompetenzagenturen at dlr.de" target=
+ "_blank">kompetenzagenturen at dlr.de</a></p>
+ </div>
+</div>
-<table>
- <tr>
- <td style="border:0"><a href="http://www.bmfsfj.de/" target=
- "_blank"><img class="" title="Logo bmfsj" alt="Logo bmfsj"
- src="/images/BMFSFJ_C_M_web.jpg" border="0"
- height="64" hspace="0" width="207"></a></td>
+<div class="traeger_contact">
+ <p>Ansprechpartner</p>
+ <div class="traeger_contact_field">
+ <p>Dr. Astrid Fischer, Tel.: +49 228 3821-602</p>
+ </div>
+ <div class="traeger_contact_field">
+ <p>Frank Tönnissen, Tel.: +49 228 3821-603</p>
+ </div>
+</div>
- <td style="border:0"><a href=
- "http://ec.europa.eu/employment_social/esf2000/index_de.html"
- target="_blank"><img class="" title=
- "Logo europäische union - europäischer sozialfonds"
- alt=
- "Logo europäische union - europäischer sozialfonds"
- src="/images/eu_logo_4c_pos_web2.jpg" border=
- "0" height="50" hspace="0" width="240"></a></td>
- </tr>
-</table>
+</div>
-<p><strong>Besucheradresse:</strong><br>
-Heinrich-Konen-Str. 1<br>
-53227 Bonn<br>
-<br>
-Tel.: 0228 3821-600<br>
-E-Mail: <a href="mailto:kompetenzagenturen at dlr.de" target=
-"_blank">kompetenzagenturen at dlr.de</a></p>
+<div class="traeger">
+<div class="traeger_name">
+<h2>${_('responsible_realisation')}</h2>
+ <div class="traeger_name_text">
+ <p>Intevation GmbH, Osnabrück</p>
+ <p> Realisation und Programmierung der Webanwendung</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.dlr.de/" target="_blank">
+ <img src="/images/logo_intevation.png" alt="Logo Intevation" style="border:0">
+ </a>
+ </div>
-<h2>Kontakt</h2>
+<div class="traeger_contact">
+ <p>Ansprechpartner</p>
+ <div class="traeger_contact_field">
+ <p> Frank Koormann, Tel.: +49 541 33508-30</p>
+ </div>
+</div>
+</div>
+</div>
+<div class="traeger">
+<div class="traeger_name">
+<h2>Förderung</h2>
+ <div class="traeger_name_text">
+ <p>${_('main_login_bmf_phrase')}</p>
+ </div>
+ <div class="traeger_name_img">
+ <a href="http://www.bmfsfj.de/" target="_blank">
+ <img class="" title="Logo bmfsj" alt="Logo bmfsj"
+ src="/images/BMFSFJ_C_M_web.jpg" border="0" >
+ </a>
+ <a href="http://ec.europa.eu/employment_social/esf2000/index_de.html" target="_blank">
+ <img class="" title="Logo europäische union - europäischer sozialfonds"
+ alt="Logo europäische union - europäischer sozialfonds"
+ src="/images/eu_logo_4c_pos_web2.jpg" border="0" >
+ </a>
+ </div>
+</div>
+</div>
+</div>
-<table>
- <tr>
- <td style="border:0">
- <strong>
- <a href="#">Dr. Astrid Fischer</a>
- </strong><br>
- Deutsches Zentrum für Luft- und
- Raumfahrt e. V. (DLR)<br>
- Projektträger im
- DLR, Bildungsforschung, Chancengleichheit<br>
- Bonn<br>
- Tel.: +49 228 3821-602
- <br>
- </td>
- <td style="border:0" rowspan="2" valign="top">
- <img src="/images/logo_dlr.png" alt="Logo DLR">
- </td>
- </tr>
+<div class="clearer"></div>
- <tr>
- <td style="border:0">
- <strong>
- <a href="#">Frank Tönnissen</a>
- </strong><br>
- Deutsches Zentrum für Luft- und
- Raumfahrt e. V. (DLR)<br>
- Projektträger im
- DLR, Bildungsforschung, Chancengleichheit<br>
- Bonn<br>
- Tel.: +49 228 3821-603
- <br>
- </td>
- </tr>
-</table>
-<h2>Realisation</h2>
-<table>
- <tr>
- <td style="border:0">
- <strong>
- <a href="#">Intevation GmbH</a>
- </strong><br>
- Osnabrück<br>
- Realisation und Programmierung der Webanwendung<br>
- Kontakt: Frank Koormann (Tel.: +49 541 33508-30)
- <br>
- </td>
- <td style="border:0">
- <img src="/images/logo_intevation.png" alt="Logo Intevation">
- </td>
- </tr>
-</table>
+
Modified: trunk/waskaweb/templates/statement/dialogs/missing_statement.mako
===================================================================
--- trunk/waskaweb/templates/statement/dialogs/missing_statement.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/statement/dialogs/missing_statement.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -6,27 +6,21 @@
<li><a href="#">${_('cm_np_show')}</a></li>
</%def>
<div class="dialog" />
-<h1><img src="/images/alert.png"/>Fehlende Einverständniserklärung</h1>
-<p>Für die gewählte Fallakte liegt noch keine Einverständniserklärung
-seitens des Jugendlichen vor. Die Fallakte darf daher keine personenbezogenen
-Daten enthalten. Die entsprechende Einhaltung der gesetzlichen Bestimmungen liegt
-in Ihrer Verantwortung.</p>
+<h1><img src="/images/alert.png"/>${_('statement_dialog_header_statement_no')}</h1>
+<p>${_('statement_dialog_p_statement_no_explanation')}</p>
% if h.hasRole(['cm_ka']):
-<p>Sie haben nun folgende Möglichkeiten:
+<p>${_('statement_dialog_p_options')}
<ol>
-<li><strong>"Erklärung jetzt setzen"</strong>, wenn der Status zur Einverständniserklärung
-inzwischen geklärt wurde.</li>
-<li><strong>"Erklärung weiterhin unklar"</strong>, wenn die Einverständniserklärung noch
-eingeholt werden soll.</li>
+<li><strong>${_('statement_dialog_li_statement_set')}</strong>${_('statement_dialog_li_statement_set_explanation')}</li>
+<li><strong>${_('statement_dialog_li_statement_not_set')}</strong>${_('statement_dialog_li_statement_not_set_explanation')}</li>
</ol>
-</p>
<p>
-<a class="button" href="/statement/setPrivacyStatement/${c.ds_id}">Erklärung jetzt setzen</a>
-<a class="button" href="/case/select/${c.ds_id}/1">Erklärung weiterhin unklar</a>
+<a class="button" href="/statement/setPrivacyStatement/${c.ds_id}">${_('statement_dialog_a_statement_set')}</a>
+<a class="button" href="/case/select/${c.ds_id}/1">${_('statement_dialog_a_statement_not_set')}</a>
</p>
% else:
<p>
-<a class="button" href="/case/select/${c.ds_id}/1">OK</a>
+<a class="button" href="/case/select/${c.ds_id}/1">${_('statement_dialog_a_ok')}</a>
</p>
% endif
-</div>
+
Modified: trunk/waskaweb/templates/statement/edit.mako
===================================================================
--- trunk/waskaweb/templates/statement/edit.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/statement/edit.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -1,29 +1,30 @@
## -*- coding: utf-8 -*-
<%inherit file="../casemanagement/main.mako" />
-<h1>Einverständniserklärung</h1>
+<h1>${_('statement_edit_header_statement')}</h1>
<p>
-Für die gewählte Fallakte liegt aktuell noch keine Einverständniserklärung
-zur Erfassung, Verarbeitung und Nutzung personenbezogener Daten seitens des
-Jugendlichen vor.
+${_('statement_edit_p_no_statement')}
</p>
<br>
<p>
-Sie können in diesem Dialog bestätigen, dass die Einverständniserklärung nun
-vorliegt. Alternativ können Sie angeben, dass die Erklärung sicher nicht vom
-Jugendlichen abgegeben wird. In diesem Fall wird die gewählte Fallakte
-anonymisiert und ist nicht mehr bearbeitbar.
+${_('statement_edit_p_statement_decision')}
</p>
<br>
<p>
-Bitte beachten Sie, dass die Einverständniserklärung der schriftlichen Form
-bedarf. Dazu steht Ihnen eine <a href="/statement/printPrivacyStatement/${c.ds_id}" target="_blank">Druckversion dieser Erklärung</a> zur Verfügung.
+${_('statement_edit_p_statement_form')}<a href="/statement/printPrivacyStatement/${c.ds_id}" target="_blank">${_('statement_edit_a_statement_form_printversion')}</a> ${_('statement_edit_p_statement_form_end')}
</p>
<br>
<div class="waska_form">
-<form id="waska_form" action="/statement/setPrivacyStatementAction" accept-charset="UTF-8" name="waska_form" method="POST">
-<div class="waska_form_element" w100>
-<input type="radio" name="statement_signed" value="1"><label for="statement">Die Einwilligungserklärung liegt vor.</label></div>
-<input type="radio" name="statement_signed" value="0"><label for="statement">Die Einwilligungserklärung liegt nicht vor.</label></div>
-<input type="hidden" name="case_id" value="${c.ds_id}">
-<br>
-<input type="submit" value="Speichern" name="save">
+ <form id="waska_form" action="/statement/setPrivacyStatementAction" accept-charset="UTF-8" name="waska_form" method="POST">
+ <div class="waska_form_element">
+ <input type="radio" id="statement_signed" name="statement_signed" value="1">
+ <label for="statement_signed">${_('statement_label_statement_yes')}
+ </label>
+ </div>
+ <input type="radio" id="statement_not_signed" name="statement_signed" value="0">
+ <label for="statement_not_signed">${_('statement_label_statement_no')}
+ </label>
+ <input type="hidden" name="case_id" value="${c.ds_id}">
+ <br>
+ <input type="submit" value="Speichern" name="save">
+ </form>
+</div>
Modified: trunk/waskaweb/templates/usersettings/change_password.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/change_password.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/usersettings/change_password.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -16,8 +16,7 @@
${self.buildFormErrors()}
<div id="waska_form">
<form action="${h.url_for(controller="usersettings", action="changePasswordAction")}" method="POST">
- <fieldset><legend>${_('adm_form_legend_login')}</legend>
- <div class="waska_form_element w50">
+ <div class="waska_form_element w25">
<label
for="passwd">${_('adm_form_newuser_passwd')}</label><br>
% if c.form_errors.get('passwd'):
@@ -25,7 +24,7 @@
% endif
<input type="password" class="field" id="passwd" name="passwd">
</div>
- <div class="waska_form_element w50">
+ <div class="waska_form_element w75">
<label
for="passwd2">${_('adm_form_newuser_passwd_confirm')}</label><br>
% if c.form_errors.get('passwd2'):
@@ -33,7 +32,6 @@
% endif
<input type="password" class="field" id="passwd2" name="passwd2">
</div>
- </fieldset>
<input type="hidden" name="uid" value="${h.getUserId()}">
<input class="btn_space" type="submit" value="${_('adm_form_changepassword_submit')}">
</form>
Modified: trunk/waskaweb/templates/usersettings/change_password_login.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/change_password_login.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/usersettings/change_password_login.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -4,13 +4,13 @@
<div id="waska_form_login_pw">
<h1>${_('adm_header_changepassword_needed')}</h1>
${self.buildFormErrors()}
-<p>Sie müssen Ihr Passwort neu setzen. Dies kann folgende Ursachen haben:<p>
+<p>${_('usersettings_p_set_new_pw')}<p>
<ul>
- <li>Sie melden sich zum ersten Mal mit einem initialen Passwort auf dem System an.</li>
- <li>Sie haben über einen langen Zeitraum das selbe Passwort verwendet. Dies ist aus Gründen der Sicherheit nicht zulässig.</li>
- <li>Das Passwort wurde durch die Administration zurückgesetzt.</li>
+ <li>${_('usersettings_li_set_new_pw_first_login')}</li>
+ <li>${_('usersettings_li_set_new_pw_same_pw')}</li>
+ <li>${_('usersettings_li_set_new_pw_adm_pw_force')}</li>
</ul>
-<p>Bitte geben Sie nun das von Ihnen gewünschte Passwort ein.
+<p>${_('usersettings_p_insert_new_pw')}
</p>
<div id="waska_form_login">
<form action="${h.url_for(controller="usersettings", action="changePasswordOnLoginAction")}" method="POST">
Modified: trunk/waskaweb/templates/usersettings/edit_standin.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/edit_standin.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/usersettings/edit_standin.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -16,6 +16,7 @@
${self.buildFormErrors()}
<div id="waska_form">
<p>${_('usrset_explain_changestandin')}</p>
+<br>
<form action="${h.url_for(action="editStandinAction")}" method="POST">
<div class="waska_form_element w100">
<label
@@ -28,7 +29,11 @@
<option value="${u.id}">${u.first_name}, ${u.last_name}</option>
% endif
% endfor
- <option value="">Keine Vertretung</option>
+ % if c.uo.standin == -1:
+ <option value="-1" selected>Keine Vertretung</option>
+ % else:
+ <option value="-1">Keine Vertretung</option>
+ % endif
</select>
</div>
<input type="hidden" name="uid" value="${h.getUserId()}">
Modified: trunk/waskaweb/templates/usersettings/show_settings.mako
===================================================================
--- trunk/waskaweb/templates/usersettings/show_settings.mako 2008-08-13 13:02:53 UTC (rev 9)
+++ trunk/waskaweb/templates/usersettings/show_settings.mako 2008-08-13 13:03:16 UTC (rev 10)
@@ -9,13 +9,13 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="/usersettings/changePassword/${h.getUserId()}">${self.buildIco()} Passwort ändern</a></li>
+ <li><a href="/usersettings/changePassword/${h.getUserId()}">${self.buildIco()} ${_('usersettings_a_change_pw')}</a></li>
% if h.hasRole(['cm_ka']):
- <li><a href="/usersettings/editStandin/${h.getUserId()}">${self.buildIco()} Vertretung ändern</a></li>
+ <li><a href="/usersettings/editStandin/${h.getUserId()}">${self.buildIco()} ${_('usersettings_a_change_replace')}</a></li>
% endif
</ul>
</div>
</div>
</div>
-<p>Hier sehen sie eine Übersicht Ihrer persönlichen Daten.</p>
+<p>${_('usersettings_p_overview_personal_data')}</p>
<%include file="../administration/show_user_body.mako" />
More information about the Mpuls-commits
mailing list