[Mpuls-commits] r2817 - in base/trunk: . mpulsweb/config mpulsweb/controllers mpulsweb/lib mpulsweb/model mpulsweb/public/images/icons mpulsweb/public/images/svg mpulsweb/templates mpulsweb/templates/administration mpulsweb/templates/administration/dialogs mpulsweb/templates/annotations mpulsweb/templates/appointments mpulsweb/templates/auth mpulsweb/templates/casebundle mpulsweb/templates/casebundle/dialogs mpulsweb/templates/casemanagement mpulsweb/templates/casemanagement/dialogs mpulsweb/templates/dialogs mpulsweb/templates/documents mpulsweb/templates/documents/dialogs mpulsweb/templates/evaluation mpulsweb/templates/formularpage mpulsweb/templates/home mpulsweb/templates/logbook mpulsweb/templates/logbook/dialogs mpulsweb/templates/phase mpulsweb/templates/phase/dialogs mpulsweb/templates/privacy mpulsweb/templates/privacy/default mpulsweb/templates/privacy/dialogs mpulsweb/templates/repeatgroup/dialogs mpulsweb/templates/settings mpulsweb/templates/settings/dialogs mpulsweb/templates/tags mpulsweb/templates/usersettings mpulsweb.egg-info
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon May 31 12:01:47 CEST 2010
Author: torsten
Date: 2010-05-31 12:01:03 +0200 (Mon, 31 May 2010)
New Revision: 2817
Added:
base/trunk/mpulsweb/templates/administration/dialogs/failed_new_user.mako
Removed:
base/trunk/mpulsweb/public/images/icons/validity-0-22.png
base/trunk/mpulsweb/public/images/icons/validity-1-22.png
base/trunk/mpulsweb/public/images/icons/validity-2-22.png
base/trunk/mpulsweb/public/images/icons/validity-3-22.png
base/trunk/mpulsweb/public/images/icons/validity-4-22.png
base/trunk/mpulsweb/public/images/icons/validity-5-22.png
base/trunk/mpulsweb/public/images/svg/validity-1.svg
base/trunk/mpulsweb/public/images/svg/validity.svg
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb.egg-info/PKG-INFO
base/trunk/mpulsweb.egg-info/SOURCES.txt
base/trunk/mpulsweb.egg-info/requires.txt
base/trunk/mpulsweb.egg-info/top_level.txt
base/trunk/mpulsweb/config/environment.py
base/trunk/mpulsweb/config/importer.py
base/trunk/mpulsweb/config/middleware.py
base/trunk/mpulsweb/controllers/administration.py
base/trunk/mpulsweb/controllers/appointment.py
base/trunk/mpulsweb/controllers/case.py
base/trunk/mpulsweb/controllers/case_bundle.py
base/trunk/mpulsweb/controllers/caseappointment.py
base/trunk/mpulsweb/controllers/casedocument.py
base/trunk/mpulsweb/controllers/document.py
base/trunk/mpulsweb/controllers/evaluate.py
base/trunk/mpulsweb/controllers/logbook.py
base/trunk/mpulsweb/controllers/news.py
base/trunk/mpulsweb/controllers/privacy.py
base/trunk/mpulsweb/controllers/repeatgroup.py
base/trunk/mpulsweb/controllers/settings.py
base/trunk/mpulsweb/controllers/usersettings.py
base/trunk/mpulsweb/lib/app_globals.py
base/trunk/mpulsweb/lib/base.py
base/trunk/mpulsweb/lib/config.py
base/trunk/mpulsweb/lib/helpers.py
base/trunk/mpulsweb/lib/navigation.py
base/trunk/mpulsweb/lib/renderer.py
base/trunk/mpulsweb/lib/validators.py
base/trunk/mpulsweb/model/document.py
base/trunk/mpulsweb/model/phase.py
base/trunk/mpulsweb/model/user.py
base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
base/trunk/mpulsweb/templates/administration/edit_user.mako
base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
base/trunk/mpulsweb/templates/administration/new_user.mako
base/trunk/mpulsweb/templates/administration/new_user_result.mako
base/trunk/mpulsweb/templates/administration/new_usergroup.mako
base/trunk/mpulsweb/templates/administration/overview_user.mako
base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
base/trunk/mpulsweb/templates/administration/reset_password.mako
base/trunk/mpulsweb/templates/administration/show_user.mako
base/trunk/mpulsweb/templates/administration/show_usergroup.mako
base/trunk/mpulsweb/templates/annotations/main.mako
base/trunk/mpulsweb/templates/appointments/appointment_form.mako
base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
base/trunk/mpulsweb/templates/appointments/edit.mako
base/trunk/mpulsweb/templates/appointments/new.mako
base/trunk/mpulsweb/templates/appointments/overview.mako
base/trunk/mpulsweb/templates/appointments/show.mako
base/trunk/mpulsweb/templates/auth/logout.mako
base/trunk/mpulsweb/templates/auth/main.mako
base/trunk/mpulsweb/templates/base.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako
base/trunk/mpulsweb/templates/casebundle/editor.mako
base/trunk/mpulsweb/templates/casebundle/standin.mako
base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
base/trunk/mpulsweb/templates/casemanagement/appointments.mako
base/trunk/mpulsweb/templates/casemanagement/caselist.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako
base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
base/trunk/mpulsweb/templates/casemanagement/digest.mako
base/trunk/mpulsweb/templates/casemanagement/digest_body.mako
base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/main.mako
base/trunk/mpulsweb/templates/casemanagement/new.mako
base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
base/trunk/mpulsweb/templates/casemanagement/organisation.mako
base/trunk/mpulsweb/templates/casemanagement/overview.mako
base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
base/trunk/mpulsweb/templates/casemanagement/search.mako
base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
base/trunk/mpulsweb/templates/dialogs/confirm.mako
base/trunk/mpulsweb/templates/dialogs/failed.mako
base/trunk/mpulsweb/templates/dialogs/notification.mako
base/trunk/mpulsweb/templates/dialogs/success.mako
base/trunk/mpulsweb/templates/documents/case_new.mako
base/trunk/mpulsweb/templates/documents/case_overview.mako
base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako
base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako
base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako
base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako
base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako
base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako
base/trunk/mpulsweb/templates/documents/global_overview.mako
base/trunk/mpulsweb/templates/documents/global_upload.mako
base/trunk/mpulsweb/templates/evaluation/evaluate.mako
base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako
base/trunk/mpulsweb/templates/evaluation/result.mako
base/trunk/mpulsweb/templates/formularpage/formular.mako
base/trunk/mpulsweb/templates/home/caseappointmentlist.mako
base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
base/trunk/mpulsweb/templates/home/remindlist.mako
base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako
base/trunk/mpulsweb/templates/logbook/edit.mako
base/trunk/mpulsweb/templates/logbook/new.mako
base/trunk/mpulsweb/templates/logbook/overview.mako
base/trunk/mpulsweb/templates/logbook/overview_print.mako
base/trunk/mpulsweb/templates/logbook/show.mako
base/trunk/mpulsweb/templates/main.mako
base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
base/trunk/mpulsweb/templates/phase/phase.mako
base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html
base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako
base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako
base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako
base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako
base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
base/trunk/mpulsweb/templates/privacy/edit_statement.mako
base/trunk/mpulsweb/templates/privacy/list_statements.mako
base/trunk/mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako
base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako
base/trunk/mpulsweb/templates/settings/edit.mako
base/trunk/mpulsweb/templates/settings/show.mako
base/trunk/mpulsweb/templates/tags/tags.mako
base/trunk/mpulsweb/templates/usersettings/show_settings.mako
base/trunk/setup.py
Log:
Added tagging controller and templates to show tags for a case
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/ChangeLog 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,492 +1,3 @@
-2010-05-28 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/model/phase.py: Remove unused imports.
-
-2010-05-28 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/model/phase.py (Field.get_link): Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-28 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/model/phase.py (Field.get_link): Use the tag function
- to generate tags with attributes.
-
-2010-05-28 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/evaluate.py (get_phasesuccessors): New.
- Moved here from helpers.
-
- * mpulsweb/lib/helpers.py (get_phasesuccessors): Removed. It's
- now in controllers/evaluate.py
-
-2010-05-27 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/helpers.py (tag): Moved here from renderer because
- it's useful in other modules besides the renderer.
-
- * mpulsweb/lib/renderer.py (tag): Removed. It's now imported from
- helpers.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/usersettings.py
- (UsersettingsController.editStandinAction): Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/settings.py
- (SettingsController.editAction): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/repeatgroup.py
- (RepeatgroupController.delete): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/privacy.py (PrivacyController.decline): Use
- h.url_for consistently for all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/news.py (NewsController.hide): Use
- h.url_for consistently for all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/appointment.py: Add missing import.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/logbook/overview.mako: Correct some url_for
- calls.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/logbook.py (LogbookController.show)
- (LogbookController.newAction, LogbookController.edit)
- (LogbookController.editAction, LogbookController.delete): Use
- h.url_for consistently for all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/document.py
- (DocumentController.globalDelete): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/casemanagement/caselist.mako: Pass the
- confirmed flag to url_for with the correct name.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/case.py (CaseController.markForDelete)
- (CaseController.delete, CaseController.markForAnonymize)
- (CaseController._markForAnonymize, CaseController.anonymize)
- (CaseController.anonymize, CaseController.restore): Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/casedocument.py
- (CasedocumentController.delete): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/case_bundle.py
- (CaseBundleController._empty_caselist)
- (CaseBundleController.no_action)
- (CaseBundleController.markDelete, CaseBundleController.delete)
- (CaseBundleController.delete)
- (CaseBundleController.markAnonymize)
- (CaseBundleController.anonymize, CaseBundleController.restore)
- (CaseBundleController.set_editor)
- (CaseBundleController.set_standin): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/caseappointment.py
- (CaseappointmentController.delete): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/appointment.py
- (AppointmentController.createAction)
- (AppointmentController.editAction)
- (AppointmentController.delete): Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/controllers/administration.py
- (AdministrationController.editUserAction)
- (AdministrationController.resetUserPassword)
- (AdministrationController.deleteUser)
- (AdministrationController.deleteUserHelper)
- (AdministrationController.newUserGroupAction)
- (AdministrationController.editUserGroupAction)
- (AdministrationController.deleteUserGroup): Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-26 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/auth/logout.mako: Use h.url_for consistently
- for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/usersettings/show_settings.mako: Use
- h.url_for consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/tags/tags.mako: Use h.url_for consistently
- for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/settings/dialogs/success_edit.mako,
- mpulsweb/templates/settings/edit.mako,
- mpulsweb/templates/settings/show.mako: Use h.url_for consistently
- for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako:
- Use h.url_for consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/privacy/default/privacy_statement.html,
- mpulsweb/templates/privacy/dialogs/accept_success.mako,
- mpulsweb/templates/privacy/dialogs/confirm.mako,
- mpulsweb/templates/privacy/dialogs/decline_failed.mako,
- mpulsweb/templates/privacy/dialogs/decline_success.mako,
- mpulsweb/templates/privacy/dialogs/missing_statement.mako,
- mpulsweb/templates/privacy/dialogs/missing_statement_body.mako,
- mpulsweb/templates/privacy/edit_statement.mako,
- mpulsweb/templates/privacy/list_statements.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/phase/dialogs/success_set_phase.mako,
- mpulsweb/templates/phase/phase.mako: Use h.url_for consistently
- for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/main.mako: Use h.url_for consistently for
- all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako,
- mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako,
- mpulsweb/templates/logbook/edit.mako,
- mpulsweb/templates/logbook/new.mako,
- mpulsweb/templates/logbook/overview.mako,
- mpulsweb/templates/logbook/overview_print.mako,
- mpulsweb/templates/logbook/show.mako: Use h.url_for consistently
- for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/home/caseappointmentlist.mako,
- mpulsweb/templates/home/globalappointmentlist.mako,
- mpulsweb/templates/home/remindlist.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/formularpage/formular.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/evaluation/evaluate.mako,
- mpulsweb/templates/evaluation/evaluate_adele.mako,
- mpulsweb/templates/evaluation/result.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/documents/case_new.mako,
- mpulsweb/templates/documents/case_overview.mako,
- mpulsweb/templates/documents/dialogs/confirm.mako,
- mpulsweb/templates/documents/dialogs/delete_attachment_success.mako,
- mpulsweb/templates/documents/dialogs/delete_document_success.mako,
- mpulsweb/templates/documents/dialogs/failed_attachment.mako,
- mpulsweb/templates/documents/dialogs/failed_document.mako,
- mpulsweb/templates/documents/dialogs/success_attachment.mako,
- mpulsweb/templates/documents/dialogs/success_documents.mako,
- mpulsweb/templates/documents/global_overview.mako,
- mpulsweb/templates/documents/global_upload.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/dialogs/confirm.mako,
- mpulsweb/templates/dialogs/failed.mako,
- mpulsweb/templates/dialogs/notification.mako,
- mpulsweb/templates/dialogs/success.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/casemanagement/appointmentlist.mako,
- mpulsweb/templates/casemanagement/appointments.mako,
- mpulsweb/templates/casemanagement/caselist.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_export.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako,
- mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako,
- mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako,
- mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako,
- mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako,
- mpulsweb/templates/casemanagement/dialogs/success_delete.mako,
- mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako,
- mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako,
- mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako,
- mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako,
- mpulsweb/templates/casemanagement/dialogs/success_export.mako,
- mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako,
- mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako,
- mpulsweb/templates/casemanagement/dialogs/success_restore.mako,
- mpulsweb/templates/casemanagement/digest.mako,
- mpulsweb/templates/casemanagement/digest_body.mako,
- mpulsweb/templates/casemanagement/editAppointment.mako,
- mpulsweb/templates/casemanagement/main.mako,
- mpulsweb/templates/casemanagement/new.mako,
- mpulsweb/templates/casemanagement/newAppointment.mako,
- mpulsweb/templates/casemanagement/organisation.mako,
- mpulsweb/templates/casemanagement/overview.mako,
- mpulsweb/templates/casemanagement/reminderlist.mako,
- mpulsweb/templates/casemanagement/search.mako,
- mpulsweb/templates/casemanagement/showAppointment.mako: Use
- h.url_for consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako,
- mpulsweb/templates/casebundle/dialogs/error.mako,
- mpulsweb/templates/casebundle/dialogs/success_anonymize.mako,
- mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako,
- mpulsweb/templates/casebundle/dialogs/success_editor.mako,
- mpulsweb/templates/casebundle/dialogs/success_markdelete.mako,
- mpulsweb/templates/casebundle/dialogs/success_standin.mako,
- mpulsweb/templates/casebundle/editor.mako,
- mpulsweb/templates/casebundle/standin.mako: Use h.url_for
- consistently for all-intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/base.mako: Use h.url_for consistently for all
- intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/annotations/main.mako,
- mpulsweb/templates/appointments/appointment_form.mako,
- mpulsweb/templates/appointments/appointmentlist.mako,
- mpulsweb/templates/appointments/edit.mako,
- mpulsweb/templates/appointments/new.mako,
- mpulsweb/templates/appointments/overview.mako,
- mpulsweb/templates/appointments/show.mako,
- mpulsweb/templates/auth/main.mako: Use h.url_for consistently for
- all intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/administration/show_usergroup.mako,
- mpulsweb/templates/administration/show_user.mako,
- mpulsweb/templates/administration/reset_password.mako,
- mpulsweb/templates/administration/overview_usergroups.mako,
- mpulsweb/templates/administration/overview_user.mako,
- mpulsweb/templates/administration/new_usergroup.mako,
- mpulsweb/templates/administration/new_user_result.mako,
- mpulsweb/templates/administration/new_user.mako,
- mpulsweb/templates/administration/edit_usergroup.mako,
- mpulsweb/templates/administration/edit_user.mako,
- mpulsweb/templates/administration/dialogs/success_new_usergroup.mako,
- mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako,
- mpulsweb/templates/administration/dialogs/success_edit_user.mako,
- mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako,
- mpulsweb/templates/administration/dialogs/success_delete_user.mako,
- mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako,
- mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako,
- mpulsweb/templates/administration/dialogs/failed_delete_user.mako,
- mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako,
- mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako,
- mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako,
- mpulsweb/templates/administration/delete_user_helper.mako: Use
- h.url_for consistently for all intra application URLs.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- Generate URLs properly so that SCRIPT_NAME is taken into account:
-
- * mpulsweb/lib/renderer.py (icon): New function to help with icon
- URL generation.
- (ViewRenderer.render, ViewRenderer._renderAttributes)
- (ViewRenderer._renderRepeatList, ViewRenderer._renderRepeatNav)
- (ViewRenderer._renderInfo, RepeatGroupRenderer.render_digest)
- (RepeatGroupRenderer.render, ErrorRenderer.render)
- (ErrorRenderer.render_items): Generate URLs with the url_for and
- icon functions.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/renderer.py (RepeatGroupRenderer.render): Remove
- some debug prints.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- Generate URLs properly so that SCRIPT_NAME is taken into account:
-
- * mpulsweb/lib/navigation.py (SELECT_ITEM, SELECT_BRANCH)
- (CLOSE_BRANCH, OPEN_BRANCH): Removed.
- (select_item_url, select_branch_url, close_branch_url)
- (open_branch_url): New. Functions replacing the removed template
- strings.
- (FileCache.get_image): Convert image name to byte-string and pass
- it through url_for to get the correct image url.
- (TreeItem.render): Adapt to template->function change.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/model/user.py (log): Add logger.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/documents/case_overview.mako,
- mpulsweb/templates/documents/global_overview.mako: Avoid
- unnecessary html-escaping.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/model/document.py (Document.getName): Remove encoding
- parameter. No caller used anything but the default value anyway.
- Also, make non-ascii names actually work by using ensure_unicode
- to convert the name to unicode instead of unconditionally
- converting to byte-string first.
-
-2010-05-25 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/validators.py (FileExistsChecker.casedoc_sql)
- (FileExistsChecker.globaldoc_sql): Fix parameter markers so that
- the normal DB-API parameter substitution can be used.
- (FileExistsChecker.validate_python): Use the standard DB-API
- parameter substitution mechanism. This avoids SQL-injections.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/renderer.py (tag): Allow attribute names that
- contain minus signs by converting underscored to minus signs in
- attribute names. Fortunately there are no attribute names in HTML
- that use underscores.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/config/environment.py (load_environment): Add an
- explicit configuration option for the template module directory:
- mpuls.app.path.template_cache. If that option is not given use
- the previously used directory as fallback. The previously used
- directory is simply derived from cache_dir and is this directly
- tied to the beaker session directory. This is a problem if two
- applications have to share their session data but not their
- templates.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/config/environment.py (load_environment): Lookup
- settings in both app_conf and global_conf, instead of only in
- global_conf. This allows the settings to be in the application's
- section in the configuration file, not only in the DEFAULT
- section. This is necessary when running two MPuls applications in
- the same server.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/base.py (BaseController.__before__): redirect_to
- will also call url_for so it's actually wrong to pass the return
- value of url_for to redirect_to because it will be processed
- twice. The result is not always incorrect, but if e.g. the
- application is not mounted directly at "/" in the server so that
- SCRIPT_NAME is not empty, SCRIPT_NAME will be added twice to the
- url. Fix this by omitting the url_for call.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/config/importer.py (import_overridable_module): Only
- append mpuls.app.root to sys.path if it's not already in the path.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/config/middleware.py (SimpleExceptionLogger): New class
- for very simple an more robust exception logging.
- (make_app): Install SimpleExceptionLogger if the config option
- mpuls.app.simple-exception-handler is true. The more sophisticated
- pylons error handlers sometimes have problems with exceptions that
- contain non-ascii characters in which case exceptions raised from
- withing the error handler completely mask the original exception.
-
-2010-05-21 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/templates/administration/dialogs/failed_new_user.mako:
- Removed. Not used anymore.
-
-2010-05-20 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/renderer.py (tag): Minor documentation fixes.
-
-2010-05-20 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/renderer.py (ViewRenderer._renderRepeatList)
- (ViewRenderer._renderMatrix, ErrorRenderer.render_items): Use the
- tag function in more places when rendering HTML tags.
-
-2010-05-20 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/renderer.py (RepeatGroupRenderer.render_digest)
- (RepeatGroupRenderer.render): Rework these methods a little to
- avoid some problems that could occur if the rg_digests haven't
- been set properly. In particular the default values used for
- missing items were lists where dictionaries were expected by the
- code.
-
-2010-05-19 Bernhard Herzog <bh at intevation.de>
-
- * mpulsweb/lib/renderer.py: fix formatting.
-
-2010-05-17 Torsten Irländer <torsten.irlaender at intevation.de>
-
- * mpulsweb/lib/config.py: Disabled tagging on default (Work in
- progress)
- * mpulsweb/config/importer.py (import_overridable_module): Append root
- dir of the application configuration to the pythonpath
- * mpulsweb/lib/app_globals.py (Globals.__init__): Load tagging from
- base if there is no configuration specific tagging.
- * setup.py: Set version number an removed pyOpenSSL from requirements
-
2010-05-11 Torsten Irländer <torsten.irlaender at intevation.de>
Added tagging controller and templates to show tags for a case.
Modified: base/trunk/mpulsweb/config/environment.py
===================================================================
--- base/trunk/mpulsweb/config/environment.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/config/environment.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -42,20 +42,12 @@
def load_environment(global_conf, app_conf):
"""Configure the Pylons environment via the ``pylons.config`` object"""
- def get(item):
- """Lookup item in app_conf and global_conf. Return the first one found.
- If item is found in neither, None is returned.
- """
- if item in app_conf:
- return app_conf[item]
- return global_conf.get(item)
-
# Pylons paths
root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Templates
template_urls = []
- custom_templates = get('mpuls.app.path.templates')
+ custom_templates = global_conf.get('mpuls.app.path.templates')
if custom_templates:
log.info('Custom "template" directory: %s' % custom_templates)
template_urls.append(custom_templates)
@@ -63,16 +55,16 @@
# Static content (images, styles, formed...)
static_urls = []
- custom_static = get('mpuls.app.path.public')
+ custom_static = global_conf.get('mpuls.app.path.public')
if custom_static:
log.info('Custom "public" directory: %s' % custom_static)
- static_urls.append(get('mpuls.app.path.public'))
+ static_urls.append(global_conf.get('mpuls.app.path.public'))
static_urls.append(os.path.join(root, 'public'))
# Controllers
controller_url = os.path.join(root, 'controllers')
- if get('mpuls.app.path.controllers'):
- controller_url = get('mpuls.app.path.controllers')
+ if global_conf.get('mpuls.app.path.controllers'):
+ controller_url = global_conf.get('mpuls.app.path.controllers')
log.info('Custom "controller" directory: %s' % controller_url)
paths = dict(root=root,
@@ -89,13 +81,11 @@
config['pylons.h'] = mpulsweb.lib.helpers
# Create the Mako TemplateLookup, with the default auto-escaping
- module_directory = config.get('mpuls.app.path.template_cache',
- os.path.join(app_conf['cache_dir'],
- 'templates'))
config['pylons.g'].mako_lookup = \
TemplateLookup(directories=paths['templates'],
error_handler=handle_mako_error,
- module_directory=module_directory,
+ module_directory=os.path.join(app_conf['cache_dir'],
+ 'templates'),
input_encoding='utf-8', default_filters=['escape'],
imports=['from webhelpers.html import escape'])
Modified: base/trunk/mpulsweb/config/importer.py
===================================================================
--- base/trunk/mpulsweb/config/importer.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/config/importer.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,6 +1,5 @@
"""Functions to import modules from a specialization or the base"""
-import sys
import logging
from paste.util.import_string import try_import_module, import_module
@@ -24,12 +23,6 @@
it cannot be imported from either location, an exception will be
raised (most likely an ImportError).
"""
-
- # Append root dir of the application configuration to the pythonpath
- app_root = config.get('mpuls.app.root')
- if app_root not in sys.path:
- sys.path.append(app_root)
-
instance_module = config.get('mpuls.app.instance') + "." + modulename
module = try_import_module(instance_module)
if module is not None:
Modified: base/trunk/mpulsweb/config/middleware.py
===================================================================
--- base/trunk/mpulsweb/config/middleware.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/config/middleware.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -21,29 +21,6 @@
log = logging.getLogger(__name__)
-class SimpleExceptionLogger(object):
-
- """Simply log any exception raised while a request is handled.
-
- If an exception is raised during a request, the exception is logged
- with log.exception and reraised without any further processing.
- This can be used to make sure that the actual exception information
- is logged even if the more sophisticated error handlers of
- e.g. Pylons fail. For that use-case it has to be as near to the
- actual application in the application stack as possible.
- """
-
- def __init__(self, application):
- self.application = application
-
- def __call__(self, *args, **kw):
- try:
- return self.application(*args, **kw)
- except:
- log.exception("Exception while handling request")
- raise
-
-
class MyPylonsApp(PylonsApp):
def find_controller(self, controller):
@@ -107,18 +84,6 @@
# The Pylons WSGI app
app = MyPylonsApp()
- # Pylon's exception handler (at least the debug handler) sometimes
- # has problems with exceptions whose messages are byte-strings
- # containing non-ascii characters, which can happen when
- # e.g. psycopg2 is used in a German locale. To avoid loss of
- # information, we put the SimpleExceptionLogger immediately around
- # the pylons app.
- if config.get("mpuls.app.simple-exception-handler", False):
- log.debug("Using MPuls SimpleExceptionLogger")
- app = SimpleExceptionLogger(app)
- else:
- log.debug("Not using MPuls SimpleExceptionLogger")
-
# Routing/Session/Cache Middleware
app = RoutesMiddleware(app, config['routes.map'])
app = SessionMiddleware(app, config)
Modified: base/trunk/mpulsweb/controllers/administration.py
===================================================================
--- base/trunk/mpulsweb/controllers/administration.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/administration.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -8,7 +8,6 @@
from mpulsweb.lib.db import db
from mpulsweb.lib.base import BaseController, render, redirect_to
-from mpulsweb.lib.helpers import url_for
from mpulsweb.lib.security import checkRole, getDbName
from mpulsweb.lib.validators import ValidatorStateObject, NewUserGroupForm, \
EditUserGroupForm , NewUserForm, EditUserForm, DeleteUserHelperForm
@@ -148,8 +147,7 @@
c.uo.store()
c.dialog_title = EDIT_USER_SUCCESS_HEADER
c.dialog_text = EDIT_USER_SUCCESS_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUser')
+ c.url_ok = "/administration/overviewUser"
return render('/administration/dialogs/success_edit_user.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -170,10 +168,8 @@
c.dialog_text = "%s %s, %s" % (RESET_PASSWORD_CONFIRM_QUESTION,
c.uo.last_name, c.uo.first_name)
- c.url_yes = url_for(controller='/administration',
- action='resetUserPassword', id=id, confirmed=1)
- c.url_no = url_for(controller='/administration',
- action='showUser', id=id)
+ c.url_yes = "/administration/resetUserPassword/%s/1" % id
+ c.url_no = "/administration/showUser/%s" % id
return render('/administration/dialogs/confirm_resetpassword.mako')
# Old deleteUser method, which does not raise a helper dialog to transfer
@@ -190,8 +186,7 @@
# if uo.id == session.get('USER_AUTHORIZED').id:
# c.dialog_title = DELETE_SELFUSER_FAILURE
# c.dialog_text = DELETE_SELFUSER_FAILURE_TEXT
- # c.url_ok = url_for(controller='/administration',
- # action='overviewUser')
+ # c.url_ok = "/administration/overviewUser"
# return render('/administration/dialogs/failed_delete_user.mako')
# if confirmed:
@@ -200,15 +195,13 @@
# if user_has_cases(uo):
# c.dialog_title = DELETE_USER_HASCASES
# c.dialog_text = DELETE_USER_HASCASES_TEXT
- # c.url_ok = url_for(controller='/administration',
- # action='overviewUser')
+ # c.url_ok = "/administration/overviewUser"
# return render('/administration/dialogs/failed_delete_user.mako')
# else:
# uo.delete()
# c.dialog_title = DELETE_USER_SUCCESS_HEADER
# c.dialog_text = DELETE_USER_SUCCESS_TEXT
- # c.url_ok = url_for(controller='/administration',
- # action='overviewUser')
+ # c.url_ok = "/administration/overviewUser"
# return render('/administration/dialogs/success_delete_user.mako')
# else:
@@ -217,10 +210,8 @@
# c.dialog_text = DELETE_USER_CONFIRM_QUESTION % (uo.last_name,
# uo.first_name,
# uo.login)
- # c.url_yes = url_for(controller='/administration',
- # action='deleteUser', id=id, confirmed=1)
- # c.url_no = url_for(controller='/administration',
- # action='overviewUser')
+ # c.url_yes = "/administration/deleteUser/%s/1" % id
+ # c.url_no = "/administration/overviewUser/"
# return render('/administration/dialogs/confirm_deleteuser.mako')
@checkRole('admin')
@@ -232,8 +223,7 @@
if uo.id == session.get('USER_AUTHORIZED').id:
c.failed_for = DELETE_SELFUSER_FAILURE
c.failed_text = DELETE_SELFUSER_FAILURE_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUser')
+ c.url_ok = "/administration/overviewUser"
return render('/administration/dialogs/failed_delete_user.mako')
if confirmed:
@@ -259,8 +249,7 @@
uo.delete()
c.success_for = DELETE_USER_SUCCESS_HEADER
c.success_text = DELETE_USER_SUCCESS_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUser')
+ c.url_ok = "/administration/overviewUser"
return render('/administration/dialogs/success_delete_user.mako')
else:
@@ -269,10 +258,8 @@
c.question = DELETE_USER_CONFIRM_QUESTION % (uo.last_name,
uo.first_name,
uo.login)
- c.url_yes = url_for(controller='/administration',
- action='deleteUser', id=id, confirmed=1)
- c.url_no = url_for(controller='/administration',
- action='overviewUser')
+ c.url_yes = "/administration/deleteUser/%s/1" % id
+ c.url_no = "/administration/overviewUser/"
return render('/administration/dialogs/confirm_deleteuser.mako')
@checkRole('admin')
@@ -294,9 +281,8 @@
% del_user.id)
num = case_bundle.setEditor(form_result.get('editor'))
rest = all_cases.numDatasets() - case_bundle.numDatasets()
- c.url_ok = url_for(controller='/administration',
- action='deleteUser',
- id=form_result.get('user_id'), confirmed=1)
+ c.url_ok = ("/administration/deleteUser/%s/1"
+ % form_result.get('user_id'))
c.success_for = SETEDITOR_NOTIFICATION_SUCCESS_HEAD
if rest > 0:
c.success_for = SETEDITOR_NOTIFICATION_SUCCESS_REST_HEAD
@@ -342,8 +328,7 @@
c.ugo = factory.create(c.form_result.get('name'))
c.dialog_title = NEW_USERGROUP_SUCCESS_HEADER
c.dialog_text = NEW_USERGROUP_SUCCESS_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUserGroups')
+ c.url_ok = "/administration/overviewUserGroups"
return render('/administration/dialogs/success_new_usergroup.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -357,8 +342,7 @@
log.exception(e)
c.dialog_title = NEW_USERGROUP_FAILURE_HEADER
c.dialog_text = NEW_USERGOUP_FAILURE_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUserGroups')
+ c.url_ok = "/administration/overviewUserGroups"
return render('/administration/dialogs/failed_new_usergroup.mako')
@checkRole('admin_ka')
@@ -411,8 +395,7 @@
c.group = group
c.dialog_title = EDIT_USERGROUP_SUCCESS_HEADER
c.dialog_text = EDIT_USERGROUP_SUCCESS_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUserGroups')
+ c.url_ok = "/administration/overviewUserGroups"
return render('/administration/dialogs/success_edit_usergroup.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -435,25 +418,20 @@
ugo.delete()
c.dialog_title = DELETE_USERGROUP_SUCCESS_HEADER
c.dialog_text = DELETE_USERGROUP_SUCCESS_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUserGroups')
+ c.url_ok = "/administration/overviewUserGroups"
return render('/administration/dialogs/success_deletegroup_user.mako')
else:
c.context = "../main.mako"
c.dialog_title = DELETE_USERGROUP_CONFIRM
c.dialog_text = DELETE_USERGROUP_CONFIRM_QUESTION
- c.url_yes = url_for(controller='/administration',
- action='deleteUserGroup', id=ugo.id,
- confirmed=1)
- c.url_no = url_for(controller='/administration',
- action='overviewUserGroups')
+ c.url_yes = "/administration/deleteUserGroup/%s/1" % ugo.id
+ c.url_no = "/administration/overviewUserGroups/"
return render('/administration/dialogs/confirm_deleteusergroup.mako')
except Exception, e:
log.exception(e)
c.dialog_title = DELETE_USERGROUP_FAILED_HEADER
c.dialog_text = DELETE_USERGROUP_FAILED_TEXT
- c.url_ok = url_for(controller='/administration',
- action='overviewUserGroups')
+ c.url_ok = "/administration/overviewUserGroups"
return render('/administration/dialogs/failed_new_usergroup.mako')
Modified: base/trunk/mpulsweb/controllers/appointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/appointment.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/appointment.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -36,7 +36,7 @@
from pylons.i18n import _, ungettext
from mpulsweb.lib.base import BaseController, c, redirect_to, render, request
-from mpulsweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM
+from mpulsweb.lib.helpers import dd_mm_YYYY, HH_MM
from mpulsweb.lib.security import checkRole
from mpulsweb.model.appointment import GlobalAppointmentOverview, \
GlobalAppointmentFactory
@@ -97,7 +97,7 @@
appointment.store()
c.dialog_title = CREATE_APPOINT_NOTIFICATION_SUCCESS
c.dialog_text = CREATE_APPOINT_NOTIFICATION_TEXT_SUCCESS
- c.url_ok = url_for(controller='/appointment', action='overview')
+ c.url_ok = "/appointment/overview"
return render('/appointments/dialogs/success_create_appointment.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -149,7 +149,7 @@
appointment.store()
c.dialog_title = EDIT_APPOINT_NOTIFICATION_SUCCESS
c.dialog_text = EDIT_APPOINT_NOTIFICATION_TEXT_SUCCESS
- c.url_ok = url_for(controller='/appointment', action='overview')
+ c.url_ok = "/appointment/overview"
return render('/appointments/dialogs/success_edit_appointment.mako')
except formencode.Invalid, error:
c.form_result = error.value
@@ -170,15 +170,14 @@
appointment.delete()
c.dialog_title = DELETE_APPOINT_NOTIFICATION_SUCCESS
c.dialog_text = DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS
- c.url_ok = url_for(controller='/appointment', action='overview')
+ c.url_ok = "/appointment/overview"
return render('/appointments/dialogs/success_delete_appointment.mako')
else:
c.context = "../main.mako"
c.dialog_title = DELETE_APPOINT_CONFIRM
c.dialog_text = DELETE_APPOINT_CONFIRM_TEXT
- c.url_yes = url_for(controller='/appointment', action='delete',
- id=id, confirmed=1)
- c.url_no = url_for(controller='/appointment', action='overview')
+ c.url_yes = "/appointment/delete/%s/1" % id
+ c.url_no = "/appointment/overview/"
return render('/appointments/dialogs/confirm.mako')
@checkRole(('admin_ka', 'cm_ka', 'pt_dlr'))
Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/case.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -110,9 +110,8 @@
c.context = "../main.mako"
c.dialog_title = DELETE_CONFIRM
c.dialog_text = MARKDELETE_CONFIRM_TEXT
- c.url_yes = h.url_for(controller='/case', action='markForDelete',
- id=id, confirmed=1)
- c.url_no = h.url_for(controller='/case_overview')
+ c.url_yes = "/case/markForDelete/%s/1" % id
+ c.url_no = "/case_overview/"
return render('/casemanagement/dialogs/confirm.mako')
@checkRole('admin')
@@ -130,9 +129,8 @@
c.context = "../main.mako"
c.dialog_title = DELETE_CONFIRM
c.dialog_text = DELETE_CONFIRM_TEXT
- c.url_yes = h.url_for(controller='/case', action='delete',
- id=id, confirmed=1)
- c.url_no = h.url_for(controller='/case_overview')
+ c.url_yes = "/case/delete/%s/1" % id
+ c.url_no = "/case_overview/"
return render('/casemanagement/dialogs/confirm_delete.mako')
#
@@ -145,7 +143,7 @@
@checkRole('cm')
def markForAnonymize(self, id, confirmed):
- url = h.url_for(controller='/case', action='digest', id=id)
+ url = "/case/digest/%s" % id
return self._markForAnonymize(id, confirmed, url)
def _markForAnonymize(self, id, confirmed, url):
@@ -181,8 +179,7 @@
c.dialog_title = ANONYMIZE_CONFIRM
c.dialog_text = MARKANONYMIZE_CONFIRM_TEXT % phase
- c.url_yes = h.url_for(controller='/case', action='markForAnonymize',
- id=id, confirmed=1)
+ c.url_yes = "/case/markForAnonymize/%s/1" % id
c.url_no = url
return render('/casemanagement/dialogs/confirm_markanonymize.mako')
@@ -198,7 +195,7 @@
except ConsistenceCheckException, e:
c.dialog_title = MARKANONYMIZE_FAILED
c.dialog_text = h.literal(e.value)
- c.url_ok = h.url_for(controller='/case', action='digest', id=id)
+ c.url_ok = "/case/digest/%s" % id
return render('/casemanagement/dialogs/failed_markanonymize.mako')
# Ok, show confirmation dialog if the user really wants to anonymize the
@@ -213,9 +210,8 @@
c.context = "../main.mako"
c.dialog_title = ANONYMIZE_CONFIRM
c.dialog_text = ANONYMIZE_CONFIRM_TEXT
- c.url_yes = h.url_for(controller='/case', action='anonymize',
- id=id, confirmed=1)
- c.url_no = h.url_for(controller='/case', action='digest', id=id)
+ c.url_yes = "/case/anonymize/%s/1" % id
+ c.url_no = "/case/digest/%s" % id
return render('/casemanagement/dialogs/confirm_anonymize.mako')
#
@@ -237,9 +233,8 @@
c.context = "../main.mako"
c.dialog_title = RESTORE_CONFIRM
c.dialog_text = RESTORE_CONFIRM_TEXT
- c.url_yes = h.url_for(controller='/case', action='restore', id=id,
- confirmed=1)
- c.url_no = h.url_for(controller='/case_overview')
+ c.url_yes = "/case/restore/%s/1" % id
+ c.url_no = "/case_overview/"
return render('/casemanagement/dialogs/confirm_restore.mako')
#
Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/case_bundle.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -11,7 +11,6 @@
from formed.meta.data import PageNode
from mpulsweb.lib.base import c, render, request, session, BaseController
-from mpulsweb.lib.helpers import url_for
from mpulsweb.lib.security import checkRole
from mpulsweb.lib.validators import BundleActionForm, SetBundleEditorForm, \
SetBundleStandinForm, ExportSelectorValidator
@@ -249,7 +248,7 @@
return case_bundle
def _empty_caselist(self):
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
c.dialog_title = BUNDLE_NOTIFICATION_EMPTYLIST_HEADER
c.dialog_text = BUNDLE_NOTIFICATION_EMPTYLIST
return render('/casebundle/dialogs/error.mako')
@@ -260,7 +259,7 @@
def no_action(self):
c.dialog_title= BUNDLE_NOTIFICATION_NOACTION_HEADER
c.dialog_text = BUNDLE_NOTIFICATION_NOACTION
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
return render('/casebundle/dialogs/error.mako')
# DELETE
@@ -279,7 +278,7 @@
num) + " " + OK_TO_CONTINUE
c.dialog_title = MARKDELETE_SUCCESS_HEADER
c.dialog_text = MARKDELETE_SUCCESS_TEXT % str(num)
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render ('/casebundle/dialogs/success_markdelete.mako')
else:
@@ -293,9 +292,8 @@
c.dialog_title = DIALOG_CONFIRM_DELETE
c.dialog_text = (DIALOG_CONFIRM_EXPLAINATION
% "\n".join(self._buildCaseList(case_bundle)))
- c.url_yes = url_for(controller='/case_bundle', action='markDelete',
- confirmed=1)
- c.url_no = url_for(controller='/case_overview')
+ c.url_yes = "/case_bundle/markDelete/1"
+ c.url_no = "/case_overview/"
return render('/casemanagement/dialogs/confirm.mako')
@checkRole(('admin'))
@@ -315,7 +313,7 @@
c.dialog_title = DELETE_SUCCESS_HEADER
c.dialog_text = DELETE_SUCCESS_TEXT % str(num)
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render('/casebundle/dialogs/success_delete_admin.mako')
else:
@@ -328,9 +326,8 @@
c.dialog_title = DIALOG_CONFIRM_DELETE
c.dialog_text = (DIALOG_CONFIRM_EXPLAINATION
% "\n".join(self._buildCaseList(case_bundle)))
- c.url_yes = url_for(controller='/case_bundle', action='delete',
- confirmed=1)
- c.url_no = url_for(controller='/case_overview')
+ c.url_yes = "/case_bundle/delete/1"
+ c.url_no = "/case_overview/"
return render('/casemanagement/dialogs/confirm.mako')
# ANONYMIZE
@@ -351,7 +348,7 @@
c.success_for = MARKANONYMIZE_SUCCESS_HEADER
c.success_text = MARKANONYMIZE_SUCCESS_TEXT % str(num)
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render ('/casebundle/dialogs/success_anonymize.mako')
else:
@@ -371,9 +368,8 @@
c.dialog_title = DIALOG_CONFIRM_MARKANONYMIZE
c.dialog_text = (DIALOG_CONFIRM_MARKANONYMIZE_EXPLAINATION
% "\n".join(self._buildCaseList(case_bundle)))
- c.url_yes = url_for(controller='/case_bundle',
- action='markAnonymize', confirmed=1)
- c.url_no = url_for(controller='/case_overview')
+ c.url_yes = "/case_bundle/markAnonymize/1"
+ c.url_no = "/case_overview/"
return render('/casebundle/dialogs/confirm_anonymize.mako')
@checkRole(('admin'))
@@ -393,7 +389,7 @@
c.dialog_text = ANONYMIZE_SUCCESS_TEXT % str(num)
c.dialog_title = ANONYMIZE_SUCCESS_HEADER
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render ('/casebundle/dialogs/success_anonymize.mako')
else:
@@ -411,9 +407,8 @@
c.dialog_title = DIALOG_CONFIRM_ANONYMIZE
c.dialog_text = (DIALOG_CONFIRM_ANONYMIZE_EXPLAINATION
% "\n".join(self._buildCaseList(case_bundle)))
- c.url_yes = url_for(controller='/case_bundle', action='anonymize',
- confirmed=1)
- c.url_no = url_for(controller='/case_overview')
+ c.url_yes = "/case_bundle/anonymize/1"
+ c.url_no = "/case_overview/"
return render('/casebundle/dialogs/confirm_anonymize.mako')
# RESTORE
@@ -432,7 +427,7 @@
num) + " " + OK_TO_CONTINUE
c.dialog_title = RESTORE_SUCCESS_HEADER
c.dialog_text = RESTORE_SUCCESS_TEXT % str(num)
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render ('/casemanagement/dialogs/success_restore.mako')
else:
@@ -446,9 +441,8 @@
c.dialog_title = DIALOG_CONFIRM_RESTORE
c.dialog_text = (DIALOG_CONFIRM_RESTORE_EXPLAINATION
% "\n".join(self._buildCaseList(case_bundle)))
- c.url_yes = url_for(controller='/case_bundle', action='restore',
- confirmed=1)
- c.url_no = url_for(controller='/case_overview')
+ c.url_yes = "/case_bundle/restore/1"
+ c.url_no = "/case_overview/"
return render('/casemanagement/dialogs/confirm_restore.mako')
# ORGANISATION
@@ -467,7 +461,7 @@
num) + " " + OK_TO_CONTINUE
c.dialog_text= (TRANSFER_SUCCESS_TEXT
% (str(num), user.first_name, user.last_name))
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render('/casebundle/dialogs/success_editor.mako')
except formencode.Invalid, error:
@@ -488,7 +482,7 @@
u"%s cases were sucessfully assigend to a substitute.",
num) + " " + OK_TO_CONTINUE
c.dialog_text = STANDIN_SUCCESS_TEXT % str(num)
- c.url_ok = url_for(controller='/case_overview')
+ c.url_ok = "/case_overview"
del session['casebundle']
return render('/casebundle/dialogs/success_standin.mako')
except formencode.Invalid, error:
Modified: base/trunk/mpulsweb/controllers/caseappointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/caseappointment.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/caseappointment.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -182,18 +182,15 @@
appointment.delete()
c.success_for = DELETE_APPOINT_NOTIFICATION_SUCCESS
c.success_text = DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS
- c.url_ok = url_for(controller='/caseappointment', action='index',
- id=appointment.case_id)
+ c.url_ok = "/caseappointment/index/%s" % appointment.case_id
return render('/casemanagement/dialogs/'
'success_delete_appointment.mako')
else:
c.context = "../main.mako"
c.confirm_for = DELETE_APPOINT_CONFIRM
c.question = DELETE_APPOINT_CONFIRM_TEXT
- c.url_yes = url_for(controller='/caseappointment', action='delete',
- id=id, confirmed=1)
- c.url_no = url_for(controller='/caseappointment', action='index',
- id=appointment.case_id)
+ c.url_yes = "/caseappointment/delete/%s/1" % id
+ c.url_no = "/caseappointment/index/%s" % appointment.case_id
return render('/casemanagement/dialogs/'
'confirm_delete_appointment.mako')
Modified: base/trunk/mpulsweb/controllers/casedocument.py
===================================================================
--- base/trunk/mpulsweb/controllers/casedocument.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/casedocument.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -111,8 +111,7 @@
c.context = "../main.mako"
c.confirm_for = SET_ATTACHMENT_CONFIRM_DELETE_HEADER
c.question = SET_ATTACHMENT_CONFIRM_DELETE_TEXT
- c.url_yes = h.url_for(controller='/casedocument', action='delete',
- id=id, confirmed=1)
+ c.url_yes = "/casedocument/delete/%d/1" % (id)
c.url_no = h.url_for(controller="/casedocument", action="index",
id=session['case'].id)
return render('/casemanagement/dialogs/'
Modified: base/trunk/mpulsweb/controllers/document.py
===================================================================
--- base/trunk/mpulsweb/controllers/document.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/document.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -141,10 +141,8 @@
c.context = "../main.mako"
c.dialog_title = SET_DOCUMENT_CONFIRM_DELETE_HEADER
c.dialog_text = SET_DOCUMENT_CONFIRM_DELETE_TEXT
- c.url_yes = h.url_for(controller='/document',
- action='globalDelete', id=id, confirmed=1)
- c.url_no = h.url_for(controller='/document',
- action='globalOverview')
+ c.url_yes = "/document/globalDelete/%d/1" % id
+ c.url_no = "/document/globalOverview/"
return render('/documents/dialogs/confirm.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/evaluate.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -49,20 +49,6 @@
log.debug('sdate: %s, edate: %s' % (sdate, edate))
return sdate, edate
-
-def get_phasesuccessors(p):
- suc = []
- phaselist = PhaseFactory().build()
- for phase in phaselist:
- if p == phase.id:
- suc.append(phase.start.id)
- suc.append(phase.end.id)
- for ppid in phase.end.suc:
- pp = phaselist.get_phase(ppid)
- suc.extend(get_phasesuccessors(pp.phase))
- return suc
-
-
def get_search_options(soptions=None, id=None):
options = {}
options['id'] = id
Modified: base/trunk/mpulsweb/controllers/logbook.py
===================================================================
--- base/trunk/mpulsweb/controllers/logbook.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/logbook.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -34,7 +34,6 @@
from mpulsweb.lib.security import checkRole
from mpulsweb.model.logbook import Logbook, LogbookEntry, LogbookEntryChecker
-from mpulsweb.lib.helpers import url_for
from mpulsweb.lib.base import BaseController, c, render, request, session
from mpulsweb.lib.validators import CreateLogbookForm, EditLogbookForm
@@ -98,8 +97,7 @@
except Exception, e:
c.failed_for = LOGBOOK_ENTRY_SHOW_FAILED
c.failed_text = LOGBOOK_ENTRY_SHOW_FAILED_TEXT
- c.url_ok = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_ok = "/logbook/index/%s" % str(session['case'].id)
log.exception(e)
return render('/logbook/dialogs/failed_show_logbook_entry.mako')
@@ -156,8 +154,7 @@
logbook = Logbook(checker.getCaseId())
logbook.addEntry(checker.getLogbookEntry())
logbook.store(session['USER_AUTHORIZED'].id)
- c.url_ok = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_ok = "/logbook/index/%s" % str(session['case'].id)
c.success_for = CREATE_LOGBOOK_ENTRY_SUCCESS
c.success_text = CREATE_LOGBOOK_ENTRY_SUCCESS_TEXT
return render('/logbook/dialogs/success_create_logbook_entry.mako')
@@ -165,8 +162,7 @@
traceback.print_exc(file=sys.stderr)
c.failed_for = LOGBOOK_ENTRY_CREATE_FAILED
c.failed_text = LOGBOOK_ENTRY_CREATE_FAILED_TEXT
- c.url_ok = url_for(controller='/case', action='logbook',
- id=session['case'].id)
+ c.url_ok = "/case/logbook/%s" % str(session['case'].id)
return render('/logbook/dialogs/failed_create_logbook_entry.mako')
@checkRole('cm_ka')
@@ -194,8 +190,7 @@
log.exception(e)
c.failed_for = LOGBOOK_ENTRY_SHOW_FAILED
c.failed_text = LOGBOOK_ENTRY_SHOW_FAILED_TEXT
- c.url_ok = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_ok = "/logbook/index/%s" % str(session['case'].id)
return render('/logbook/dialogs/failed_show_logbook_entry.mako')
@checkRole('cm_ka')
@@ -228,15 +223,13 @@
entry.storeForUser(session['USER_AUTHORIZED'].id)
c.success_for = LOGBOOK_ENTRY_SAVE_SUCCESS
c.success_text = LOGBOOK_ENTRY_SAVE_SUCCESS_TEXT
- c.url_ok = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_ok = "/logbook/index/%s" % str(session['case'].id)
return render('/logbook/dialogs/success_save_logbook_entry.mako')
except Exception, e:
log.exception(e)
c.failed_for = LOGBOOK_ENTRY_SAVE_FAILED
c.failed_text = LOGBOOK_ENTRY_SAVE_FAILED_TEXT
- c.url_ok = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_ok = "/logbook/index/%s" % str(session['case'].id)
return render('/logbook/dialogs/failed_save_logbook_entry.mako')
@checkRole('cm_ka')
@@ -248,23 +241,19 @@
Logbook().deleteEntryById(int(id))
c.success_for = LOGBOOK_ENTRY_DELETE_SUCCESS
c.success_text = LOGBOOK_ENTRY_DELETE_SUCCESS_TEXT
- c.url_ok = url_for(controller='/case', action='logbook',
- id=session['case'].id)
+ c.url_ok = "/case/logbook/%s" % str(session['case'].id)
return render('/logbook/dialogs/success_delete_logbook_entry.mako')
except Exception, e:
log.exception(e)
c.failed_for = LOGBOOK_ENTRY_DELETE_FAILED
c.failed_text = LOGBOOK_ENTRY_DELETE_FAILED_TEXT
- c.url_ok = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_ok = "/logbook/index/%s" % str(session['case'].id)
return render('/logbook/dialogs/failed_delete_logbook_entry.mako')
else:
c.confirm_for = DELETE_LOGBOOK_ENTRY_CONFIRM
c.question = DELETE_LOGBOOK_ENTRY_CONFIRM_TEXT
- c.url_yes = url_for(controller='/logbook', action='delete', id=id,
- confirmed=1)
- c.url_no = url_for(controller='/logbook', action='index',
- id=session['case'].id)
+ c.url_yes = "/logbook/delete/%s/1" % id
+ c.url_no = "/logbook/index/%s" % session['case'].id
return render('/logbook/dialogs/confirm_delete_logbook_entry.mako')
@checkRole(('cm_ka'))
Modified: base/trunk/mpulsweb/controllers/news.py
===================================================================
--- base/trunk/mpulsweb/controllers/news.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/news.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -6,7 +6,6 @@
from pylons.controllers.util import redirect_to
from pylons.i18n import _, ungettext
-from mpulsweb.lib.helpers import url_for
from mpulsweb.lib.base import BaseController, render
from mpulsweb.model.user import UserObject
@@ -35,9 +34,8 @@
else:
c.dialog_title = MARK_NEWS_AS_READ_CONFIRM
c.dialog_text = MARK_NEWS_AS_READ_CONFIRM_TEXT
- c.url_yes = url_for(controller='/news', action='hide', id=id,
- confirmed=1)
- c.url_no = url_for("/")
+ c.url_yes = "/news/hide/%s/1" % id
+ c.url_no = "/"
return render('/news/dialogs/confirm_mark_news_as_read.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: base/trunk/mpulsweb/controllers/privacy.py
===================================================================
--- base/trunk/mpulsweb/controllers/privacy.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/privacy.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -138,8 +138,7 @@
errors.append(v.msg)
c.dialog_title = MARKANONYMIZE_FAILED
c.dialog_text = MARKANONYMIZE_FAILED_TEXT % "<br>".join(errors)
- c.url_ok = h.url_for(controller='/case', action='select',
- id=case.id, confirmed=1)
+ c.url_ok = h.url_for ('/case/select/%s/1' % case.id)
return render('/privacy/dialogs/decline_failed.mako')
else:
Modified: base/trunk/mpulsweb/controllers/repeatgroup.py
===================================================================
--- base/trunk/mpulsweb/controllers/repeatgroup.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/repeatgroup.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -64,10 +64,8 @@
else:
c.confirm_for = DELETE_RG_ENTRY_CONFIRM
c.question = DELETE_RG_ENTRY_CONFIRM_TEXT
- c.url_yes = h.url_for(controller='/repeatgroup', action='delete',
- id=id, confirmed=1)
- c.url_no = h.url_for(controller='/formularpage', action='select',
- id=session['case'].getPageId())
+ c.url_yes = "/repeatgroup/delete/%s/1" % id
+ c.url_no = "/formularpage/select/%s" % session['case'].getPageId()
return render('/repeatgroup/dialogs/confirm_delete_rg_entry.mako')
def new(self, id):
Modified: base/trunk/mpulsweb/controllers/settings.py
===================================================================
--- base/trunk/mpulsweb/controllers/settings.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/settings.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -5,7 +5,6 @@
from pylons import request, tmpl_context as c
from pylons.i18n import _
-from mpulsweb.lib.helpers import url_for
from mpulsweb.lib.base import BaseController, render
from mpulsweb.lib.validators import EditSettingsForm
from mpulsweb.lib.security import checkRole
@@ -52,7 +51,7 @@
c.agency.store(c.form_result)
c.dialog_title = EDIT_AGENCY_SUCCESS_HEADER
c.dialog_text = EDIT_AGENCY_SUCCESS_TEXT
- c.url_ok = url_for(controller='/settings')
+ c.url_ok = "/settings"
return render ('/settings/dialogs/success_edit.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: base/trunk/mpulsweb/controllers/usersettings.py
===================================================================
--- base/trunk/mpulsweb/controllers/usersettings.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/controllers/usersettings.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -166,8 +166,7 @@
c.dialog_title = EDIT_STANDIN_SUCCESS_HEADER
c.dialog_text = EDIT_STANDIN_SUCCESS_TEXT
uid = c.form_result.get('uid')
- c.url_ok = h.url_for(controller='/usersettings', action='showSettings',
- id=uid)
+ c.url_ok = "/usersettings/showSettings/%s" % (uid)
return render ('/usersettings/dialogs/success_edit_standin.mako')
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:
Modified: base/trunk/mpulsweb/lib/app_globals.py
===================================================================
--- base/trunk/mpulsweb/lib/app_globals.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/app_globals.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -65,9 +65,6 @@
if not os.path.isabs(mapping_file):
root = config.get('pylons.paths').get('root')
mapping_file = os.path.join(root, '..', mapping_file)
- if not os.path.isabs(tagging_file):
- root = config.get('pylons.paths').get('root')
- tagging_file = os.path.join(root, '..', tagging_file)
self.config_path = os.path.dirname(config_file)
self.mpuls_config = MpulsAppConfig(config_file)
Modified: base/trunk/mpulsweb/lib/base.py
===================================================================
--- base/trunk/mpulsweb/lib/base.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/base.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -179,7 +179,7 @@
except KeyError:
p = str(request.path_info)
if not p in ('/auth/login', '/auth/loginAction'):
- redirect_to(controller='/auth', action='login')
+ redirect_to(h.url_for(controller='/auth', action='login'))
def __call__(self, environ, start_response):
"""Invoke the Controller"""
Modified: base/trunk/mpulsweb/lib/config.py
===================================================================
--- base/trunk/mpulsweb/lib/config.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/config.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -145,7 +145,7 @@
set('case-module', 'privacy', '1')
set('case-module', 'documents', '1')
set('case-module', 'logbook', '1')
- set('case-module', 'tags', '0')
+ set('case-module', 'tags', '1')
set('case-module', 'checktags', '0')
# CASE FIELDS
Modified: base/trunk/mpulsweb/lib/helpers.py
===================================================================
--- base/trunk/mpulsweb/lib/helpers.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/helpers.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -34,7 +34,6 @@
import re
import datetime
from string import printable
-from xml.sax.saxutils import quoteattr
from pylons import c, cache, config, g, request, response, session, url
from pylons.i18n import _
@@ -51,6 +50,7 @@
from mpulsweb.lib.navigation import get_pagename, render_navigation
from mpulsweb.lib.helper.filters import shorten, nl_to_br, NA
+from mpulsweb.model.phase import PhaseFactory
PRINTABLE = frozenset(printable)
@@ -68,68 +68,7 @@
return s
return unicode(str(s), 'utf-8')
-# html helper
-def tag(tagname, _close=False,
- _booleans=('checked', 'disabled', 'multiple', 'selected'), **attrs):
- """Create an opening HTML tag with properly escaped attributes.
- The tagname parameter gives the name of the tag. The attributes and
- their values are given as keyword parameters. Most attributes have
- string values. Boolean attributes are treated as described below.
- The values of string attributes are converted to strings if they are
- not aleady strings (byte-strings or unicode) using these rules: None
- is converted to the empty string, other values are converted using
- the str function. After conversion the values of string attributes
- will be properly escaped as attribute values when inserted into the
- tag.
-
- Boolean flags are treated differently: if the value of such an
- attribute is true, the attribute is included in the tag without a
- value, if the value is false, the attribute is omitted. The boolean
- attributes handled in this way are given by the _booleans parameter,
- which is a sequence of attribute names. Its default value is
- ('checked', 'disabled', 'multiple', 'selected')
-
- To allow for attribute names that are also python keywords, a single
- trailing underscore character is removed from an attribute name if
- it is preset, so that e.g. the class attribute can be specified
- using the class_ keyword parameters.
-
- A few attribute names are not valid Python identifiers because they
- contain a minus-sign (e.g. accept-charset). However, since there
- are no attribute names that contain underscores, underscores in a
- keyword argument will be converted to minus-signs to determine the
- attribute name. For instance the accept-charset attribute can be
- given as accept_charset to this function.
-
- Examples:
- >>> from mpulsweb.lib.renderer import tag
- >>> tag("input", type="text", name="title", disabled=False)
- '<input type="text" name="title">'
- >>>
- """
- out = ["<%s" % tagname]
- for name, value in attrs.items():
- if name.endswith("_"):
- name = name[:-1]
- name = name.replace("_", "-")
- if name in _booleans:
- if value:
- out.append(' %s="%s"' % (name, name))
- else:
- if value is None:
- value = ""
- elif not isinstance(value, basestring):
- value = str(value)
- out.append(" %s=%s" % (name, quoteattr(value)))
- if _close:
- out.append(">")
- else:
- out.append(">")
- return "".join(out)
-
-
-
# Helper functions used in the UI to show some information like status messages
# or icons
@@ -327,4 +266,23 @@
return empty
return dd_mm_YYYY(d) + " " + HH_MM(d)
+# Phases helpers. Used in evaluation
+
+# TODO: The functions are currently only used in lib.evaluation and are
+# basically a copy of those functions in model/phase_transition.py with the
+# difference that these function load phases from g.mpuls. The longterm
+# solution would be to transfer phase functionality into the libformed. So
+# these functions should be moved away from this place
+
+def get_phasesuccessors(p):
+ suc = []
+ phaselist = PhaseFactory().build()
+ for phase in phaselist:
+ if p == phase.id:
+ suc.append(phase.start.id)
+ suc.append(phase.end.id)
+ for ppid in phase.end.suc:
+ pp = phaselist.get_phase(ppid)
+ suc.extend(get_phasesuccessors(pp.phase))
+ return suc
# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
Modified: base/trunk/mpulsweb/lib/navigation.py
===================================================================
--- base/trunk/mpulsweb/lib/navigation.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/navigation.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -40,32 +40,18 @@
from formed.instance.backends.postgres import DBFactory as InstanceFactory
from mpulsweb.lib.db import PostgresDBInterface
-import mpulsweb.lib.helpers
+SELECT_ITEM = u"/formularpage/select/%s"
+SELECT_BRANCH = u"/navigation/select_branch/%s"
+CLOSE_BRANCH = u"/navigation/close_branch/%s"
+OPEN_BRANCH = u"/navigation/open_branch/%s"
-log = logging.getLogger(__name__)
+CHECK_MODIFICATION = u'onclick="return checkModification();"'
-def select_item_url(id):
- return mpulsweb.lib.helpers.url_for(controller="/formularpage",
- action="select", id=id)
+log = logging.getLogger(__name__)
-def select_branch_url(id):
- return mpulsweb.lib.helpers.url_for(controller="/navigation",
- action="select_branch", id=id)
-def close_branch_url(id):
- return mpulsweb.lib.helpers.url_for(controller="/navigation",
- action="close_branch", id=id)
-
-def open_branch_url(id):
- return mpulsweb.lib.helpers.url_for(controller="/navigation",
- action="open_branch", id=id)
-
-
-CHECK_MODIFICATION = u'onclick="return checkModification();"'
-
-
def get_navigation(id, openfolders=None):
factory = InstanceFactory(g.formedTree, PostgresDBInterface())
instance_tree = factory.loadInstanceTreeByIdentifier(id,
@@ -109,10 +95,7 @@
self.cache = {}
def get_image(self, name, attributes=""):
- if isinstance(name, unicode):
- name = name.encode("utf-8")
- return '<img src="%s" %s>' % (mpulsweb.lib.helpers.url_for(name),
- attributes)
+ return '<img src="%s" %s>' % (name, attributes)
def get_base(self):
return self.base
@@ -176,7 +159,7 @@
icon = []
entry = []
if self.is_child():
- select_link = select_item_url(self.key)
+ select_link = SELECT_ITEM % self.key
icon.append(u'<a href="%s" %s>'
% (select_link, CHECK_MODIFICATION))
icon.append(get_image("/images/icons/navigation/entry.png",
@@ -186,9 +169,9 @@
% (_('entry'), _('Open page'))))
else:
deepest = self.deepest_item()
- select_link = select_branch_url(deepest.key)
+ select_link = SELECT_BRANCH % deepest.key
if self.is_open:
- action = close_branch_url(self.key)
+ action = CLOSE_BRANCH % self.key
icon.append(u'<a href="%s" %s>' % (action, CHECK_MODIFICATION))
icon.append(get_image("/images/icons/navigation/folder_open.png",
u' border="0"'
@@ -196,7 +179,7 @@
u' title="%s"'
% (_('entry'), _('Open page'))))
else:
- action = open_branch_url(self.key)
+ action = OPEN_BRANCH % self.key
icon.append(u'<a href="%s" %s>' % (action, CHECK_MODIFICATION))
icon.append(get_image("/images/icons/navigation/folder_closed.png",
u' border="0"'
Modified: base/trunk/mpulsweb/lib/renderer.py
===================================================================
--- base/trunk/mpulsweb/lib/renderer.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/renderer.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -30,6 +30,7 @@
import re
from cgi import escape
+from xml.sax.saxutils import quoteattr
import logging
from pylons.i18n import _
@@ -40,7 +41,7 @@
from formed.instance.backends.common import RuleEvalContext
from mpulsweb.lib.helper.filters import NA
-from mpulsweb.lib.helpers import tag, url_for, dd_mm_YYYY as format_date
+from mpulsweb.lib.helpers import dd_mm_YYYY as format_date
log = logging.getLogger(__name__)
@@ -72,6 +73,57 @@
return depth
+def tag(tagname, _close=False,
+ _booleans=('checked', 'disabled', 'multiple', 'selected'), **attrs):
+ """Create an opening HTML tag with properly escaped attributes.
+
+ The tagname parameter gives the name of the tag. The attributes and
+ their values are given as keyword parameters. Most attributes have
+ string values. Boolean attributes are treated as described below.
+ The values of string attributes are converted to strings if they are
+ not aleady strings (byte-strings or unicode) using these rules: None
+ is converted to the empty string, other values are converted using
+ the str function. After value of string attributes will be properly
+ escaped as attribute values when inserted into the tag.
+
+ Boolean flags are treated differently: if the value of such an
+ attribute is true, the attribute is included in the tag without a
+ value, if the value is false, the attribute is omitted. The boolean
+ attributes handled in this way are given by the _booleans parameter,
+ which is a sequence of attribute names. Its default value is
+ ('checked', 'disabled', 'selected')
+
+ To allow for attribute names that are also python keywords, a single
+ trailing underscore character is removed from an attribute name if
+ it is preset, so that e.g. the class attribute can be specified
+ using the class_ keyword parameters.
+
+ Examples:
+ >>> from mpulsweb.lib.renderer import tag
+ >>> tag("input", type="text", name="title", disabled=False)
+ '<input type="text" name="title">'
+ >>>
+ """
+ out = ["<%s" % tagname]
+ for name, value in attrs.items():
+ if name.endswith("_"):
+ name = name[:-1]
+ if name in _booleans:
+ if value:
+ out.append(' %s="%s"' % (name, name))
+ else:
+ if value is None:
+ value = ""
+ elif not isinstance(value, basestring):
+ value = str(value)
+ out.append(" %s=%s" % (name, quoteattr(value)))
+ if _close:
+ out.append(">")
+ else:
+ out.append(">")
+ return "".join(out)
+
+
def hidden_bool_tag(id):
"""Return the hidden HTML input tag for the plain boolean field given by id.
@@ -104,11 +156,6 @@
form_result[fieldid] = ""
-def icon(name):
- """Return the url for the icon given by name."""
- return url_for("/images/icons/" + name)
-
-
class Text:
def __init__(self, txt):
@@ -183,22 +230,24 @@
def render(self, showNext=False):
out = []
if not self.ro_mode:
- out.append(tag("form", id="formularpage",
- action=url_for(controller="formularpage",
- action="save"),
- accept_charset="UTF-8",
- method="POST"))
+ out.append('<form id="formularpage"'
+ ' action="/formularpage/save"'
+ ' accept-charset="UTF-8" method="POST">\n')
# Add submitbutton at the top of the page too
out.append('<div class="widget formbuttons">')
- out.append(tag("input", type="submit", name="save",
- class_="submit_button", value=_('Save'),
- tabindex=self.next_tabindex()))
+ out.append(tag("input",type="submit",
+ name="save",
+ class_="submit_button",
+ value=_('Save'),
+ tabindex=self.next_tabindex()))
if showNext:
out.append(" ")
- out.append(tag("input", type="submit", name="savenext",
- class_="submit_button",
- value=_('Save and proceed'),
- tabindex=self.next_tabindex()))
+ out.append(tag("input",
+ type="submit",
+ name="savenext",
+ class_="submit_button",
+ value=_('Save and proceed'),
+ tabindex=self.next_tabindex()))
out.append('</div>')
out.append('<div>')
#out.append('<div class="widget formfields">')
@@ -214,15 +263,20 @@
out.append('</div>')
if not self.ro_mode:
out.append('<div class="widget formbuttons">')
- out.append(tag("input", type="submit", class_="submit_button",
- name="save", value=_('Save'),
+ out.append(tag("input",
+ type="submit",
+ class_="submit_button",
+ name="save",
+ value=_('Save'),
tabindex=self.next_tabindex()))
if showNext:
out.append(" ")
- out.append(tag("input", type="submit", name="savenext",
- class_="submit_button",
- value=_('Save and proceed'),
- tabindex=self.next_tabindex()))
+ out.append(tag("input",
+ type="submit",
+ name="savenext",
+ class_="submit_button",
+ value=_('Save and proceed'),
+ tabindex=self.next_tabindex()))
out.append('</div>')
out.append('</form>\n')
@@ -254,7 +308,7 @@
meta = self._getMeta(node)
out = []
warning = node.getIdentifier() in self.warnings and "warning" or ""
- error = node.hasErrors() and "error" or ""
+ error = node.hasErrors() and "error" or ""
if labeltag:
out.append(tag("label", for_=node.getIdentifier()))
out.append(tag("a", class_=error or warning,
@@ -272,25 +326,25 @@
out = []
if meta.hasHelp():
- out.append(tag("a", target="_blank",
- href=url_for(controller="annotations",
- action="help", id=meta.getName())))
- out.append(tag("img", src=icon("formular/help.png"), alt="help"))
+ out.append(tag("a", href="/annotations/help/%s" % meta.getName(),
+ target="_blank"))
+ out.append('<img src="/images/icons/formular/help.png" alt="help">')
out.append('</a>')
if is_required(meta.getFlags()):
- out.append(tag("a", target="_blank",
- href=url_for(controller="annotations",
- action="required", id=meta.getName())))
- out.append(tag("img", src=icon("formular/required.png"),
- width="12", height="12", alt="required"))
+ out.append(tag("a",
+ href="/annotations/required/%s" % meta.getName(),
+ target="_blank"))
+ out.append('<img src="/images/icons/formular/required.png"'
+ ' width="12"'
+ ' height="12"'
+ ' alt="required">')
out.append('</a>')
if is_evaluation_relevant(meta.getFlags()):
- out.append(tag("a", target="_blank",
- href=url_for(controller="annotations",
- action="evaluation",
- id=meta.getName())))
- out.append(tag("img", src=icon("formular/evaluation.png"),
- alt="evaluation"))
+ out.append(tag("a",
+ href="/annotations/evaluation/%s" % meta.getName(),
+ target="_blank"))
+ out.append('<img src="/images/icons/formular/evaluation.png"'
+ ' alt="evaluation">')
out.append('</a>')
return "".join(out)
@@ -307,10 +361,11 @@
spanClass = 'error'
out.append('<span class="%s">' % spanClass)
- out.append(tag("form:%s" % spanClass, name=node.getIdentifier(),
- format=''))
+ out.append(tag("form:%s" % spanClass,
+ name = node.getIdentifier(),
+ format = ''))
out.append('</span>')
-
+
return "".join(out)
def _checkWarnings(self, node):
@@ -387,10 +442,14 @@
out.append('</td>')
out.append('<td class="vcontrol" width="15">')
if not self.ro_mode:
- out.append(tag("input", name="del_rg", type="image",
- src=icon("delete_active_16.png"),
- value=child.getIdentifier(),
- alt=_('Delete RG'), title=_('Delete RG')))
+ out.append('''<input name="del_rg"
+ type="image"
+ src="/images/icons/delete_active_16.png"
+ value="%s"
+ alt="%s"
+ title="%s">''' % (child.getIdentifier(),
+ _('Delete RG'),
+ _('Delete RG')))
out.append('</td>')
out.append('</tr>')
if self.ro_mode:
@@ -400,9 +459,14 @@
out.append('<tr>')
out.append('<td class="hcontrol" style="text-align: right;"'
' colspan="2">')
- out.append(tag("input", width="16", name="add_rg", type="image",
- src=icon("new_16.png"), value=node.getIdentifier(),
- alt=_('Add new RG'), title=_('Add new RG')))
+ out.append('''<input width="16"
+ name="add_rg"
+ type="image" src="/images/icons/new_16.png"
+ value="%s"
+ alt="%s"
+ title="%s">''' % (node.getIdentifier(),
+ _('Add new RG'),
+ _('Add new RG')))
out.append("</td>")
out.append("</tr>")
return out
@@ -422,42 +486,36 @@
out.append('<td class="hcontrol">')
out.append(tag("a", name=_('Select first'),
- href=url_for(controller="repeatgroup",
- action="select_first", id=child_id)))
- out.append(tag("img", src=icon("go_first_16.png")))
+ href="/repeatgroup/select_first/%s" % child_id))
+ out.append('<img src="/images/icons/go_first_16.png"/>')
out.append('</a>')
out.append(tag("a", name=_('Select previous'),
- href=url_for(controller="repeatgroup",
- action="select_prev", id=child_id)))
- out.append(tag("img", src=icon("go_previous_16.png")))
+ href="/repeatgroup/select_prev/%s" % child_id))
+ out.append('<img src="/images/icons/go_previous_16.png"/>')
out.append('</a>')
out.append(tag("a", name=_('Select next'),
- href=url_for(controller="repeatgroup",
- action="select_next", id=child_id)))
- out.append(tag("img", src=icon("go_next_16.png")))
+ href="/repeatgroup/select_next/%s" % child_id))
+ out.append('<img src="/images/icons/go_next_16.png"/>')
out.append('</a>')
out.append(tag("a", name=_('Select last'),
- href=url_for(controller="repeatgroup",
- action="select_last", id=child_id)))
- out.append(tag("img", src=icon("go_last_16.png")))
+ href="/repeatgroup/select_last/%s" % child_id))
+ out.append('<img src="/images/icons/go_last_16.png"/>')
out.append('</a>')
out.append(' | ?/? | ')
if not self.ro_mode:
out.append(tag("a", name=_('Create new'),
- href=url_for(controller="repeatgroup", action="new",
- id=child_id)))
- out.append(tag("img", src=icon("formular/rg_new.png")))
+ href="/repeatgroup/new/%s" % child_id))
+ out.append('<img src="/images/icons/formular/rg_new.png"/>')
out.append('</a>')
out.append(tag("a", name=_('Delete'),
- href=url_for(controller="repeatgroup",
- action="delete", id=child_id)))
- out.append(tag("img", src=icon("formular/rg_delete.png")))
+ href="/repeatgroup/delete/%s" % child_id))
+ out.append('<img src="/images/icons/formular/rg_delete.png"/>')
out.append('</a>')
out.append('</td>')
@@ -489,15 +547,15 @@
depth = 1 #visibleDepth(node)
if text:
out.append('<p class="text">')
- out.append(tag("img", src=icon("formular/info.png")))
+ out.append('<img src="/images/icons/formular/info.png"> ')
out.append(escape(text))
out.append('</p>')
self.toTarget(Item("".join(out)), meta.getTarget())
def _renderText(self, node):
meta = self._getMeta(node)
- out = []
- id = node.getIdentifier()
+ out = []
+ id = node.getIdentifier()
out.append(self._renderLabel(node))
out.append(self._renderAttributes(node))
out.append('<br>')
@@ -591,17 +649,22 @@
self.toTarget(Item("".join(out)), meta.getTarget())
def _renderPlainBool(self, node):
- meta = self._getMeta(node)
- id = node.getIdentifier()
+ meta = self._getMeta(node)
+ id = node.getIdentifier()
mvalue = meta.getValue()
- value = node.getValue()
+ value = node.getValue()
#checked = self.stateStack[-1] == value and "checked" or ""
#print "mvalue: %s value: %s" % (mvalue, value)
out = []
- out.append(tag("input", type="checkbox", class_="checkbox",
- id=id, name=id, value="1", disabled=self.ro_mode,
- checked=(value == 1),
- tabindex=self.next_tabindex(),
+ out.append(tag("input",
+ type = "checkbox",
+ class_ = "checkbox",
+ id = id,
+ name = id,
+ value = "1",
+ disabled = self.ro_mode,
+ checked = (value == 1),
+ tabindex = self.next_tabindex(),
**SET_MODIFICATION_ATTRS))
out.append(hidden_bool_tag(id))
out.append(self._renderLabel(node))
@@ -656,7 +719,7 @@
except:
toSelect = None
selected = toSelect == (value or value==0) and "selected" or ""
-
+
if selected:
selected = selected + '="' + selected + '"'
@@ -687,15 +750,15 @@
# write table header
nr_of_children = len(self._getMeta(node.getChildren()[0]).children) + 1
-
+
out.append('<thead>')
out.append('<tr>')
- out.append(tag("th", class_="label", colspan=nr_of_children))
+ out.append('<th class="label" colspan="%s">' % nr_of_children)
out.append(self._renderLabel(node, False))
out.append(self._renderAttributes(node))
out.append('</th>')
out.append('</tr>')
-
+
out.append('<tr>')
out.append('<th></th>')
for hcol in self._getMeta(node.getChildren()[0]).children:
@@ -716,15 +779,14 @@
out.append('<tbody>')
for num, row in enumerate(node.getChildren()):
out.append('<tr>')
- out.append(tag("td", class_=("label %s"
- % (num % 2 and "hl" or ""))))
+ out.append('<td class="label %s">' % (num%2 and "hl" or ""))
out.append(self._renderLabel(row, False))
out.extend(self._renderAttributes(row))
out.append('</td>')
self.stateStack.append(str(row.getValue()))
for col in self._getMeta(row).children:
value = col.getValue()
- out.append(tag("td", class_=(num%2 and "hl" or "")))
+ out.append('<td class="%s">' % (num%2 and "hl" or ""))
out.append(tag("input", type="radio", name=row.getIdentifier(),
value=value, disabled=self.ro_mode,
checked=(value == self.stateStack[-1]),
@@ -736,17 +798,15 @@
# write legend
length = len(self._getMeta(node.getChildren()[0]).children)+1
- out.append('<tr>')
- out.append(tag("td", colspan=length))
- out.append('</td></tr>')
+ out.append('<tr><td colspan="%s"></td></tr>' % str(length))
if legend:
out.append('<tr>')
- out.append(tag("td", class_="legend", colspan=length))
+ out.append('<td class="legend" colspan="%s">' % str(length))
out.append(" ".join(legend))
out.append('</td>')
out.append('</tr>')
out.append('<tr>')
- out.append(tag("td", class_="label", colspan=length))
+ out.append('<td class="label" colspan="%s">' % str(length))
out.append(self._renderErrors(node))
out.append('</td>')
out.append('</tr>')
@@ -779,17 +839,18 @@
def _renderExternalChoiceList(self, choiceList):
out = []
-
+
# Sort the list according to the target
children = sorted(choiceList.getChildren(),
- key=lambda child: child.getTarget(),
- reverse=True)
-
+ key = lambda child: child.getTarget(),
+ reverse = True)
+
if children:
for child in children:
value = child.getValue()
- out.append(tag("option", value=value,
- selected=(value == self.stateStack[-1])))
+ out.append(tag("option",
+ value = value,
+ selected = (value == self.stateStack[-1])))
out.append(escape(child.getDescription()))
out.append("</option>")
self.toTarget(Text("\n".join(out)),
@@ -870,33 +931,35 @@
digests = {}
self.rg_digests = digests
- def render_digest(self, rg, fields):
+ def render_digest(self, rg):
out = []
case_id = rg.getIdentifier().split(':')[-1]
+ fields = self.rg_digests.get(self._getMeta(rg).getName(), []).get('fields')
+ log.debug(fields)
+
out.append('<table class="rgdigest">')
if not fields:
log.warning("No digest specification for repeat group %r",
rg.getIdentifier())
out.append('<tr><td>%s</td></tr>' % escape(rg.getIdentifier()))
else:
- child_identifier = rg.getChildren()[0].getIdentifier()
for num, field in enumerate(fields):
item = self.it.getItem('%s:%s:%s'
% (field, rg.getInternalIdentifier(),
case_id))
out.append('<tr>')
out.append('<td class="label">')
- out.append(tag("a", href=url_for(controller="navigation",
- action="select_branch",
- id=child_identifier)))
+ out.append(tag("a",
+ href=("/navigation/select_branch/%s"
+ % rg.getChildren()[0].getIdentifier())))
out.append(escape(self._getMeta(item).getDescription()))
out.append('</a>')
out.append('</td>')
out.append('<td>')
- out.append(tag("a", href=url_for(controller="navigation",
- action="select_branch",
- id=child_identifier)))
+ out.append(tag("a",
+ href=("/navigation/select_branch/%s"
+ % rg.getChildren()[0].getIdentifier())))
value = item.getValue()
if isinstance(self._getMeta(item), data.DateLeaf):
value = format_date(value)
@@ -910,7 +973,7 @@
for child in childs:
if str(child.getValue()) == str(value):
value = child.getDescription()
- break
+ break;
out.append('%s' % NA(value))
out.append('</a>')
out.append('</td>')
@@ -919,6 +982,7 @@
return "".join(out)
def render(self, showNext=False):
+
out = []
out.append('<div class="widget">')
out.append('<table class="list">')
@@ -927,54 +991,41 @@
escape(_('Actions'))))
items = self.page.getChildren()
- # Sorting of RG.
+ # Sorting of RG.
class SortDummy:
- def __init__(self, rg, it, case_id, sort_field, fields):
+ def __init__(self, rg, it, case_id, field):
self.rg = rg
- self.value = str(it.getItem('%s:%s:%s'
- % (sort_field,
- rg.getInternalIdentifier(),
- case_id)).getValue())
- self.fields = fields
+ self.value = str(it.getItem('%s:%s:%s' % (field, rg.getInternalIdentifier(), case_id)).getValue())
unsorted_items = []
- reverse_order = False
+ reverse_order = False
if len(items) > 0:
rg = items[0]
case_id = rg.getIdentifier().split(':')[-1]
- digest_spec = self.rg_digests.get(self._getMeta(rg).getName())
- if digest_spec is None:
- log.error("No digest specification for %r", rg)
- else:
- fields = digest_spec.get('fields')
- sort_field = digest_spec.get('sort_field', fields[0])
- sort_order = digest_spec.get('sort_order')
- for rg in items:
- unsorted_items.append(SortDummy(rg, self.it, case_id,
- sort_field, fields))
- if sort_order == "desc":
- reverse_order = True
- sorted_items = sorted(unsorted_items, key=lambda rg: rg.value,
- reverse=reverse_order)
+ fields = self.rg_digests.get(self._getMeta(rg).getName(), []).get('fields')
+ sort_field = self.rg_digests.get(self._getMeta(rg).getName(), []).get('sort_field', fields[0])
+ sort_order = self.rg_digests.get(self._getMeta(rg).getName(), []).get('sort_order')
+ for rg in items:
+ unsorted_items.append(SortDummy(rg, self.it, case_id, sort_field))
+ if sort_order == "desc":
+ reverse_order = True
+ sorted_items = sorted(unsorted_items, key=lambda rg: rg.value, reverse=reverse_order)
- for sd in sorted_items:
+ for num, rg in enumerate([sd.rg for sd in sorted_items]):
out.append('<tr>')
out.append('<td>')
- out.append(self.render_digest(sd.rg, sd.fields))
+ out.append(self.render_digest(rg))
out.append('</td>')
out.append('<td class="actions">')
- out.append(tag("a",
- href=url_for(controller="navigation",
- action="select_branch",
- id=sd.rg.getChildren()[0].getIdentifier())))
- out.append(tag("img", src=icon("open_active_22.png"),
- border="0", alt=_('view'), title=_('view')))
+ out.append(tag("a", href=("/navigation/select_branch/%s"
+ % rg.getChildren()[0].getIdentifier())))
+ out.append(tag("img", src="/images/icons/open_active_22.png", border="0",
+ alt=_('view'), title=_('view')))
out.append("</a>")
if not self.ro_mode:
- out.append(tag("a", href=url_for(controller="repeatgroup",
- action="delete",
- id=sd.rg.getIdentifier())))
- out.append(tag("img", src=icon("delete_active_22.png"),
+ out.append(tag("a", href=("/repeatgroup/delete/%s"
+ % rg.getIdentifier())))
+ out.append(tag("img", src="/images/icons/delete_active_22.png",
border="0", alt=_('delete'), title=_('delete')))
out.append("</a>")
out.append('</td>')
@@ -987,9 +1038,8 @@
out.append('<div>')
out.append('<br>')
out.append(tag("a", class_="button",
- href=url_for(controller="repeatgroup",
- action="new",
- id=self.page.getIdentifier())))
+ href=("/repeatgroup/new/%s"
+ % self.page.getIdentifier())))
out.append(escape(_('Create new item')))
out.append("</a>")
out.append("</div>")
@@ -1006,21 +1056,25 @@
tree = page.getInstanceTree()
out = []
- out.append(self.render_items(self.error_items, _('Formular errors'),
- icon("info/alert.png"), tree))
- out.append(self.render_items(self.warnings, _('Formular warnings'),
- icon("info/info.png"), tree,
- css_class='warning-box'))
+ out.append(self.render_items(self.error_items,
+ _('Formular errors'),
+ "/images/icons/info/alert.png",
+ tree))
+ out.append(self.render_items(self.warnings,
+ _('Formular warnings'),
+ "/images/icons/info/info.png",
+ tree,
+ css_class = 'warning-box'))
return "".join(out)
- def render_items(self, items, title, title_icon, tree, css_class=""):
+ def render_items(self, items, title, icon, tree, css_class = ""):
if not items:
return ""
out = []
- out.append(tag("div", class_=("widget dialog %s" % css_class)))
+ out.append('<div class="widget dialog %s">' % css_class)
out.append('<h1>')
- out.append(tag("img", src=title_icon, alt=''))
+ out.append(tag("img", src=icon, alt=''))
out.append(escape(title))
out.append('</h1>')
out.append('<ol>')
@@ -1034,12 +1088,13 @@
values = [values]
for v in values:
out.append('<li>')
- out.append(tag("a", href=url_for(controller="formularpage",
- action="undo", id=k)))
- out.append(tag("img", src=icon("formular/undo.png"),
- border="0", alt="undo",
- title=_('Restore last valid value'),
- _close=True))
+ out.append(tag("a", href="/formularpage/undo/%s" % k))
+ out.append(tag("img",
+ src = "/images/icons/formular/undo.png",
+ border = "0",
+ alt = "undo",
+ title = _('Restore last valid value'),
+ _close = True))
out.append('</a>')
out.append(tag("a", class_="error", href="#f_%s" % k))
out.append("%s:</a>" % escape(description))
Modified: base/trunk/mpulsweb/lib/validators.py
===================================================================
--- base/trunk/mpulsweb/lib/validators.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/lib/validators.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -68,9 +68,9 @@
"""
casedoc_sql = ("SELECT id FROM ka_fall_dokumente_tbl_view"
- " WHERE name = %(filename)s and master_id = %(case)s")
+ " WHERE name = '%(filename)s' and master_id = %(case)s")
globaldoc_sql = ("SELECT id FROM ka_global_dokumente_tbl_view"
- " WHERE name = %(filename)s")
+ " WHERE name = '%(filename)s'")
field_names = None
validate_partial_form = True
__unpackargs__ = ('*', 'field_names')
@@ -124,7 +124,7 @@
conn = db.getConnection()
cur = conn.cursor()
fields = {'filename': name, 'case': case}
- cur.execute(sql, fields)
+ cur.execute(sql % fields)
result = cur.fetchone()
if result:
errors['name'] = self.message('fileexists', state)
Modified: base/trunk/mpulsweb/model/document.py
===================================================================
--- base/trunk/mpulsweb/model/document.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/model/document.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -159,11 +159,13 @@
def isCaseAttached(self):
return not self.case is None
- def getName(self):
+ def getName(self, encoding="utf-8"):
name = self.name
if name is None:
return None
- return h.ensure_unicode(name)
+ if encoding:
+ return unicode(str(name), encoding)
+ return name
def create(self, name, src, case=None, uuid=None):
name = name.strip().rsplit('\\', 1)[-1].rsplit('/', 1)[-1]
Modified: base/trunk/mpulsweb/model/phase.py
===================================================================
--- base/trunk/mpulsweb/model/phase.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/model/phase.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,14 +3,13 @@
import logging
import re
-from pylons import g, c
+from pylons import session, g, c
from pylons.i18n import _
from formed.instance.backends.postgres import DBFactory as InstanceFactory
from formed.instance.backends.common import RuleEvalContext
-from formed.instance.tree import InstanceLeaf, PageInstanceNode
+from formed.instance.tree import InstanceLeaf, PageInstanceNode, RepeatInstanceContainerNode
-from mpulsweb.lib.helpers import tag, url_for
from mpulsweb.lib.db import PostgresDBInterface
@@ -364,11 +363,8 @@
out = []
style = self.is_ok() and "ok" or "error"
element_id = ":".join(self.id.split(':')[1:])
- out.append(tag("a", class_=style,
- href=url_for(controller='/formularpage', action='select',
- id=('%s:%s' % (self.page, element_id)),
- anchor=('%s:%s' % (self.name,
- element_id)))))
+ out.append('<a class="%s" href="/formularpage/select/%s:%s#%s:%s">'
+ % (style, self.page, element_id, self.name, element_id))
out.append('%s' % self.label)
out.append('</a>')
return "".join(out)
Modified: base/trunk/mpulsweb/model/user.py
===================================================================
--- base/trunk/mpulsweb/model/user.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/model/user.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -24,7 +24,6 @@
import sys
import datetime
-import logging
from pylons import session
@@ -33,9 +32,6 @@
from mpulsweb.lib.db import db
-log = logging.getLogger(__name__)
-
-
MARK_NEWS_AS_READ_SQL = """SELECT markNewsAsRead(%(user_id)s, %(news_id)s)"""
FETCH_USER_LIST_SQL = """\
SELECT id, vorname, nachname, rolle, login, gid
Deleted: base/trunk/mpulsweb/public/images/icons/validity-0-22.png
===================================================================
(Binary files differ)
Deleted: base/trunk/mpulsweb/public/images/icons/validity-1-22.png
===================================================================
(Binary files differ)
Deleted: base/trunk/mpulsweb/public/images/icons/validity-2-22.png
===================================================================
(Binary files differ)
Deleted: base/trunk/mpulsweb/public/images/icons/validity-3-22.png
===================================================================
(Binary files differ)
Deleted: base/trunk/mpulsweb/public/images/icons/validity-4-22.png
===================================================================
(Binary files differ)
Deleted: base/trunk/mpulsweb/public/images/icons/validity-5-22.png
===================================================================
(Binary files differ)
Deleted: base/trunk/mpulsweb/public/images/svg/validity-1.svg
===================================================================
--- base/trunk/mpulsweb/public/images/svg/validity-1.svg 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/public/images/svg/validity-1.svg 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="48"
- height="48"
- id="svg4289"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
- sodipodi:docname="validity-1.svg"
- inkscape:export-filename="/home/roland/Projekte/mpuls/base-trunk/mpulsweb/public/images/icons/validity-5-22.png"
- inkscape:export-xdpi="41.596642"
- inkscape:export-ydpi="41.596642"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4291">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 24 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="48 : 24 : 1"
- inkscape:persp3d-origin="24 : 16 : 1"
- id="perspective14" />
- <linearGradient
- id="linearGradient4622">
- <stop
- style="stop-color:#b4b5b3;stop-opacity:1;"
- offset="0"
- id="stop4624" />
- <stop
- style="stop-color:#d8d9d7;stop-opacity:1"
- offset="1"
- id="stop4626" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient4320"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.810197,0,0,2.747234,1.562312,1.675085)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3289"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532645,2.747234,0,-17.383207,49.695158)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3293"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532644,2.747234,0,-17.383207,49.695159)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3297"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532643,2.747234,0,-17.383207,49.695156)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3310"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532645,2.747234,0,-17.383207,49.695158)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- gradientUnits="userSpaceOnUse"
- y2="83.594818"
- x2="173.17017"
- y1="83.594818"
- x1="25.458191"
- id="linearGradient3653"
- xlink:href="#linearGradient3647"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient3647">
- <stop
- id="stop3649"
- offset="0"
- style="stop-color: rgb(251, 251, 251); stop-opacity: 1;" />
- <stop
- id="stop3651"
- offset="1"
- style="stop-color: rgb(0, 102, 34); stop-opacity: 0;" />
- </linearGradient>
- <linearGradient
- id="linearGradient4550">
- <stop
- id="stop4552"
- offset="0"
- style="stop-color: black; stop-opacity: 1;" />
- <stop
- id="stop4554"
- offset="1"
- style="stop-color: rgb(0, 102, 34); stop-opacity: 0;" />
- </linearGradient>
- <inkscape:perspective
- id="perspective3219"
- inkscape:persp3d-origin="90 : 61.666667 : 1"
- inkscape:vp_z="180 : 92.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 92.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6568543"
- inkscape:cx="31.435635"
- inkscape:cy="-2.8840927"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:grid-bbox="true"
- inkscape:document-units="px"
- width="48px"
- height="48px"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:window-width="1227"
- inkscape:window-height="880"
- inkscape:window-x="444"
- inkscape:window-y="41" />
- <metadata
- id="metadata4294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
- <dc:title>List remove</dc:title>
- <dc:date>August 2006</dc:date>
- <dc:creator>
- <cc:Agent>
- <dc:title>Andreas Nilsson</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:source>http://www.gnome.org</dc:source>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>remove</rdf:li>
- <rdf:li>minus</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Reproduction" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Distribution" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/Notice" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/ShareAlike" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/SourceCode" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <rect
- style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.01900005000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3162"
- width="9.0008926"
- height="16.310526"
- x="0.2175142"
- y="31.505323"
- rx="2.032932"
- ry="2.0329323"
- inkscape:export-filename="/home/roland/Projekte/mpuls/base-trunk/mpulsweb/public/images/icons/rect3162.png"
- inkscape:export-xdpi="30"
- inkscape:export-ydpi="30" />
- <rect
- ry="2.0329323"
- rx="2.032932"
- y="23.903925"
- x="9.8500967"
- height="23.911924"
- width="9.0008926"
- id="rect3172"
- style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.01900005000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.01900005000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3174"
- width="9.0008926"
- height="32.485592"
- x="19.482679"
- y="15.330257"
- rx="2.032932"
- ry="2.0329323" />
- <rect
- ry="2.0329323"
- rx="2.032932"
- y="8.3475761"
- x="29.115261"
- height="39.468273"
- width="9.0008926"
- id="rect3176"
- style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.01900005000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <rect
- style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.01900005000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- id="rect3178"
- width="9.0008926"
- height="47.599998"
- x="38.747845"
- y="0.21585064"
- rx="2.032932"
- ry="2.0329323" />
- </g>
-</svg>
Deleted: base/trunk/mpulsweb/public/images/svg/validity.svg
===================================================================
--- base/trunk/mpulsweb/public/images/svg/validity.svg 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/public/images/svg/validity.svg 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="48"
- height="48"
- id="svg4289"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
- sodipodi:docname="validity.svg"
- inkscape:export-filename="/home/roland/Projekte/mpuls/base-trunk/mpulsweb/public/images/icons/validity.[mg.png"
- inkscape:export-xdpi="43.659554"
- inkscape:export-ydpi="43.659554"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs4291">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 24 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="48 : 24 : 1"
- inkscape:persp3d-origin="24 : 16 : 1"
- id="perspective14" />
- <linearGradient
- id="linearGradient4622">
- <stop
- style="stop-color:#b4b5b3;stop-opacity:1;"
- offset="0"
- id="stop4624" />
- <stop
- style="stop-color:#d8d9d7;stop-opacity:1"
- offset="1"
- id="stop4626" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient4320"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.810197,0,0,2.747234,1.562312,1.675085)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient2476"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.810197,0,0,2.747234,1.4414549,1.987585)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3282"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.810197,0,0,2.747234,1.4414549,1.987585)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3285"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532645,2.747234,0,-17.383207,49.69516)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3289"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532645,2.747234,0,-17.383207,49.695158)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3293"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532644,2.747234,0,-17.383207,49.695159)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3297"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532643,2.747234,0,-17.383207,49.695156)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3301"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532644,2.747234,0,-17.383207,49.695158)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3305"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532644,2.747234,0,-17.383207,49.695158)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3307"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.5419329,0,0,2.747234,2.0488972,-6.7124138)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4622"
- id="linearGradient3310"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0,-1.4532645,2.747234,0,-17.383207,49.695158)"
- x1="8.6790628"
- y1="6.7354665"
- x2="8.7223368"
- y2="10.858153" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.6568543"
- inkscape:cx="35.099308"
- inkscape:cy="17.006944"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:grid-bbox="true"
- inkscape:document-units="px"
- width="48px"
- height="48px"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:window-width="1116"
- inkscape:window-height="707"
- inkscape:window-x="556"
- inkscape:window-y="92" />
- <metadata
- id="metadata4294">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
- <dc:title>List remove</dc:title>
- <dc:date>August 2006</dc:date>
- <dc:creator>
- <cc:Agent>
- <dc:title>Andreas Nilsson</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:source>http://www.gnome.org</dc:source>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>remove</rdf:li>
- <rdf:li>minus</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Reproduction" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/Distribution" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/Notice" />
- <cc:permits
- rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/ShareAlike" />
- <cc:requires
- rdf:resource="http://web.resource.org/cc/SourceCode" />
- </cc:License>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="fill:url(#linearGradient3310);fill-opacity:1;stroke:#555753;stroke-width:1.01900005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 11.51057,46.044966 L 16.476057,46.044966 L 16.431786,28.321761 L 11.51057,28.321761 L 11.51057,46.044966 z"
- id="path4314"
- sodipodi:nodetypes="ccccc" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3278"
- d="M 2.3547637,46.044904 L 7.3202507,46.044904 L 7.2759797,34.256214 L 2.3547637,34.256214 L 2.3547637,46.044904 z"
- style="fill:url(#linearGradient3285);fill-opacity:1;stroke:#555753;stroke-width:1.019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- style="fill:url(#linearGradient3289);fill-opacity:1;stroke:#555753;stroke-width:1.01900005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 20.666375,46.044904 L 25.631862,46.044904 L 25.587591,22.412176 L 20.666375,22.412176 L 20.666375,46.044904 z"
- id="path3287"
- sodipodi:nodetypes="ccccc" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3291"
- d="M 29.822181,46.044904 L 34.787668,46.044904 L 34.743397,13.926894 L 29.822181,13.926894 L 29.822181,46.044904 z"
- style="fill:url(#linearGradient3293);fill-opacity:1;stroke:#555753;stroke-width:1.01900005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
- <path
- style="fill:url(#linearGradient3297);fill-opacity:1;stroke:#555753;stroke-width:1.01900005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="M 38.977986,46.044904 L 43.943473,46.044904 L 43.899202,5.0880604 L 38.977986,5.0880604 L 38.977986,46.044904 z"
- id="path3295"
- sodipodi:nodetypes="ccccc" />
- </g>
-</svg>
Modified: base/trunk/mpulsweb/templates/administration/delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/delete_user_helper.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/delete_user_helper.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,10 +3,10 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteuser.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,11 +2,11 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_delteuser')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>i
+ <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>i
<li><a href="#">${_('adm_np_delteuser_success')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_deleteusergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('adm_np_deleteusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/deleteUserGroup">${_('adm_np_deleteusergroup')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/confirm_resetpassword.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,9 +2,9 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser">${_('adm_np_showuser')}</a></li>
<li><a href="#">${_('adm_np_resetpassword')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_delete_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_failed_deleteuser')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Added: base/trunk/mpulsweb/templates/administration/dialogs/failed_new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_new_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_new_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -0,0 +1,9 @@
+## -*- coding: utf-8 -*-
+<%inherit file="../../main.mako" />
+<%def name="buildNavipath()">
+ ${parent.buildNavipath()}
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="#">${_('adm_np_failed_createuser')}</a></li>
+</%def>
+<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/failed_new_usergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/newUserGroup">${_('adm_np_newusergroup')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/notificate_delete_user_helper.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,10 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id)}">${_('adm_np_deleteuser')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUser', id=c.delete_user_id, confirmed=1)}">${_('adm_np_deleteuser_helper')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}">${_('adm_np_deleteuser')}</a></li>
+ <li><a href="/administration/deleteUser/${c.delete_user_id}/1">${_('adm_np_deleteuser_helper')}</a></li>
<li><a href="#">${_('adm_np_deleteuser_helper_set_editor')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_delete_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
<li><a href="#">${_('adm_np_success_deleteuser')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_deletegroup_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='deleteUserGroup')}">${_('adm_np_deleteusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/deleteUserGroup">${_('adm_np_deleteusergroup')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,10 +2,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('adm_np_edituser')}</a></li>
+ <li><a href="/case/">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
<li><a href="#">${_('adm_np_edituser_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_edit_usergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('adm_np_editusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/editUserGroup/${c.group.id}">${_('adm_np_editusergroup')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/dialogs/success_new_usergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/newUserGroup">${_('adm_np_newusergroup')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/administration/edit_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/edit_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -10,10 +10,10 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUser')}">${_('adm_np_edituser')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration/editUser">${_('adm_np_edituser')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -22,8 +22,8 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li> <a href="${h.url_for(controller='/administration', action='resetUserPassword', id=c.uo.id)}"> ${_('adm_actions_link_userpassreset')}</a> </li>
- <li> <a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}"> ${_('menu_adm_link_useredit_back')} </a></li>
+ <li> <a href="/administration/resetUserPassword/${c.uo.id}"> ${_('adm_actions_link_userpassreset')}</a> </li>
+ <li> <a href="/administration/showUser/${c.uo.id}"> ${_('menu_adm_link_useredit_back')} </a></li>
</ul>
</div>
</div>
@@ -31,8 +31,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_edit_user">
<div id="waska_form">
-<form action="${h.url_for(controller='/administration', action='editUserAction')}"
- method="POST">
+<form action="/administration/editUserAction" method="POST">
<fieldset>
Modified: base/trunk/mpulsweb/templates/administration/edit_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/edit_usergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -7,9 +7,9 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}">${_('adm_np_editusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/editUserGroup/${c.group.id}">${_('adm_np_editusergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -28,7 +28,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
- <form action="${h.url_for(controller='/administration', action='editUserGroupAction')}" method="POST">
+ <form action="/administration/editUserGroupAction" method="POST">
<input type="hidden" name="id">
<fieldset><legend>${_('adm_form_legend_groupdata')}</legend>
<div class="w25">
Modified: base/trunk/mpulsweb/templates/administration/new_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/new_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -11,9 +11,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('adm_np_newuser')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/newUser">${_('adm_np_newuser')}</a></li>
</%def>
<div id="content_header_small">
@@ -35,8 +35,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
- <form action="${h.url_for(controller='/administration', action='newUserAction')}"
- method="POST">
+ <form action="/administration/newUserAction" method="POST">
<fieldset><legend>${_('adm_form_legend_personal')}</legend>
<div class="w25">
% if c.form_errors.get('firstname'):
Modified: base/trunk/mpulsweb/templates/administration/new_user_result.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_user_result.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/new_user_result.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,9 +3,9 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUser')}">${_('adm_np_newuser')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/newUser">${_('adm_np_newuser')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/administration/new_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/new_usergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -6,9 +6,9 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}">${_('adm_np_newusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration/newUserGroup">${_('adm_np_newusergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -27,8 +27,7 @@
${self.buildFormErrors(formular_labels)}
<div id="admin_new_user">
<div id="waska_form">
-<form action="${h.url_for(controller='/administration', action='newUserGroupAction')}"
- method="POST">
+<form action="/administration/newUserGroupAction" method="POST">
<fieldset><legend>${_('adm_form_legend_groupdata')}</legend>
<div class="w25">
% if c.form_errors.get('name'):
Modified: base/trunk/mpulsweb/templates/administration/overview_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/overview_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
</%def>
@@ -15,7 +15,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='newUser')}"> ${_('adm_actions_link_newuser')}</a></li>
+ <li><a href="/administration/newUser"> ${_('adm_actions_link_newuser')}</a></li>
</ul>
</div>
</div>
@@ -37,17 +37,17 @@
<tr class="table_row_h">
<% idset = 0 %>
% endif
- <td><a href="${h.url_for(controller='/administration', action='showUser', id=user.id)}">${user.last_name| F.NA}</a></td>
- <td><a href="${h.url_for(controller='/administration', action='showUser', id=user.id)}">${user.first_name| F.NA}</a></td>
+ <td><a href="/administration/showUser/${user.id}">${user.last_name| F.NA}</a></td>
+ <td><a href="/administration/showUser/${user.id}">${user.first_name| F.NA}</a></td>
% if user.getRole() == 'Admin':
- <td><img src="${h.url_for('/images/icons/admin_grey_tag.gif')}" alt="Administratorin, Administrator" title="Administrator/in"></td>
+ <td><img src="/images/icons/admin_grey_tag.gif" alt="Administratorin, Administrator" title="Administrator/in"></td>
% else:
- <td><img src="${h.url_for('/images/icons/cm_grey_tag_width.gif')}" alt="Case-Managerin, Case-Manager" title="Case-Manager/in"></td>
+ <td><img src="/images/icons/cm_grey_tag_width.gif" alt="Case-Managerin, Case-Manager" title="Case-Manager/in"></td>
% endif
<td>
- <a href="${h.url_for(controller='/administration', action='showUser', id=user.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <a href="/administration/showUser/${user.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if str(user.id) != str(session.get('USER_AUTHORIZED').id):
- <a href="${h.url_for(controller='/administration', action='deleteUser', id=user.id)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="/administration/deleteUser/${user.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/administration/overview_usergroups.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/overview_usergroups.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/overview_usergroups.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUserGroups')}">${_('adm_np_usergroup_overview')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUserGroups">${_('adm_np_usergroup_overview')}</a></li>
</%def>
@@ -15,7 +15,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='newUserGroup')}"> ${_('adm_actions_link_newusergroup')}</a></li>
+ <li><a href="/administration/newUserGroup"> ${_('adm_actions_link_newusergroup')}</a></li>
</ul>
</div>
</div>
@@ -35,11 +35,11 @@
<% idset = 0 %>
% endif
<td>
- <a href="${h.url_for(controller='/administration', action='showUserGroup', id=group.id)}">${group.name| F.NA}</a>
+ <a href="/administration/showUserGroup/${group.id}">${group.name| F.NA}</a>
</td>
<td>
- <a href="${h.url_for(controller='/administration', action='showUserGroup', id=group.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
- <a href="${h.url_for(controller='/administration', action='deleteUserGroup', id=group.id)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="/administration/showUserGroup/${group.id}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <a href="/administration/deleteUserGroup/${group.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
</td>
</tr>
% endfor
Modified: base/trunk/mpulsweb/templates/administration/reset_password.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/reset_password.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/reset_password.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,14 +3,14 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser')}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser">${_('adm_np_showuser')}</a></li>
<li><a href="#">${_('adm_np_resetpassword')}</a></li>
</%def>
<div class="dialog">
-<h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
+<h1><img src="/images/icons/info/confirmation.png" alt="Bestäntigung"</> ${_('adm_header_resetpassword')}</h1>
<p>${_('adm_con_rp_the_password')} <strong>${c.uo.first_name| F.NA} ${c.uo.last_name| F.NA}</strong> ${_('adm_con_rp_has_been_changed')}<br>
${_('adm_con_rp_new_pw')} <strong>${h.literal(c.new_password) | h}</strong></p>
-<a class="button" href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_con_rp_to_useroverview')}</a>
+<a class="button" href="/administration/overviewUser">${_('adm_con_rp_to_useroverview')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_user.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_user.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/show_user.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,9 +2,9 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUser', id=c.uo.id)}">${_('adm_np_showuser')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUser/${c.uo.id}">${_('adm_np_showuser')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -13,7 +13,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li> <a href="${h.url_for(controller='/administration', action='editUser', id=c.uo.id)}"> ${_('adm_actions_link_edituser')}</a> </li>
+ <li> <a href="/administration/editUser/${c.uo.id}"> ${_('adm_actions_link_edituser')}</a> </li>
<li><a href="${h.url_for(controller='administration', action='overviewUser')}"> ${_('menu_adm_link_useroverview_back')}</a></li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/administration/show_usergroup.mako
===================================================================
--- base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/administration/show_usergroup.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,9 +3,9 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='overviewUser')}">${_('adm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showUserGroup', id=c.group.id)}">${_('adm_np_showusergroup')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/overviewUser">${_('adm_np_overview')}</a></li>
+ <li><a href="/administration/showUserGroup/${c.group.id}">${_('adm_np_showusergroup')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -14,7 +14,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/administration', action='editUserGroup', id=c.group.id)}"> ${_('adm_actions_link_editusergroup')}</a> </li>
+ <li><a href="/administration/editUserGroup/${c.group.id}"> ${_('adm_actions_link_editusergroup')}</a> </li>
<li><a href="${h.url_for(controller='administration', action='overviewUserGroups')}"> ${_('menu_adm_link_usergroupoverview_back')}</a></li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/annotations/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/annotations/main.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/annotations/main.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -13,7 +13,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="content-style-type" content="text/css">
<meta http-equiv="expires" content="0">
- <link rel="shortcut icon" type="image/x-icon" href="${h.url_for('/images/kompetenz3.ico')}">
+ <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
% if c.print_version:
<link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" type="text/css">
<link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" type="text/css">
Modified: base/trunk/mpulsweb/templates/appointments/appointment_form.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/appointment_form.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/appointments/appointment_form.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,6 @@
<div id="appointment">
<div id="waska_form">
-<form action="${h.url_for(controller='/appointment', action='save')}"
- method="post">
+<form action="/appointment/save" method="post">
<div class="w25">
<label for="title">${_('app_form_label_title')}</label><br>
<input type="text" class="field" name="title" id="title" maxlength="128">
Modified: base/trunk/mpulsweb/templates/appointments/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/appointmentlist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/appointments/appointmentlist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
<%inherit file="/appointments/overview_body.mako" />
<%def name="showAppointmentActions(appointment)">
-<a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+<a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['admin_ka']):
- <a href="${h.url_for(controller='/appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="${h.url_for(controller='/appointment', action='delete', id=appointment.id, confirmed=0)}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
% endif
</%def>
Modified: base/trunk/mpulsweb/templates/appointments/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/edit.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/appointments/edit.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -9,7 +9,7 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
+ <li><a href="/appointment/overview">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_edit')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/appointments/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/new.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/appointments/new.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
- <li><a href="${h.url_for(controller='/appointment', action='new')}">${_('app_np_new')}</a></li>
+ <li><a href="/appointment/overview">${_('app_np_list')}</a></li>
+ <li><a href="/appointment/new/">${_('app_np_new')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/appointments/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/overview.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/appointments/overview.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
+ <li><a href="/appointment/overview">${_('app_np_list')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -11,7 +11,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/appointment', action='create')}"> ${_('app_actions_link_newappointment')}</a></li>
+ <li><a href="/appointment/create"> ${_('app_actions_link_newappointment')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/appointments/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/appointments/show.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/appointments/show.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/appointment', action='overview')}">${_('app_np_list')}</a></li>
- <li><a href="${h.url_for(controller='/appointment', action='show')}"></a>${_('app_np_show')}</li>
+ <li><a href="/appointment/overview">${_('app_np_list')}</a></li>
+ <li><a href="/appointment/show/"></a>${_('app_np_show')}</li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/auth/logout.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/logout.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/auth/logout.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,6 +3,6 @@
<h1>${_('%s Abmeldung') % h.get_app_title()}</h1>
<div id="waska_form_login">
<p>
- ${_('logout_p_logout successful')} <a href="${h.url_for('/')}">${_('logout_a_login')}</a>${_('logout_p_login_again')}.
+ ${_('logout_p_logout successful')} <a href="/">${_('logout_a_login')}</a>${_('logout_p_login_again')}.
</p>
</div>
Modified: base/trunk/mpulsweb/templates/auth/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/main.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/auth/main.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -12,11 +12,11 @@
<div id="footer_login">
<p>${_('main_login_bmf_phrase') % h.get_app_title()}</p>
<a target="_blank" href="http://www.bmfsfj.de">
- <img src="${h.url_for('/images/logos/BMFSFJ_C_M_web.jpg')}"
+ <img src="/images/logos/BMFSFJ_C_M_web.jpg"
alt="Logo Bundesministerium für Familie, Senioren, Frauen und Jugend" border="0">
</a>
<a target="_blank" href="http://ec.europa.eu/employment_social/esf2000/index_de.html">
- <img src="${h.url_for('/images/logos/eu_logo_4c_pos_web2.jpg')}"
+ <img src="/images/logos/eu_logo_4c_pos_web2.jpg"
alt="Logo Europäische Union - Europäische Sozialfonds" border="0">
</a>
</div>
@@ -40,4 +40,4 @@
</ul>
</div>
% endif
-</%def>
+</%def>
\ No newline at end of file
Modified: base/trunk/mpulsweb/templates/base.mako
===================================================================
--- base/trunk/mpulsweb/templates/base.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/base.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -27,7 +27,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="content-style-type" content="text/css">
<meta http-equiv="expires" content="0">
- <link rel="shortcut icon" type="image/x-icon" href="${h.url_for('/images/kompetenz3.ico')}">
+ <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
% if c.print_version:
<link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet"
type="text/css">
@@ -47,10 +47,8 @@
<link href="${h.url_for('/styles/menu.css')}" media="screen"
rel="stylesheet" type="text/css">
<!--[if IE 6]>
- <script defer type="text/javascript"
- src="${h.url_for('/js/ie6-png.js')}"></script>
- <script defer type="text/javascript"
- src="${h.url_for('/js/ie6-menu.js')}"></script>
+ <script defer type="text/javascript" src="/js/ie6-png.js"></script>
+ <script defer type="text/javascript" src="/js/ie6-menu.js"></script>
<link href = "${h.url_for('/styles/ie6.css')}"
media = "screen"
rel = "stylesheet" type="text/css">
@@ -66,7 +64,7 @@
rel = "stylesheet" type="text/css">
<![endif]-->
% endif
- <script src="${h.url_for('/js/check.js')}" type="text/javascript"></script>
+ <script src="/js/check.js" type="text/javascript"></script>
</head>
<body onload="clearModification();">
${next.body()}
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/confirm_anonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/error.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">Aktion für mehrere Fallakten durchführen</a></li>
</%def>
<%include file="../../dialogs/notification.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_anonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_delete_admin.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_editor.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li>${_('cm_np_bundled_editor')}</li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_markdelete.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/dialogs/success_standin.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li>${_('cm_np_bundled_standin')}</li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casebundle/editor.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/editor.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/editor.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,7 +3,7 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li>${_('cm_np_bundled_editor')}</li>
</%def>
Modified: base/trunk/mpulsweb/templates/casebundle/standin.mako
===================================================================
--- base/trunk/mpulsweb/templates/casebundle/standin.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casebundle/standin.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,7 +3,7 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li>${_('cm_np_bundled_standin')}</li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/appointmentlist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,14 +3,13 @@
<a href="${h.url_for(controller='/caseappointment',
action='show', id=appointment.id,
confirmed='1')}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
- alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}">
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
+ title="${_('cm_overview_a_show')}">
</a>
% if h.hasRole(['cm_ka']):
<a href="${h.url_for(controller='/caseappointment', action='delete',
id=appointment.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}"
- border="0"
+ <img src="/images/icons/delete_active_22.png" border="0"
alt="${_('cm_overview_a_delete')}"
title="${_('cm_overview_a_delete')}">
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/appointments.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/appointments.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/caselist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -24,7 +24,7 @@
fn = d.overview_label
fs = d.overview_style
print f
- field = (fn,f,fs, all_roles,
+ field = (fn,f,fs, all_roles,
lambda case, f=f: h.shorten(case.get_value(f), 15))
fields.append(field)
@@ -47,29 +47,28 @@
% for title, urlpart, style, roles, get_value in fields:
% if h.hasRole(roles):
<th class="${style} table_header_h">${title}
- <a href="${h.url_for(controller='case_overview', action='overview',
- sort_field=urlpart, sort_order='asc')}">
+ <a href="/case_overview/overview?sort_field=${urlpart}&sort_order=asc">
<img class = "sorticon"
%if c.sort_field == urlpart and c.sort_order == 'asc':
- src = "${h.url_for('/images/icons/sort_asc_active.png')}"
+ src = "/images/icons/sort_asc_active.png"
alt = "${_("Sorted by %s in ascending order") % title}"
title = "${_("Sorted by %s in ascending order") % title}"
%else:
- src = "${h.url_for('/images/icons/sort_asc.png')}"
+ src = "/images/icons/sort_asc.png"
alt = "${_("Sort in ascending order")}"
title = "${_("Sort in ascending order")}"
+ title = "${c.sort_field} - ${c.sort_order}"
%endif
width = "10"
height = "9"></a>
- <a href="${h.url_for(controller='case_overview', action='overview',
- sort_field=urlpart, sort_order='desc')}">
+ <a href="/case_overview/overview?sort_field=${urlpart}&sort_order=desc">
<img class = "sorticon"
%if c.sort_field == urlpart and c.sort_order == 'desc':
- src = "${h.url_for('/images/icons/sort_desc_active.png')}"
+ src = "/images/icons/sort_desc_active.png"
alt = "${_("Sorted by %s in descending order") % title}"
title = "${_("Sorted by %s in descending order") % title}"
%else:
- src = "${h.url_for('/images/icons/sort_desc.png')}"
+ src = "/images/icons/sort_desc.png"
alt = "${_("Sort in descending order")}"
title = "${_("Sort in descending order")}"
%endif
@@ -95,12 +94,11 @@
% endif
% for title, urlpart, style, roles, get_value in fields:
% if h.hasRole(roles):
- <td><a href="${h.url_for(controller='/case', action='select',
- id=case.id, confirmed=0)}">${get_value(case) | F.NA}</a></td>
+ <td><a href="/case/select/${case.id}/0/">${get_value(case) | F.NA}</a></td>
% endif
% endfor
<td>
- ${get_phase_icon(case)}
+ ${get_phase_icon(case)}
</td>
<td>
${get_state_icon(case)}
@@ -145,46 +143,40 @@
<%def name="get_state_icon(case)">
% if h.hasRole(['cm_ka']):
% if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
- <img src = "${h.url_for('/images/icons/edit_editor.png')}"
- border = "0"
- alt = "${_('cm_overview_img_editor')}"
+ <img src = "/images/icons/edit_editor.png" border="0"
+ alt = "${_('cm_overview_img_editor')}"
title = "${_('cm_overview_img_editor')}"
width = "22"
height = "22">
% else:
- <img src = "${h.url_for('/images/icons/edit_editors_22.png')}"
- border = "0"
- alt = "${_('cm_overview_img_standin')}"
+ <img src = "/images/icons/edit_editors_22.png" border="0"
+ alt = "${_('cm_overview_img_standin')}"
title = "${_('cm_overview_img_standin')}"
width = "22"
height = "22">
% endif
% endif
% if case.getState().getState() in (1,2):
- <img src = "${h.url_for('/images/icons/edit_22.png')}"
- border = "0"
- alt = "${_('case_state_label_open')}"
+ <img src = "/images/icons/edit_22.png" border="0"
+ alt = "${_('case_state_label_open')}"
title = "${_('case_state_label_open')}"
width = "22"
height = "22">
% elif case.getState().getState() == 3:
- <img src = "${h.url_for('/images/icons/delete_inactive_22.png')}"
- border = "0"
- alt = "${_('case_state_label_markdelete')}"
+ <img src = "/images/icons/delete_inactive_22.png" border="0"
+ alt = "${_('case_state_label_markdelete')}"
title = "${_('case_state_label_markdelete')}"
width = "22"
height = "22">
% elif case.getState().getState() == 4:
- <img src = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
- border = "0"
- alt = "${_('case_state_label_markanonym')}"
+ <img src = "/images/icons/anonymise_inactive_22.png" border="0"
+ alt = "${_('case_state_label_markanonym')}"
title = "${_('case_state_label_markanonym')}"
width = "22"
height = "22">
% elif case.getState().getState() == 5:
- <img src = "${h.url_for('/images/icons/anonymise_inactive_22.png')}"
- border = "0"
- alt = "${_('case_state_label_anonym')}"
+ <img src = "/images/icons/anonymise_inactive_22.png" border="0"
+ alt = "${_('case_state_label_anonym')}"
title = "${_('case_state_label_anonym')}"
width = "22"
height = "22">
@@ -193,61 +185,48 @@
<%def name="get_actions(case)">
% if case.getState().getState() != 5:
- <a href="${h.url_for(controller='case', action='select', id=case.id,
- confirmed=0)}">
- <img src = "${h.url_for('/images/icons/open_active_22.png')}"
- border = "0"
- alt = "${_('cm_overview_a_show')}"
+ <a href="/case/select/${case.id}/0/">
+ <img src = "/images/icons/open_active_22.png" border="0"
+ alt = "${_('cm_overview_a_show')}"
title = "${_('cm_overview_a_show')}"
width = "22"
height = "22"></a>
% endif
% if h.hasRole(['admin_ka']):
% if case.getState().getState() in (3, 5):
- <a href="${h.url_for(controller='case', action='delete', id=case.id,
- confirmed=0)}">
- <img src = "${h.url_for('/images/icons/delete_active_22.png')}"
- border = "0"
- alt = "${_('Delete case')}"
+ <a href="/case/delete/${case.id}/0/">
+ <img src = "/images/icons/delete_active_22.png" border="0"
+ alt = "${_('Delete case')}"
title = "${_('Delete case')}"
width = "22"
height = "22"></a>
% endif
% if case.getState().getState() == 4:
- <a href="${h.url_for(controller='case', action='anonymize', id=case.id,
- confirmed=0)}">
- <img src = "${h.url_for('/images/icons/anonymise_active_22.png')}"
- border = "0"
- alt = "${_('cm_overview_a_anonymize')}"
+ <a href="/case/anonymize/${case.id}/0/">
+ <img src = "/images/icons/anonymise_active_22.png" border="0"
+ alt = "${_('cm_overview_a_anonymize')}"
title = "${_('cm_overview_a_anonymize')}"
width = "22"
height = "22"></a>
% endif
% if case.getState().getState() in (3, 4):
- <a href="${h.url_for(controller='case', action='restore', id=case.id,
- confirmed=0)}">
- <img src = "${h.url_for('/images/icons/refresh_active_22.png')}"
- border = "0"
- alt = "${_('cm_overview_a_restore')}"
+ <a href="/case/restore/${case.id}/0/">
+ <img src = "/images/icons/refresh_active_22.png" border="0"
+ alt = "${_('cm_overview_a_restore')}"
title = "${_('cm_overview_a_restore')}"
width = "22"
height = "22"></a>
% endif
% elif h.hasRole(['cm_ka']) and case.getState().getState() in (1, 2):
- <a href="${h.url_for(controller='case',
- action='markForAnonymizeFromOverview', id=case.id,
- confirmed=0)}">
- <img src = "${h.url_for('/images/icons/anonymise_active_22.png')}"
- border = "0"
- alt = "${_('cm_overview_a_anonymize')}"
+ <a href="/case/markForAnonymizeFromOverview/${case.id}/0/">
+ <img src = "/images/icons/anonymise_active_22.png" border="0"
+ alt = "${_('cm_overview_a_anonymize')}"
title = "${_('cm_overview_a_anonymize')}"
width = "22"
- height = "22"></a>
- <a href="${h.url_for(controller='case', action='markForDelete', id=case.id,
- confirmed=0)}">
- <img src = "${h.url_for('/images/icons/delete_active_22.png')}"
- border = "0"
- alt = "${_('cm_overview_a_delete')}"
+ height = "22"></a>
+ <a href="/case/markForDelete/${case.id}/0/">
+ <img src = "/images/icons/delete_active_22.png" border="0"
+ alt = "${_('cm_overview_a_delete')}"
title = "${_('cm_overview_a_delete')}"
width = "22"
height = "22"></a>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_anonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -6,10 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select',
- id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('menu_app_link_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${session.get('case').id}">${_('menu_app_link_overview')}</a></li>
<li><a href="#">${_('app_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_att_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_att_overview')}</a></li>
<li><a href="#">${_('cm_np_attachment_confirm')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_export.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,14 +2,12 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_export')}</a></li>
</%def>
<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/question.png')}"
- alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
-<form action="${h.url_for(controller='/case_bundle', action='exportAction')}"
- method="GET">
+<h1><img src="/images/icons/info/question.png" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
+<form action="/case_bundle/exportAction" method="GET">
<% case_bundle = session.get('casebundle') %>
% if case_bundle and len(case_bundle.case_list) > 1:
<h3>Ausgewählte Fallakten</h3>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_markanonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/confirm_restore.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_restore')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/failed_markanonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
<%include file="/dialogs/notification.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_anonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_new')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('menu_app_link_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${session.get('case').id}">${_('menu_app_link_overview')}</a></li>
<li><a href="#">${_('app_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_attachment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,10 +1,10 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='case_overview')}">${_('cm_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_doc_overview')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="/case/case_overview">${_('cm_np_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
<li><a href="#">${_('cm_np_delete_attachment_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_delete_cm.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_delete_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_export.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_export_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_keepactive.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_keepactive_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_markanonymize.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -6,9 +6,9 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
%if case:
- <li><a href="${h.url_for(controller='/case', action='select', id=case.id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${case.id}/1">${_('cm_np_select')}</a></li>
%else:
- <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
%endif
<li><a href="#">${_('cm_np_anonymize')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/dialogs/success_restore.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
<li><a href="#">${_('cm_np_restore_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/casemanagement/digest.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,9 +3,7 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='case', action='select',
- id=session['case'].id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='case', action='digest',
- id=session['case'].id)}">${_('cm_np_digest')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/digest/${session.get('case').id}">${_('cm_np_digest')}</a></li>
</%def>
<%include file="digest_body.mako"/>
Modified: base/trunk/mpulsweb/templates/casemanagement/digest_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest_body.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/digest_body.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -14,8 +14,7 @@
<div class="dialog">
% if c.finished:
<h1>
- <img src="${h.url_for('/images/icons/info/alert.png')}"
- alt="achtung"/>
+ <img src="/images/icons/info/alert.png" alt="achtung"/>
Maximale Speicherdauer überschritten!
</h1>
<p>
@@ -28,8 +27,7 @@
</p>
% else:
<h1>
- <img src="${h.url_for('/images/icons/info/question.png')}"
- alt="achtung"/>Inaktiver Fall?
+ <img src="/images/icons/info/question.png" alt="achtung"/>Inaktiver Fall?
</h1>
<p>
Für die Fallakte konnte seit
@@ -69,9 +67,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='case', action='printdigest',
- id=session['case'].id)}"
- target="_blank"
+ <a href="/case/printdigest/${session['case'].id}" target="_blank"
onclick="return checkModification();">
${_('cm_actions_link_printout')}
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/editAppointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('app_np_list')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${c.appointment.case_id}">${_('app_np_list')}</a></li>
<li><a href="#"></a>${_('app_np_edit')}</li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/main.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/main.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -5,10 +5,8 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='case')}"
- onclick="return checkModification();">${_('cm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='case_overview', action='overview')}"
- onclick="return checkModification();">${_('cm_np_overview')}</a></li>
+ <li><a href="/case/" onclick="return checkModification();">${_('cm_np_root')}</a></li>
+ <li><a href="/case_overview/overview/" onclick="return checkModification();">${_('cm_np_overview')}</a></li>
</%def>
<%def name="buildModusfield()">
</%def>
@@ -37,34 +35,26 @@
% if session.get('case').getState().getState() not in (3,4,5):
% if not session.get('case').hasPrivacyStatement():
<li>
- <a href="${h.url_for(controller='privacy', action='set',
- id=session.get('case').id)}"
- onclick="return checkModification();">${_('cm_main_set_statement')}
+ <a href="/privacy/set/${session.get('case').id}"
+ onclick="return checkModification();">${_('cm_main_set_statement')}
</a>
</li>
% elif session.get('case').hasPrivacyStatement():
<li>
- <a href="${h.url_for(controller='privacy',
- action='decline',
- id=session.get('case').id,
- confirmed=0)}"
- onclick="return checkModification();">${_('cm_main_revoke_statement')}
+ <a href="/privacy/decline/${session.get('case').id}/0"
+ onclick="return checkModification();">${_('cm_main_revoke_statement')}
</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='case',
- action='markForAnonymize',
- id=session.get('case').id,
- confirmed=0)}"
+ <a href="/case/markForAnonymize/${session.get('case').id}/0"
onclick="return checkModification();">${_('cm_main_anonymize_case')}
</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='privacy',
- action='listStatements')}"
- onclick="return checkModification();"> ${_('statement_list_statement')}
+ <a href="/privacy/listStatements"
+ onclick="return checkModification();"> ${_('statement_list_statement')}
</a>
</li>
</ul>
@@ -86,16 +76,14 @@
onclick="return checkModification();">${_('cm_menu_link_backtooverview')}</a>
</li>
<li>
- <a href="${h.url_for(controller='case', action='digest',
- id=session.get('case').id)}"
- onclick="return checkModification();">
+ <a href="/case/digest/${session.get('case').id}"
+ onclick="return checkModification();">
${_('cm_menu_link_digest')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='phase', action='overview',
- id=session.get('case').id)}"
- onclick="return checkModification();">${_('case_cm_phase')}</a>
+ <a href="/phase/overview/${session.get('case').id}"
+ onclick="return checkModification();">${_('case_cm_phase')}</a>
</li>
</ul>
% endif
@@ -105,46 +93,35 @@
<ul>
% if h.hasRole(['cm_ka', 'admin_ka']):
<li>
- <a href="${h.url_for(controller='case',
- action='organisation',
- id=session.get('case').id)}"
+ <a href="/case/organisation/${session.get('case').id}"
onclick="return checkModification();">
${_('cm_menu_link_organisation')}
</a>
</li>
% if g.mpuls_config.is_enabled('case-module', 'tags'):
<li>
- <a href="${h.url_for(controller='tags',
- action='overview',
- id=session.get('case').id)}"
- onclick="return checkModification();">
+ <a href="/tags/overview/${session.get('case').id}"
+ onclick="return checkModification();">
${_('Tags')}
</a>
</li>
% endif
% if g.mpuls_config.is_enabled('case-module', 'appointments'):
<li>
- <a href="${h.url_for(controller='caseappointment',
- action='index',
- id=session.get('case').id)}"
- onclick="return checkModification();">
+ <a href="/caseappointment/index/${session.get('case').id}"
+ onclick="return checkModification();">
${_('cm_menu_link_appointment')}
</a>
</li>
% endif
% if g.mpuls_config.is_enabled('case-module', 'reminders'):
<li>
- <a href="${h.url_for(controller='caseappointment',
- action='newReminder',
- id=session.get('case').id)}"
- onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a>
+ <a href="/caseappointment/newReminder/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a>
</li>
% endif
% if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
- <a href="${h.url_for(controller='logbook',
- action='index',
- id=session.get('case').id)}"
+ <a href="/logbook/index/${session.get('case').id}"
onclick="return checkModification();">
Tagebuch
</a>
@@ -152,18 +129,14 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'documents'):
<li>
- <a href="${h.url_for(controller='casedocument',
- action='index',
- id=session.get('case').id)}"
- onclick="return checkModification();">
+ <a href="/casedocument/index/${session.get('case').id}"
+ onclick="return checkModification();">
${_('cm_menu_link_documents')}
</a>
</li>
% endif
<li>
- <a href="${h.url_for(controller='case', action='printAll',
- id=session.get('case').id,
- confirmed=0)}"
+ <a href="/case/printAll/${session.get('case').id}/0"
onclick="return checkModification();"
target="_blank">${_('cm_menu_link_print')}</a>
</li>
@@ -178,27 +151,27 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='case', action='digest', id=session.get('case').id)}"
+ <a href="/case/digest/${session.get('case').id}"
onclick="return checkModification();">
${_('cm_menu_link_digest')}
</a>
</li>
% if h.hasRole(['cm_ka', 'admin_ka']):
<li>
- <a href="${h.url_for(controller='phase', action='overview', id=session.get('case').id)}"
+ <a href="/phase/overview/${session.get('case').id}"
onclick="return checkModification();">
${_('case_cm_phase')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='case', action='organisation', id=session.get('case').id)}"
+ <a href="/case/organisation/${session.get('case').id}"
onclick="return checkModification();">
${_('cm_menu_link_organisation')}
</a>
</li>
% if g.mpuls_config.is_enabled('case-module', 'appointments'):
<li>
- <a href="${h.url_for(controller='caseappointment', action='index', id=session.get('case').id)}"
+ <a href="/caseappointment/index/${session.get('case').id}"
onclick="return checkModification();">
${_('cm_menu_link_appointment')}
</a>
@@ -206,7 +179,7 @@
% endif
% if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
<li>
- <a href="${h.url_for(controller='logbook', action='index', id=session.get('case').id)}"
+ <a href="/logbook/index/${session.get('case').id}"
onclick="return checkModification();">
Tagebuch
</a>
@@ -214,7 +187,7 @@
% endif
% if g.mpuls_config.is_enabled('case-module', 'documents'):
<li>
- <a href="${h.url_for(controller='casedocument', action='index', id=session.get('case').id)}"
+ <a href="/casedocument/index/${session.get('case').id}"
onclick="return checkModification();">
${_('cm_menu_link_documents')}
</a>
Modified: base/trunk/mpulsweb/templates/casemanagement/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/new.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/new.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,12 +3,12 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='new2')}">${_('cm_np_new')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="/case/new2">${_('cm_np_new')}</a></li>
</%def>
<div class="waska_form">
- <form id="waska_form" action="${h.url_for(controller='/case', action='newAction')}" accept-charset="UTF-8"
+ <form id="waska_form" action="/case/newAction" accept-charset="UTF-8"
name="waska_form" method="POST">
<h1>Neue Fallakte anlegen</h1>
<fieldset>
@@ -84,24 +84,24 @@
## <table>
## <tr>
## <td class="table_row_h">
- ## Arabisch <a href="${h.url_for('/documents/ee_ar.pdf')}">download</a>
+ ## Arabisch <a href="/documents/ee_ar.pdf">download</a>
## </td>
## <td class="table_row_h">
- ## Englisch <a href="${h.url_for('/documents/ee_en.pdf')}">download</a>
+ ## Englisch <a href="/documents/ee_en.pdf">download</a>
## </td>
## </tr>
## <tr>
- ## <td>Polnisch <a href="${h.url_for('/documents/ee_pl.pdf')}">download</a></td>
- ## <td>Russisch <a href="${h.url_for('/documents/ee_ru.pdf')}">download</a></td>
+ ## <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
+ ## <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
## </tr>
## <tr>
## <td class="table_row_h">
- ## Türkisch <a href="${h.url_for('/documents/ee_tr.pdf')}">download</a>
+ ## Türkisch <a href="/documents/ee_tr.pdf">download</a>
## </td>
## <td class="table_row_h">
## Deutsch
## (Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
- ## <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">download</a>
+ ## <a href="/documents/ee_de_ohnetn.pdf">download</a>
## </td>
## </tr>
## </table>
Modified: base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/newAppointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -9,8 +9,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=session.get('case').id)}">${_('app_np_list')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${session.get('case').id}">${_('app_np_list')}</a></li>
<li><a href="#">${_('app_np_new')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='organisation', id=session.get('case').id)}">${_('cm_np_organisation')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/organisation/${session.get('case').id}">${_('cm_np_organisation')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/casemanagement/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/overview.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/overview.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="/case">${_('cm_np_root')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
</%def>
<h1>${_('cm_header_overview')}</h1>
% if h.hasRole(['admin_ka']):
@@ -17,8 +17,7 @@
<%include file="/casemanagement/search.mako" />
${ungettext('%s case was found.', '%s cases where found.', c.count_all) % c.count_all}
<div class="waska_form">
- <form action="${h.url_for(controller='/case_bundle', action='bundleAction')}"
- method="POST">
+ <form action="/case_bundle/bundleAction" method="POST">
<%include file="./caselist.mako" />
% if g.mpuls_config.is_enabled('case-module', 'casebundle'):
<div class="waska_form_element">
Modified: base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/reminderlist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,16 +1,10 @@
<%inherit file="/appointments/remindlist_body.mako" />
<%def name="showAppointmentActions(appointment)">
-<a href="${h.url_for(controller='/caseappointment', action='show',
- id=appointment.id)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
- alt="${_('cm_overview_a_show')}"
- title="${_('cm_overview_a_show')}"></a>
+<a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id)}">
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['cm_ka']):
- <a href="${h.url_for(controller='/caseappointment', action='delete',
- id=appointment.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
- alt="${_('cm_overview_a_delete')}"
- title="${_('cm_overview_a_delete')}">
+ <a href="${h.url_for(controller='/caseappointment', action='delete', id=appointment.id, confirmed=0)}">
+ <img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}">
</a>
% endif
</%def>
Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,9 +1,7 @@
## -*- coding: utf-8 -*-
% if g.mpuls_config.is_enabled('case-module', 'search'):
- <form method="post" name="case_search"
- action="${h.url_for(controller='/case_overview', action='search')}"
- accept-charset="UTF-8">
+ <form method="post" name="case_search" action="/case_overview/search/" accept-charset="UTF-8">
<div class="widget container">
<table>
<tr>
@@ -29,11 +27,11 @@
<td>
<input type="checkbox" name="own" id="show_own" value="1" checked="checked">
<label for="show_own">
- <img title="Eigene Fallakten" alt="Bearbeiter" src="${h.url_for('/images/icons/edit_editor.png')}">Eigene (${c.count_own})
+ <img title="Eigene Fallakten" alt="Bearbeiter" src="/images/icons/edit_editor.png">Eigene (${c.count_own})
</label><br>
<input type="checkbox" name="standin" id="show_other" value="1" checked="checked">
<label for="show_other">
- <img title="Vertreter Fallakten" alt="Vertreter" src="${h.url_for('/images/icons/edit_editors_22.png')}">Vertretung (${c.count_standin})
+ <img title="Vertreter Fallakten" alt="Vertreter" src="/images/icons/edit_editors_22.png">Vertretung (${c.count_standin})
</label>
</td>
</tr>
@@ -43,18 +41,18 @@
<td>
<input type="checkbox" name="state" id="show_open" value="1">
<label for="show_open">
- <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}">Bearbeitbare Fallakten</label><br>
+ <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="/images/icons/edit_22.png">Bearbeitbare Fallakten</label><br>
<input type="checkbox" name="state" id="show_markdelete" value="3" checked="checked">
<label for="show_markdelete">
- <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}">Schwebend gelöscht (${c.count_del})
+ <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
</label><br>
<input type="checkbox" name="state" id="show_markanonymize" value="4" checked="checked">
<label for="show_markanonymize">
- <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Schwebend anonymisiert (${c.count_markanon})
+ <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="/images/icons/anonymise_inactive_22.png">Schwebend anonymisiert (${c.count_markanon})
</label><br>
<input type="checkbox" name="state" id="show_anonymized" value="5" checked="checked">
<label for="show_anonymized">
- <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Anonymisiert (${c.count_anon})
+ <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="/images/icons/anonymise_inactive_22.png">Anonymisiert (${c.count_anon})
</label>
</td>
</tr>
@@ -91,15 +89,12 @@
<td>
<input type="submit" value="${_('cm_form_overview_search_submit')}">
% if c.extended_search:
- <a href="${h.url_for(controller='case_overview',
- action='overview_extended')}">Erweiterte Suche ausblenden</a>
+ <a href="/case_overview/overview_extended/">Erweiterte Suche ausblenden</a>
% else:
- <a href="${h.url_for(controller='case_overview',
- action='overview_extended')}">Erweiterte Suche einblenden</a>
+ <a href="/case_overview/overview_extended/">Erweiterte Suche einblenden</a>
% endif
${h.getHelp('extended_search')}
- <a href="${h.url_for(controller='case_overview', action='overview',
- reset=1)}">Suche zurücksetzen</a>
+ <a href="/case_overview/overview?reset=1">Suche zurücksetzen</a>
</td>
</tr>
</table>
@@ -109,16 +104,14 @@
##<div id="search_field">
-## <form method="post" name="case_search"
-## action="${h.url_for(controller='/case_overview', action='search')}"
-## accept-charset="UTF-8">
+## <form method="post" name="case_search" action="/case_overview/search/" accept-charset="UTF-8">
## <div>
## <input type="text" size="30" name="search_str" maxlength="256">
## <input type="submit" value="${_('cm_form_overview_search_submit')}">
## % if c.extended_search:
-## <a href="${h.url_for(controller='case_overview', action='overview_extended')}">Erweiterte Suche ausblenden</a>
+## <a href="/case_overview/overview_extended/">Erweiterte Suche ausblenden</a>
## % else:
-## <a href="${h.url_for(controller='case_overview', action='overview_extended')}">Erweiterte Suche einblenden</a>
+## <a href="/case_overview/overview_extended/">Erweiterte Suche einblenden</a>
## % endif
## ${h.getHelp('extended_search')}
## </div>
@@ -127,26 +120,26 @@
## % if h.hasRole(['cm_ka']):
## <input type="checkbox" name="show_own" id="show_own" value="1" checked="checked">
## <label for="show_own">
-## <img title="Eigene Fallakten" alt="Bearbeiter" src="${h.url_for('/images/icons/edit_editor.png')}">Eigene (${c.count_own})
+## <img title="Eigene Fallakten" alt="Bearbeiter" src="/images/icons/edit_editor.png">Eigene (${c.count_own})
## </label>
## <input type="checkbox" name="show_other" id="show_other" value="1" checked="checked">
## <label for="show_other">
-## <img title="Vertreter Fallakten" alt="Vertreter" src="${h.url_for('/images/icons/edit_editors_22.png')}">Vertretung (${c.count_standin})
+## <img title="Vertreter Fallakten" alt="Vertreter" src="/images/icons/edit_editors_22.png">Vertretung (${c.count_standin})
## </label>
## % endif
## % if h.hasRole(['admin_ka']):
## <input type="checkbox" name="show_markdelete" id="show_markdelete" value="1" checked="checked">
## <label for="show_markdelete">
-## <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}">Schwebend gelöscht (${c.count_del})
+## <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="/images/icons/delete_inactive_22.png">Schwebend gelöscht (${c.count_del})
## </label>
## <input type="checkbox" name="show_markanonymize" id="show_markanonymize" value="1" checked="checked">
## <label for="show_markanonymize">
-## <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Schwebend anonymisiert (${c.count_markanon})
+## <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="/images/icons/anonymise_inactive_22.png">Schwebend anonymisiert (${c.count_markanon})
## </label>
## % endif
## <input type="checkbox" name="show_anonymized" id="show_anonymized" value="1" checked="checked">
## <label for="show_anonymized">
-## <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}">Anonymisiert (${c.count_anon})
+## <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="/images/icons/anonymise_inactive_22.png">Anonymisiert (${c.count_anon})
## </label>
## </div>
## % if c.extended_search:
@@ -234,12 +227,12 @@
## <td valign="top">
## <input type="checkbox" name="show_open" id="show_open" value="1" checked="checked">
## <label for="show_open">
-## <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}">Bearbeitbare Fallakten
+## <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="/images/icons/edit_22.png">Bearbeitbare Fallakten
## </label>
## <!--
## <input type="checkbox" name="show_closed" id="show_closed" value="1" checked="checked">
## <label for="show_closed">
-## <img title="Geschlossene Fallakten" alt="Geschlossene" src="${h.url_for('/images/icons/done_grey.gif')}">Geschlossen
+## <img title="Geschlossene Fallakten" alt="Geschlossene" src="/images/icons/done_grey.gif">Geschlossen
## </label>
## -->
## </td>
Modified: base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,9 +1,9 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=c.appointment.case_id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('app_np_list')}</a></li>
- <li><a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id)}">${_('app_np_show')}</a></li>
+ <li><a href="/case/select/${c.appointment.case_id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/caseappointment/index/${c.appointment.case_id}">${_('app_np_list')}</a></li>
+ <li><a href="/caseappointment/show/${c.appointment.id}">${_('app_np_show')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
Modified: base/trunk/mpulsweb/templates/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/confirm.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/dialogs/confirm.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/question.png')}" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
+<h1><img src="/images/icons/info/question.png" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
<p>${h.literal(c.dialog_text or c.question)}</p>
<a class="button" href="${c.url_yes}">${_('dialog_header_confirm_option_yes')}</a>
<a class="button" href="${c.url_no}">${_('dialog_header_confirm_option_no')}</a>
Modified: base/trunk/mpulsweb/templates/dialogs/failed.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/failed.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/dialogs/failed.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/failure.png')}" alt="Fehler" width="48" height="48"/>${c.dialog_title | F.NA}</h1>
+<h1><img src="/images/icons/info/failure.png" alt="Fehler" width="48" height="48"/>${c.dialog_title | F.NA}</h1>
<p>${h.literal(c.dialog_text) | F.NA}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/dialogs/notification.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/notification.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/dialogs/notification.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/alert.png')}" alt="Achtung"/>${c.dialog_title}</h1>
+<h1><img src="/images/icons/info/alert.png" alt="Achtung"/>${c.dialog_title}</h1>
<p>${c.dialog_text}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_notification_option_ok')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/dialogs/success.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/success.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/dialogs/success.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
## -*- coding: utf-8 -*-
<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title or c.success_for | F.NA}</h1>
+<h1><img src="/images/icons/info/confirmation.png" alt="Erledigt"/>${c.dialog_title or c.success_for | F.NA}</h1>
<p>${c.dialog_text or c.success_text | F.NA}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
</div>
Modified: base/trunk/mpulsweb/templates/documents/case_new.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_new.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/case_new.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,17 +3,17 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
- <a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">
+ <a href="/case/select/${session.get('case').id}/1">
${_('cm_np_select')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
+ <a href="/casedocument/index/${session.get('case').id}">
${_('cm_np_doc_overview')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='/casedocument', action='new')}">
+ <a href="/casedocument/new">
${_('cm_np_doc_upload')}
</a>
</li>
@@ -27,7 +27,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
+ <a href="/casedocument/index/${session.get('case').id}">
${_('cm_menu_link_document_back')}
</a>
</li>
Modified: base/trunk/mpulsweb/templates/documents/case_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_overview.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/case_overview.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,12 +3,12 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
- <a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">
+ <a href="/case/select/${session.get('case').id}/1">
${_('cm_np_select')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
+ <a href="/casedocument/index/${session.get('case').id}">
${_('cm_np_doc_overview')}
</a>
</li>
@@ -22,7 +22,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/casedocument', action='new')}">${_('cm_actions_link_doc_new')}</a></li>
+ <li><a href="/casedocument/new/">${_('cm_actions_link_doc_new')}</a></li>
</ul>
</div>
</div>
@@ -48,16 +48,16 @@
%>
% for num, f in enumerate(c.files):
<tr class="${num%2 and 'hl' or ''}">
- <td>${ f.getName() | F.shorten}</td>
+ <td>${ f.getName() | F.shorten, h}</td>
<td class="number_field">${kb(f.size)} KB</td>
<td class="actions">
- <a href="${h.url_for(controller='/casedocument', action='show', id=f.id, url=f.getName())}"
+ <a href="/casedocument/show/${f.id}/${f.getName() | F.H}"
target="_blank">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
+ <img src="/images/icons/open_active_22.png" border="0"
alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['cm_ka']):
- <a href="${h.url_for(controller='/casedocument', action='delete', id=f.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
+ <a href="/casedocument/delete/${f.id}/0">
+ <img src="/images/icons/delete_active_22.png" border="0"
alt="${_('cm_overview_a_delete')}"
title="${_('cm_overview_a_delete')}">
</a>
Modified: base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='overview')}">${_('doc_np_overview')}</a></li>
+ <li><a href="/document/overview">${_('doc_np_overview')}</a></li>
<li><a href="#">${_('doc_np_delete')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_doc_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
<li><a href="#">${_('cm_np_delete_attachment_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
+ <li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
<li><a href="#">${_('cm_np_delete_document_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_doc_overview')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_doc_overview')}</a></li>
<li><a href="#">${_('cm_np_doc_failed')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('doc_np_upload')}</a></li>
+ <li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
+ <li><a href="/document/globalUpload">${_('doc_np_upload')}</a></li>
<li><a href="#">${_('cm_np_doc_failed')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,7 +1,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('cm_np_att_overview')}</a></li>
+ <li><a href="/casedocument/index/${session.get('case').id}">${_('cm_np_att_overview')}</a></li>
<li><a href="#">${_('cm_np_attachment_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,8 +1,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('doc_np_upload')}</a></li>
+ <li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
+ <li><a href="/document/globalUpload">${_('doc_np_upload')}</a></li>
<li><a href="#">${_('cm_np_doc_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_overview.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/global_overview.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,7 +3,7 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
+ <li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -13,7 +13,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}"> ${_('doc_actions_link_new')}</a></li>
+ <li><a href="/document/globalUpload/"> ${_('doc_actions_link_new')}</a></li>
</ul>
</div>
@@ -34,16 +34,16 @@
% if idset==0:
<tr>
<td>
- <a href="${h.url_for(controller='/document', action='globalShow', id=f.id, url=f.getName())}" target="_blank">${ f.getName() | F.shorten}</a>
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${ f.getName() | F.shorten, h}</a>
</td>
<td class="number_field">
${kb(f.size)} KB
</td>
<td class="table_action">
- <a href="${h.url_for(controller='/document', action='globalShow', id=f.id, url=f.getName())}" target="_blank"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}"
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['admin_ka']):
- <a href="${h.url_for(controller='/document', action='globalDelete', id=f.id)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
% endif
</td>
</tr>
@@ -51,16 +51,16 @@
% else:
<tr class="table_row_h">
<td>
- <a href="${h.url_for(controller='/document', action='globalShow', id=f.id, url=f.getName())}" target="_blank">${ f.getName() | F.shorten}</a>
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank">${ f.getName() | F.shorten, h}</a>
</td>
<td class="number_field">
${kb(f.size)} KB
</td>
<td class="table_action">
- <a href="${h.url_for(controller='/document', action='globalShow', id=f.id, url=f.getName())}" target="_blank"><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}"
+ <a href="/document/globalShow/${f.id}/${f.getName() | F.H}" target="_blank"><img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}"
title="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% if h.hasRole(['admin_ka']):
- <a href="${h.url_for(controller='/document', action='globalDelete', id=f.id)}"><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
+ <a href="/document/globalDelete/${f.id}"><img src="/images/icons/delete_active_22.png" border="0" alt="${_('cm_overview_a_delete')}" title="${_('cm_overview_a_delete')}"></a>
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/documents/global_upload.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_upload.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/documents/global_upload.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('doc_np_overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('doc_np_upload')}</a></li>
+ <li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
+ <li><a href="/document/globalUpload">${_('doc_np_upload')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/evaluation/evaluate.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/evaluate.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/evaluation/evaluate.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -4,8 +4,8 @@
<div>
##<div class="widget modusfield actions">
## <ul>
- ## <li><a href="${h.url_for(controller='/administration', action='resetPassword', id=c.user.id)}">${_('Reset password')}</a></li>
- ## <li><a href="${h.url_for(controller='/administration', action='listUsers')}">${_('Back to userlist')}</a></li>
+ ## <li><a href="/administration/resetPassword/${c.user.id}">${_('Reset password')}</a></li>
+ ## <li><a href="/administration/listUsers">${_('Back to userlist')}</a></li>
## </ul>
##</div>
<div class="header">
@@ -13,7 +13,7 @@
</div>
</div>
<div>
-<form action="${h.url_for(controller='/evaluate', action='evaluateAction')}" method="POST" target="_blank">
+<form action="/evaluate/evaluateAction" method="POST" target="_blank">
<input type="hidden" name="id">
<table>
<tr>
@@ -56,7 +56,7 @@
<tr>
<td class="label">${_('Filter')}</td>
<td>
- Yes (<a href="${h.url_for(controller='/evaluate', action='resetFilter', id=c.evalconfig.get_setid())}">Reset</a>)<br>
+ Yes (<a href="/evaluate/resetFilter/${c.evalconfig.get_setid()}">Reset</a>)<br>
${session['evaluation.options'].get('sql')}
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/evaluation/evaluate_adele.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -4,8 +4,8 @@
<div>
##<div class="widget modusfield actions">
## <ul>
- ## <li><a href="${h.url_for(controller='/administration', action='resetPassword', id=c.user.id)}">${_('Reset password')}</a></li>
- ## <li><a href="${h.url_for(controller='/administration', action='listUsers')}">${_('Back to userlist')}</a></li>
+ ## <li><a href="/administration/resetPassword/${c.user.id}">${_('Reset password')}</a></li>
+ ## <li><a href="/administration/listUsers">${_('Back to userlist')}</a></li>
## </ul>
##</div>
<div class="header">
@@ -13,7 +13,7 @@
</div>
</div>
<div>
-<form action="${h.url_for(controller='/evaluate', action='evaluateAction')}" method="POST" target="_blank">
+<form action="/evaluate/evaluateAction" method="POST" target="_blank">
<input type="hidden" name="id">
<table>
<tr>
@@ -55,7 +55,7 @@
<tr>
<td class="label">${_('Filter')}</td>
<td>
- Yes (<a href="${h.url_for(controller='/evaluate', action='resetFilter', id=c.evalconfig.get_setid())}">Reset</a>)<br>
+ Yes (<a href="/evaluate/resetFilter/${c.evalconfig.get_setid()}">Reset</a>)<br>
${session['evaluation.options'].get('sql')}
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/evaluation/result.mako
===================================================================
--- base/trunk/mpulsweb/templates/evaluation/result.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/evaluation/result.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -7,29 +7,18 @@
<meta http-equiv="content-style-type" content="text/css">
<meta http-equiv="expires" content="0">
- <link rel="shortcut icon" type="image/x-icon"
- href="${h.url_for('/images/kompetenz3.ico')}">
- <link href="${h.url_for('/styles/all.css')}" media="all"
- rel="stylesheet" type="text/css">
- <link href="${h.url_for('/styles/screen.css')}" media="screen"
- rel="stylesheet" type="text/css">
- <link href="${h.url_for('/styles/print.css')}" media="print"
- rel="stylesheet" type="text/css">
+ <link rel="shortcut icon" type="image/x-icon" href="/images/kompetenz3.ico">
+ <link href="/styles/all.css" media="all" rel="stylesheet" type="text/css">
+ <link href="/styles/screen.css" media="screen" rel="stylesheet" type="text/css">
+ <link href="/styles/print.css" media="print" rel="stylesheet" type="text/css">
</head>
<body>
<div id="content_header_large">
<div id="modusfield">
<div class="actions">
<ul>
- ## In the following two url_for calls for /evaluate/exportXML
- ## and /evaluate/exportXML, the filename is not actually an
- ## id, but as far as routing is concerned, it is one.
- <li><a href="${h.url_for(controller='/evaluate', action='exportXML',
- id='evaluation_export.xml')}"
- target="_blank">${_('Export XML')}</a></li>
- <li><a href="${h.url_for(controller='/evaluate', action='exportCSV',
- id='evaluation_export.csv')}"
- target="_blank">${_('Export CSV')}</a></li>
+ <li><a href="/evaluate/exportXML/evaluation_export.xml" target="_blank">${_('Export XML')}</a></li>
+ <li><a href="/evaluate/exportCSV/evaluation_export.csv" target="_blank">${_('Export CSV')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/formularpage/formular.mako
===================================================================
--- base/trunk/mpulsweb/templates/formularpage/formular.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/formularpage/formular.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -4,17 +4,11 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select',
- id=session.get('case').id, confirmed=1)}"
- onclick="return checkModification();">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1" onclick="return checkModification();">${_('cm_np_select')}</a></li>
% if session.get('render_mode') == 'ro':
- <li><a href="${h.url_for(controller='/formularpage', action='show',
- id=c.page_id)}"
- onclick="return checkModification();">${h.get_pagename(c.page_id)}</a></li>
+ <li><a href="/formularpage/show/${c.page_id}" onclick="return checkModification();">${h.get_pagename(c.page_id)}</a></li>
% else:
- <li><a href="${h.url_for(controller='/formularpage', action='edit',
- id=c.page_id)}"
- onclick="return checkModification();">${h.get_pagename(c.page_id)}</a></li>
+ <li><a href="/formularpage/edit/${c.page_id}" onclick="return checkModification();">${h.get_pagename(c.page_id)}</a></li>
% endif
</%def>
@@ -31,18 +25,12 @@
<ul>
% if h.hasRole(['cm_ka']) and session.get('case').getState().state not in (3,4,5):
% if session.get('render_mode') == 'ro':
- <li><a href="${h.url_for(controller='/formularpage', action='edit',
- id=c.page_id)}"
- onclick="return checkModification();"> ${_('cm_actions_link_edit')}</a></li>
+ <li><a href="/formularpage/edit/${c.page_id}" onclick="return checkModification();"> ${_('cm_actions_link_edit')}</a></li>
% else:
- <li><a href="${h.url_for(controller='/formularpage', action='show',
- id=c.page_id)}"
- onclick="return checkModification();"> ${_('cm_actions_link_show')}</a></li>
+ <li><a href="/formularpage/show/${c.page_id}" onclick="return checkModification();"> ${_('cm_actions_link_show')}</a></li>
% endif
% endif
- <li><a href="${h.url_for(controller='/formularpage', action='printout',
- id=c.page_id)}"
- target="_blank" onclick="return checkModification();"> ${_('cm_actions_link_printout')}</a></li>
+ <li><a href="/formularpage/printout/${c.page_id}" target="_blank" onclick="return checkModification();"> ${_('cm_actions_link_printout')}</a></li>
</ul>
</div>
</div>
Modified: base/trunk/mpulsweb/templates/home/caseappointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/caseappointmentlist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/home/caseappointmentlist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,13 +3,13 @@
%if appointment.case_id:
% if appointment.type == 0:
<a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% else:
<a href="${h.url_for(controller='/case', action='select', id=appointment.case_id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% endif
% else:
<a href="${h.url_for(controller='/caseappointment', action='show', id=appointment.id)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
% endif
</%def>
Modified: base/trunk/mpulsweb/templates/home/globalappointmentlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/globalappointmentlist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/home/globalappointmentlist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,9 +1,7 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="showAppointmentActions(appointment)">
<a href="${h.url_for(controller='/appointment', action='show', id=appointment.id)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
- alt="${_('cm_overview_a_show')}"
- title="${_('cm_overview_a_show')}"></a>
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
</%def>
<table class="appointment">
Modified: base/trunk/mpulsweb/templates/home/remindlist.mako
===================================================================
--- base/trunk/mpulsweb/templates/home/remindlist.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/home/remindlist.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,14 +1,9 @@
<%inherit file="/appointments/remindlist_body.mako" />
<%def name="showAppointmentActions(appointment)">
- <a href="${h.url_for(controller='/case', action='select',
- id=appointment.case_id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0"
- alt="${_('cm_overview_a_show')}"
- title="${_('cm_overview_a_show')}"></a>
+ <a href="${h.url_for(controller='/case', action='select', id=appointment.case_id, confirmed=0)}">
+ <img src="/images/icons/open_active_22.png" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
</%def>
<%def name="showKeepActiveActions(appointment)">
<a href="${h.url_for(controller='/case', action='keepActive', id=appointment.case_id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/refresh_active_22.png')}" border="0"
- alt="${_('cm_overview_a_keepactive')}"
- title="${_('cm_overview_a_keepactive')}"></a>
+ <img src="/images/icons/refresh_active_22.png" border="0" alt="${_('cm_overview_a_keepactive')}" title="${_('cm_overview_a_keepactive')}"></a>
</%def>
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag löschen</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_create_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag vornehmen</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag löschen fehlgeschlagen</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_save_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag speichern fehlgeschlagen</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/failed_show_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag ansehen fehlgeschlagen</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/success_create_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag vornehmen</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/success_delete_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag löschen erfolgreich</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/dialogs/success_save_logbook_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#">Eintrag abspeichern</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/logbook/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/edit.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/edit.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -8,8 +8,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#"></a>Eintrag bearbeiten</li>
</%def>
<div id="content_header_small">
@@ -19,7 +19,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/logbook', action='show', id=c.entry.id)}">Zurück zu: Eintrag ansehen</a></li>
+ <li><a href="/logbook/show/${c.entry.id}">Zurück zu: Eintrag ansehen</a></li>
</ul>
</div>
</div>
@@ -27,8 +27,7 @@
${self.buildFormErrors(formular_labels)}
<div id="appointment">
<div id="waska_form">
- <form action="${h.url_for(controller='/logbook', action='editAction')}"
- accept-charset="UTF-8" method="POST">
+ <form action="/logbook/editAction" accept-charset="UTF-8" method="POST">
<%include file="../logbook/edit_body.mako" />
<input type="hidden" name="id">
</form>
Modified: base/trunk/mpulsweb/templates/logbook/new.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/new.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/new.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -8,8 +8,8 @@
%>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#"></a>Eintrag vornehmen</li>
</%def>
<div id="content_header_small">
@@ -19,7 +19,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Zurück zu: Tagebuch</a></li>
+ <li><a href="/logbook/index/${session.get('case').id}">Zurück zu: Tagebuch</a></li>
</ul>
</div>
</div>
@@ -27,8 +27,7 @@
${self.buildFormErrors(formular_labels)}
<div id="appointment">
<div id="waska_form">
- <form action="${h.url_for(controller='/logbook', action='newAction')}"
- accept-charset="UTF-8" method="POST">
+ <form action="/logbook/newAction" accept-charset="UTF-8" method="POST">
<%include file="../logbook/edit_body.mako" />
</form>
</div>
Modified: base/trunk/mpulsweb/templates/logbook/overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/overview.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
</%def>
<div id="content_header_small">
@@ -25,52 +25,20 @@
<table class="appointment">
<tr>
<th class="date table_header_h">Datum
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='datum',
- sort_order='asc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='datum',
- sort_order='desc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=datum&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=datum&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a>
</th>
<th class="title table_header_h">Bearbeiter
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='nachname',
- sort_order='asc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='nachname',
- sort_order='desc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=nachname&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=nachname&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a>
</th>
<th class="title table_header_h">Art
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='art',
- sort_order='asc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='art',
- sort_order='desc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=art&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=art&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a>
</th>
<th class="title table_header_h">Dauer (min)
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='dauer',
- sort_order='asc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_asc.png')}" alt=""></a>
- <a href="${h.url_for(controller='/logbook', action='index',
- id=session.get('case').id, sort_field='dauer',
- sort_order='desc')}"
- ><img class="sorticon"
- src="${h.url_for('/images/icons/sort_desc.png')}" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=dauer&sort_order=asc"><img class="sorticon" src="/images/icons/sort_asc.png" alt=""></a>
+ <a href="/logbook/index/${session.get('case').id}?sort_field=dauer&sort_order=desc"><img class="sorticon" src="/images/icons/sort_desc.png" alt=""></a>
</th>
<th class="action table_header_h">${_('app_overview_tbl_header_actions')}</th>
</tr>
@@ -83,10 +51,10 @@
<td class="title">${entry.getDuration() | h}</td>
<td class="action">
<a href="${h.url_for(controller='/logbook', action='show', id=entry.id)}">
- <img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="Eintrag ansehen" title="Eintrag ansehen"></a>
+ <img src="/images/icons/open_active_22.png" border="0" alt="Eintrag ansehen" title="Eintrag ansehen"></a>
% if h.hasRole(['cm_ka']) and entry.getKindAsInt() != 0:
<a href="${h.url_for(controller='/logbook', action='delete', id=entry.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0" alt="Eintrag löschen" title="Eintrag löschen"></a>
+ <img src="/images/icons/delete_active_22.png" border="0" alt="Eintrag löschen" title="Eintrag löschen"></a>
% endif
</td>
</tr>
Modified: base/trunk/mpulsweb/templates/logbook/overview_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview_print.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/overview_print.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/logbook/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#"></a>Einträge</a></li>
</%def>
<div id="content_header_small">
@@ -15,7 +15,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/case', action='logbook', id=session.get('case').id)}">Zurück zu: Tagebuch</a>
+ <a href="/case/logbook/${session.get('case').id}">Zurück zu: Tagebuch</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/logbook/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/show.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/logbook/show.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Tagebuch</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/logbook/index/${session.get('case').id}">Tagebuch</a></li>
<li><a href="#"></a>Tagebucheintrag</a></li>
</%def>
<div id="content_header_small">
@@ -21,7 +21,7 @@
</li>
% endif
<li>
- <a href="${h.url_for(controller='/logbook', action='index', id=session.get('case').id)}">Zurück zu: Tagebuch</a>
+ <a href="/logbook/index/${session.get('case').id}">Zurück zu: Tagebuch</a>
</li>
</ul>
</div>
Modified: base/trunk/mpulsweb/templates/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/main.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/main.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -177,8 +177,7 @@
<ul>
% for eval in g.mpuls_config.get('evaluations', 'enabled'):
<li>
- <a href="${h.url_for(controller='/evaluate', action='evaluate',
- id=eval.get('id'))}">${eval.get('name')}</a>
+ <a href="/evaluate/evaluate/${eval.get('id')}">${eval.get('name')}</a>
</li>
% endfor
</ul>
Modified: base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/phase/dialogs/success_set_phase.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,27 +3,27 @@
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}">${_('cm_np_select')}</a></li>
<li><a href="#">${_('case_cm_phase')}</a></li>
</%def>
<div class="dialog" />
- <h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
+ <h1><img src="/images/icons/info/confirmation.png" alt="Erledigt"/>${c.dialog_title | F.NA}</h1>
<p>${c.dialog_text | F.NA}</p>
<div class="import_box_dialog">
<p>
Beachten Sie, dass bei einem Phasenwechsel die Fallakte in ausgedruckter
Form dem Jugendlichen ausgehändigt werden sollte. Weitere Informationen
dazu finden Sie in der
- <a href="${h.url_for(controller='/case', action='showhelp', id='datenschutz_veraenderte_daten')}" target="_blank">Hilfe</a>
+ <a href="/case/showhelp/datenschutz_veraenderte_daten" target="_blank">Hilfe</a>
</p>
<p class="import_p">
<strong class="import_number">1.</strong> Fallakte drucken:
- <a class="button import" href="${h.url_for(controller='/case', action='printAll', id=session.get('case').id, confirmed=0)}" target="_blank">Drucken</a>
+ <a class="button import" href="/case/printAll/${session.get('case').id}/0" target="_blank">Drucken</a>
</p>
% if g.mpuls_config.is_enabled('case-module', 'phase'):
<p class="import_p">
<strong class="export_number">2.</strong> Phasenwechsel im Falltagebuch dokumentieren:
- <a class="button import" href="${h.url_for(controller='/logbook', action='new', id=session.get('case').id)}">Falltagebuch</a>
+ <a class="button import" href="/logbook/new/${session.get('case').id}">Falltagebuch</a>
</p>
% endif
<p><strong>oder</strong></p>
Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/phase/phase.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}">${_('cm_np_select')}</a></li>
<li><a href="#">${_('case_cm_phase')}</a></li>
</%def>
Modified: base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html
===================================================================
--- base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/default/privacy_statement.html 2010-05-31 10:01:03 UTC (rev 2817)
@@ -12,12 +12,9 @@
<meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
<meta http-equiv="content-style-type" content="text/css">
<meta http-equiv="expires" content="0">
-<link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet"
- type="text/css">
-<link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet"
- type="text/css">
-<link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet"
- type="text/css">
+<link href="/styles/all.css" media="all" rel="stylesheet" type="text/css">
+<link href="/styles/print.css" media="screen" rel="stylesheet" type="text/css">
+<link href="/styles/print.css" media="print" rel="stylesheet" type="text/css">
<style type="text/css">
.statement_content {
width: 90%;
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/accept_success.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../casemanagement/main.mako"/>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/confirm.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
<li><a href="#">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_failed.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako"/>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/decline_success.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="../../main.mako"/>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/case', action='setStatement', id=session.get('case').id, confirmed=0)}">${_('statement_np_edit')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/case/setStatement/${session.get('case').id}/0">${_('statement_np_edit')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/case_overview')}">${_('cm_np_overview')}</a></li>
+ <li><a href="/case/">${_('cm_np_root')}</a></li>
+ <li><a href="/case_overview">${_('cm_np_overview')}</a></li>
<li><a href="#">${_('cm_np_show')}</a></li>
</%def>
<%include file="missing_statement_body.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<div class="dialog" />
-<h1><img src="${h.url_for('/images/icons/info/info.png')}" alt="" width="48" height="48" />${_('statement_dialog_header_statement_no')}</h1>
+<h1><img src="/images/icons/info/info.png" alt="" width="48" height="48" />${_('statement_dialog_header_statement_no')}</h1>
<p>${_('statement_dialog_p_statement_no_explanation')}</p>
% if h.hasRole(['cm_ka']):
<p>${h.literal(_('statement_dialog_p_options') % h.link_to(_('statement_edit_a_statement_form_printversion'), h.url_for(controller="/privacy", action="printStatement", id=c.ds_id)))}
@@ -22,7 +22,7 @@
</p>
% else:
<p>
- <a class="button" href="${h.url_for(controller='/case', action='select', id=c.ds_id, confirmed=1)}">${_('statement_dialog_a_ok')}</a>
+ <a class="button" href="/case/select/${c.ds_id}/1">${_('statement_dialog_a_ok')}</a>
</p>
% endif
Modified: base/trunk/mpulsweb/templates/privacy/edit_statement.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/edit_statement.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/edit_statement.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,7 +2,7 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
<li><a href="#">${_('statement_np_edit')}</a></li>
</%def>
<%include file="dialogs/missing_statement_body.mako" />
Modified: base/trunk/mpulsweb/templates/privacy/list_statements.mako
===================================================================
--- base/trunk/mpulsweb/templates/privacy/list_statements.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/privacy/list_statements.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/privacy', action='listStatements')}">${_('statement_np_list_statements')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/privacy/listStatements">${_('statement_np_list_statements')}</a></li>
</%def>
<h1>${_('Avaliable statements')}</h1>
<div class="widget container">
Modified: base/trunk/mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako
===================================================================
--- base/trunk/mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,8 +2,8 @@
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/formularpage', action='edit', id=session.get('case').getPageId())}" onclick="return checkModification();">${h.get_pagename(session.get('case').getPageId())}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/formularpage/edit/${session.get('case').getPageId()}" onclick="return checkModification();">${h.get_pagename(session.get('case').getPageId())}</a></li>
<li><a href="#">Eintrag löschen</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/settings/dialogs/success_edit.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -2,9 +2,9 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/administration')}">${_('adm_np_root')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='showSettings')}">${_('adm_np_showsettings')}</a></li>
- <li><a href="${h.url_for(controller='/administration', action='editSettings')}">${_('adm_np_editsettings')}</a></li>
+ <li><a href="/administration">${_('adm_np_root')}</a></li>
+ <li><a href="/administration/showSettings">${_('adm_np_showsettings')}</a></li>
+ <li><a href="/administration/editSettings">${_('adm_np_editsettings')}</a></li>
<li><a href="#">${_('adm_np_editsettings_success')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/settings/edit.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -9,13 +9,13 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
- <a href="${h.url_for(controller='/settings')}">${_('adm_np_root')}</a>
+ <a href="/settings">${_('adm_np_root')}</a>
</li>
<li>
- <a href="${h.url_for(controller='/settings', action='show')}">${_('adm_np_showsettings')}</a>
+ <a href="/settings/show">${_('adm_np_showsettings')}</a>
</li>
<li>
- <a href="${h.url_for(controller='/settings', action='edit')}">${_('adm_np_editsettings')}</a>
+ <a href="/settings/edit">${_('adm_np_editsettings')}</a>
</li>
</%def>
@@ -41,7 +41,7 @@
<div id="admin_edit_settings">
<p>${_('adm_con_es_editsettings')}</p>
<div class="waska_form">
- <form action="${h.url_for(controller='/settings', action='editAction')}" method="POST">
+ <form action="/settings/editAction" method="POST">
<fieldset>
<legend>Angaben zur Einrichtung</legend>
<div class="waska_form_element w30">
@@ -106,7 +106,7 @@
<div class="waska_form_element w100">
% if c.form_errors.get('anon_transfer'):
<a href="#error_list">
- <img class="smallicon" alt="" src="${h.url_for('/images/icons/info/failure_22.png')}">
+ <img class="smallicon" alt="" src="/images/icons/info/failure_22.png">
</a>
% endif
% if c.agency.isAnonTransfer():
Modified: base/trunk/mpulsweb/templates/settings/show.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/show.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/settings/show.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -4,10 +4,10 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
- <a href="${h.url_for(controller='/settings')}">${_('adm_np_root')}</a>
+ <a href="/settings">${_('adm_np_root')}</a>
</li>
<li>
- <a href="${h.url_for(controller='/settings', action='show')}">${_('adm_np_showsettings')}</a>
+ <a href="/settings/show">${_('adm_np_showsettings')}</a>
</li>
</%def>
@@ -19,7 +19,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/settings', action='edit')}">
+ <a href="/settings/edit">
${_('adm_actions_link_editsettings')}
</a>
</li>
Modified: base/trunk/mpulsweb/templates/tags/tags.mako
===================================================================
--- base/trunk/mpulsweb/templates/tags/tags.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/tags/tags.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -3,8 +3,8 @@
<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
- <li><a href="${h.url_for(controller='/tags', action='tags', id=session.get('case').id)}">${_('Tags')}</a></li>
+ <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
+ <li><a href="/tags/tags/${session.get('case').id}">${_('Tags')}</a></li>
</%def>
<div id="content_header_small">
Modified: base/trunk/mpulsweb/templates/usersettings/show_settings.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/show_settings.mako 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb/templates/usersettings/show_settings.mako 2010-05-31 10:01:03 UTC (rev 2817)
@@ -10,9 +10,9 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/usersettings', action='changePassword', id=h.getUserId())}"> ${_('usersettings_a_change_pw')}</a></li>
+ <li><a href="/usersettings/changePassword/${h.getUserId()}"> ${_('usersettings_a_change_pw')}</a></li>
% if h.hasRole(['cm_ka']):
- <li><a href="${h.url_for(controller='/usersettings', action='editStandin', id=h.getUserId())}"> ${_('usersettings_a_change_replace')}</a></li>
+ <li><a href="/usersettings/editStandin/${h.getUserId()}"> ${_('usersettings_a_change_replace')}</a></li>
% endif
</ul>
</div>
Modified: base/trunk/mpulsweb.egg-info/PKG-INFO
===================================================================
--- base/trunk/mpulsweb.egg-info/PKG-INFO 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb.egg-info/PKG-INFO 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: mpulsweb
-Version: 2.0.0-predev
+Version: 0.1dev-r1532
Summary: mpuls ist ein Web-Applikations-Rahmen zur Verwaltung von elektronischen Fallakten (Schwerpunkt Sozialinformatik)
Home-page: http://wald.intevation.org/projects/mpuls/
Author: Intevation GmbH
Modified: base/trunk/mpulsweb.egg-info/SOURCES.txt
===================================================================
--- base/trunk/mpulsweb.egg-info/SOURCES.txt 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb.egg-info/SOURCES.txt 2010-05-31 10:01:03 UTC (rev 2817)
@@ -4,14 +4,15 @@
LICENSE
MANIFEST.in
README.txt
+default.json
development.ini
setup.cfg
setup.py
+wasko.json
docs/index.txt
ez_setup/README.txt
ez_setup/__init__.py
mpulsweb/__init__.py
-mpulsweb/websetup.py
mpulsweb.egg-info/PKG-INFO
mpulsweb.egg-info/SOURCES.txt
mpulsweb.egg-info/dependency_links.txt
@@ -22,7 +23,6 @@
mpulsweb.egg-info/top_level.txt
mpulsweb/config/__init__.py
mpulsweb/config/environment.py
-mpulsweb/config/importer.py
mpulsweb/config/middleware.py
mpulsweb/config/routing.py
mpulsweb/controllers/__init__.py
@@ -30,40 +30,26 @@
mpulsweb/controllers/annotations.py
mpulsweb/controllers/appointment.py
mpulsweb/controllers/auth.py
-mpulsweb/controllers/case.py
-mpulsweb/controllers/case_bundle.py
-mpulsweb/controllers/case_overview.py
-mpulsweb/controllers/caseappointment.py
-mpulsweb/controllers/casedocument.py
mpulsweb/controllers/document.py
mpulsweb/controllers/error.py
-mpulsweb/controllers/evaluate.py
mpulsweb/controllers/formularpage.py
mpulsweb/controllers/help.py
mpulsweb/controllers/info.py
-mpulsweb/controllers/logbook.py
mpulsweb/controllers/mpuls.py
mpulsweb/controllers/navigation.py
mpulsweb/controllers/news.py
-mpulsweb/controllers/phase.py
-mpulsweb/controllers/privacy.py
mpulsweb/controllers/repeatgroup.py
mpulsweb/controllers/settings.py
-mpulsweb/controllers/tags.py
mpulsweb/controllers/usersettings.py
mpulsweb/lib/__init__.py
-mpulsweb/lib/anonymize.py
mpulsweb/lib/app_globals.py
mpulsweb/lib/base.py
mpulsweb/lib/config.py
mpulsweb/lib/db.py
mpulsweb/lib/dialogs.py
-mpulsweb/lib/evaluation.py
-mpulsweb/lib/export.py
mpulsweb/lib/helpers.py
mpulsweb/lib/navigation.py
mpulsweb/lib/renderer.py
-mpulsweb/lib/search.py
mpulsweb/lib/security.py
mpulsweb/lib/timelog.py
mpulsweb/lib/validators.py
@@ -73,12 +59,8 @@
mpulsweb/model/agencysettings.py
mpulsweb/model/annotations.py
mpulsweb/model/appointment.py
-mpulsweb/model/case.py
mpulsweb/model/document.py
-mpulsweb/model/logbook.py
mpulsweb/model/news.py
-mpulsweb/model/phase.py
-mpulsweb/model/statement.py
mpulsweb/model/user.py
mpulsweb/templates/base.mako
mpulsweb/templates/main.mako
@@ -155,15 +137,296 @@
mpulsweb/templates/usersettings/dialogs/success_edit_standin.mako
mpulsweb/tests/__init__.py
mpulsweb/tests/functional/__init__.py
-mpulsweb/tests/functional/test_administration.py
-mpulsweb/tests/functional/test_appointment.py
mpulsweb/tests/functional/test_auth.py
-mpulsweb/tests/functional/test_case.py
-mpulsweb/tests/functional/test_case_overview.py
-mpulsweb/tests/functional/test_caseappointment.py
-mpulsweb/tests/functional/test_casedocument.py
-mpulsweb/tests/functional/test_document.py
-mpulsweb/tests/functional/test_logbook.py
mpulsweb/tests/functional/test_mpuls.py
-mpulsweb/tests/functional/test_phase.py
-mpulsweb/tests/functional/test_usersettings.py
\ No newline at end of file
+waskaweb/__init__.py
+waskaweb/websetup.py
+waskaweb/controllers/CaseBase.py
+waskaweb/controllers/__init__.py
+waskaweb/controllers/administration.py
+waskaweb/controllers/case.py
+waskaweb/controllers/case_overview.py
+waskaweb/controllers/caseappointment.py
+waskaweb/controllers/casedocument.py
+waskaweb/controllers/caselifetime.py
+waskaweb/controllers/evaluate.py
+waskaweb/controllers/logbook.py
+waskaweb/controllers/phase.py
+waskaweb/controllers/statement.py
+waskaweb/controllers/waska.py
+waskaweb/converter/__init__.py
+waskaweb/converter/wasko_v1v2.py
+waskaweb/i18n/waskaweb.pot
+waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+waskaweb/lib/__init__.py
+waskaweb/lib/base.py
+waskaweb/lib/csv.py
+waskaweb/lib/evaluation.py
+waskaweb/lib/excel.py
+waskaweb/lib/exportselection.py
+waskaweb/lib/search.py
+waskaweb/lib/sql_helper.py
+waskaweb/lib/uuid.py
+waskaweb/lib/validators.py
+waskaweb/lib/xmlexport.py
+waskaweb/lib/xmlhelper.py
+waskaweb/lib/xmlimport.py
+waskaweb/model/__init__.py
+waskaweb/model/appointment.py
+waskaweb/model/case.py
+waskaweb/model/casexml.py
+waskaweb/model/data.py
+waskaweb/model/exprtree.py
+waskaweb/model/logbook.py
+waskaweb/model/nodecomponents.py
+waskaweb/model/phase.py
+waskaweb/model/phase_transition.py
+waskaweb/model/phases.py
+waskaweb/model/phases_factory.py
+waskaweb/model/semantic.py
+waskaweb/model/statement.py
+waskaweb/model/io/__init__.py
+waskaweb/model/io/document.py
+waskaweb/model/io/factories.py
+waskaweb/model/io/parser.py
+waskaweb/public/servicezeit.html
+waskaweb/public/documents/ee_ar.pdf
+waskaweb/public/documents/ee_de_ohnetn.pdf
+waskaweb/public/documents/ee_en.pdf
+waskaweb/public/documents/ee_pl.pdf
+waskaweb/public/documents/ee_ru.pdf
+waskaweb/public/documents/ee_tr.pdf
+waskaweb/public/formed/aid_plan_statement.html
+waskaweb/public/formed/annotations.xhtml
+waskaweb/public/formed/discretion_statement.html
+waskaweb/public/formed/formedtree.xml
+waskaweb/public/formed/laender.xml
+waskaweb/public/formed/privacy_statement.html
+waskaweb/public/formed/sprachen.xml
+waskaweb/public/formed/staatsangehoerigkeit.xml
+waskaweb/public/images/BMFSFJ_C_M_web.jpg
+waskaweb/public/images/agplv3-155x51.png
+waskaweb/public/images/alert.png
+waskaweb/public/images/anonym.gif
+waskaweb/public/images/arrow.gif
+waskaweb/public/images/confirmation.png
+waskaweb/public/images/datenschutz_nord.jpg
+waskaweb/public/images/error_small.png
+waskaweb/public/images/eu_logo_4c_pos_web2.jpg
+waskaweb/public/images/eval_all_bg.png
+waskaweb/public/images/eval_finished_bg.png
+waskaweb/public/images/eval_incm_bg.png
+waskaweb/public/images/failure.png
+waskaweb/public/images/info.png
+waskaweb/public/images/info_small.png
+waskaweb/public/images/kompetenz3.ico
+waskaweb/public/images/logo__esf__klein.jpg
+waskaweb/public/images/logo_dlr.png
+waskaweb/public/images/logo_intevation.png
+waskaweb/public/images/logo_ka_75.png
+waskaweb/public/images/np_arrow.gif
+waskaweb/public/images/question.png
+waskaweb/public/images/square.gif
+waskaweb/public/images/icons/admin_grey_tag.gif
+waskaweb/public/images/icons/anonym.gif
+waskaweb/public/images/icons/anonym_red.gif
+waskaweb/public/images/icons/arrow3_e.gif
+waskaweb/public/images/icons/cm_grey_tag_width.gif
+waskaweb/public/images/icons/delete_grey.gif
+waskaweb/public/images/icons/delete_red.gif
+waskaweb/public/images/icons/done_grey.gif
+waskaweb/public/images/icons/editor_grey.gif
+waskaweb/public/images/icons/extern_link.png
+waskaweb/public/images/icons/folder.png
+waskaweb/public/images/icons/folder_closed.png
+waskaweb/public/images/icons/folder_closed_blue_2.gif
+waskaweb/public/images/icons/folder_closed_blue_2_error.gif
+waskaweb/public/images/icons/folder_error.png
+waskaweb/public/images/icons/folder_open.png
+waskaweb/public/images/icons/form_help.png
+waskaweb/public/images/icons/formular_page.png
+waskaweb/public/images/icons/formular_page_blue.gif
+waskaweb/public/images/icons/formular_page_blue_error.gif
+waskaweb/public/images/icons/formular_page_error.png
+waskaweb/public/images/icons/needed_12x12.png
+waskaweb/public/images/icons/recover_red.gif
+waskaweb/public/images/icons/required_12x12.png
+waskaweb/public/images/icons/sort_asc.png
+waskaweb/public/images/icons/sort_desc.png
+waskaweb/public/images/icons/stand-in_grey.gif
+waskaweb/public/images/icons/trash.png
+waskaweb/public/images/icons/undo.png
+waskaweb/public/images/icons/view.png
+waskaweb/public/images/icons/view_red.gif
+waskaweb/public/images/icons/work_in_progress_grey.gif
+waskaweb/public/images/icons/formular/evaluation.png
+waskaweb/public/images/icons/formular/help.png
+waskaweb/public/images/icons/formular/info.png
+waskaweb/public/images/icons/formular/required.png
+waskaweb/public/images/icons/formular/rg_delete.png
+waskaweb/public/images/icons/formular/rg_first.png
+waskaweb/public/images/icons/formular/rg_last.png
+waskaweb/public/images/icons/formular/rg_new.png
+waskaweb/public/images/icons/formular/rg_next.png
+waskaweb/public/images/icons/formular/rg_prev.png
+waskaweb/public/images/icons/formular/undo.png
+waskaweb/public/images/icons/navigation/entry.png
+waskaweb/public/images/icons/navigation/folder_closed.png
+waskaweb/public/images/icons/navigation/folder_open.png
+waskaweb/public/js/check.js
+waskaweb/public/styles/all.css
+waskaweb/public/styles/color3.css
+waskaweb/public/styles/ie6.css
+waskaweb/public/styles/print.css
+waskaweb/public/styles/screen.css
+waskaweb/public/styles/old_css/all.css
+waskaweb/public/styles/old_css/color3.css
+waskaweb/public/styles/old_css/print.css
+waskaweb/public/styles/old_css/screen.css
+waskaweb/public/xml/eval_adele.xml
+waskaweb/public/xml/eval_aktiv.xml
+waskaweb/public/xml/eval_analyse.xml
+waskaweb/public/xml/eval_tagebuch.xml
+waskaweb/public/xml/eval_verlauf.xml
+waskaweb/public/xml/eval_weitere.xml
+waskaweb/public/xml/eval_zusammenfassung.xml
+waskaweb/templates/main_help.mako
+waskaweb/templates/administration/delete_user_helper.mako
+waskaweb/templates/administration/new_user.mako
+waskaweb/templates/administration/new_user_result.mako
+waskaweb/templates/administration/show_user_body.mako
+waskaweb/templates/administration/success_edit_user.mako
+waskaweb/templates/administration/dialogs/notificate_delete_user_helper.mako
+waskaweb/templates/caselifetime/overview.mako
+waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako
+waskaweb/templates/caselifetime/dialogs/success_reopen.mako
+waskaweb/templates/casemanagement/appointmentlist.mako
+waskaweb/templates/casemanagement/appointments.mako
+waskaweb/templates/casemanagement/bundle_editor.mako
+waskaweb/templates/casemanagement/bundle_standin.mako
+waskaweb/templates/casemanagement/caselist.mako
+waskaweb/templates/casemanagement/create_export_scheme.mako
+waskaweb/templates/casemanagement/digest.mako
+waskaweb/templates/casemanagement/digest_body.mako
+waskaweb/templates/casemanagement/downloadCSV.mako
+waskaweb/templates/casemanagement/downloadXLS.mako
+waskaweb/templates/casemanagement/downloadXML.mako
+waskaweb/templates/casemanagement/editAppointment.mako
+waskaweb/templates/casemanagement/export.mako
+waskaweb/templates/casemanagement/main.mako
+waskaweb/templates/casemanagement/neuaufnahme.mako
+waskaweb/templates/casemanagement/new.mako
+waskaweb/templates/casemanagement/newAppointment.mako
+waskaweb/templates/casemanagement/organisation.mako
+waskaweb/templates/casemanagement/overview.mako
+waskaweb/templates/casemanagement/phase.mako
+waskaweb/templates/casemanagement/reminderlist.mako
+waskaweb/templates/casemanagement/search.mako
+waskaweb/templates/casemanagement/selectParts.mako
+waskaweb/templates/casemanagement/showAppointment.mako
+waskaweb/templates/casemanagement/upload.mako
+waskaweb/templates/casemanagement/wiederaufnahme.mako
+waskaweb/templates/casemanagement/dialogs/alert.mako
+waskaweb/templates/casemanagement/dialogs/bundle_noselection.mako
+waskaweb/templates/casemanagement/dialogs/confirm.mako
+waskaweb/templates/casemanagement/dialogs/confirm_anonymize.mako
+waskaweb/templates/casemanagement/dialogs/confirm_bundle_anonymize.mako
+waskaweb/templates/casemanagement/dialogs/confirm_close.mako
+waskaweb/templates/casemanagement/dialogs/confirm_delete.mako
+waskaweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
+waskaweb/templates/casemanagement/dialogs/confirm_delete_attachment.mako
+waskaweb/templates/casemanagement/dialogs/confirm_markanonymize.mako
+waskaweb/templates/casemanagement/dialogs/confirm_markanonymizeFromOverview.mako
+waskaweb/templates/casemanagement/dialogs/confirm_open.mako
+waskaweb/templates/casemanagement/dialogs/confirm_restore.mako
+waskaweb/templates/casemanagement/dialogs/delete_attachment_success.mako
+waskaweb/templates/casemanagement/dialogs/failed_anonymize.mako
+waskaweb/templates/casemanagement/dialogs/failed_checkvalidity.mako
+waskaweb/templates/casemanagement/dialogs/failed_create_case.mako
+waskaweb/templates/casemanagement/dialogs/failed_delete_appointment.mako
+waskaweb/templates/casemanagement/dialogs/failed_export_agency.mako
+waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete.mako
+waskaweb/templates/casemanagement/dialogs/failed_markanonymize_phase_incomplete_from_overview.mako
+waskaweb/templates/casemanagement/dialogs/failed_seteditor.mako
+waskaweb/templates/casemanagement/dialogs/failed_xml_import.mako
+waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako
+waskaweb/templates/casemanagement/dialogs/notificate_bundle_delete.mako
+waskaweb/templates/casemanagement/dialogs/notificate_bundle_seteditor.mako
+waskaweb/templates/casemanagement/dialogs/notificate_bundle_setstandin.mako
+waskaweb/templates/casemanagement/dialogs/success_anonymize.mako
+waskaweb/templates/casemanagement/dialogs/success_bundle_anonymize.mako
+waskaweb/templates/casemanagement/dialogs/success_case_close.mako
+waskaweb/templates/casemanagement/dialogs/success_checkvalidity.mako
+waskaweb/templates/casemanagement/dialogs/success_create_appointment.mako
+waskaweb/templates/casemanagement/dialogs/success_delete.mako
+waskaweb/templates/casemanagement/dialogs/success_delete_admin.mako
+waskaweb/templates/casemanagement/dialogs/success_delete_appointment.mako
+waskaweb/templates/casemanagement/dialogs/success_delete_cm.mako
+waskaweb/templates/casemanagement/dialogs/success_edit_appointment.mako
+waskaweb/templates/casemanagement/dialogs/success_markanonymize.mako
+waskaweb/templates/casemanagement/dialogs/success_markdelete.mako
+waskaweb/templates/casemanagement/dialogs/success_restore.mako
+waskaweb/templates/casemanagement/dialogs/success_set_phase.mako
+waskaweb/templates/casemanagement/dialogs/success_xml_import.mako
+waskaweb/templates/dialogs/alert.mako
+waskaweb/templates/dialogs/confirm.mako
+waskaweb/templates/dialogs/failed.mako
+waskaweb/templates/dialogs/notification.mako
+waskaweb/templates/dialogs/success.mako
+waskaweb/templates/evaluation/evaluate.mako
+waskaweb/templates/evaluation/evaluate_adele.mako
+waskaweb/templates/evaluation/logbook.mako
+waskaweb/templates/evaluation/result.mako
+waskaweb/templates/formularpage/content.mako
+waskaweb/templates/formularpage/formular.mako
+waskaweb/templates/help/help.mako
+waskaweb/templates/info/info.mako
+waskaweb/templates/logbook/edit.mako
+waskaweb/templates/logbook/edit_body.mako
+waskaweb/templates/logbook/new.mako
+waskaweb/templates/logbook/overview.mako
+waskaweb/templates/logbook/overview_print.mako
+waskaweb/templates/logbook/show.mako
+waskaweb/templates/logbook/dialogs/confirm_delete_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/failed_create_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/failed_delete_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/failed_save_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/failed_show_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/success_create_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/success_delete_logbook_entry.mako
+waskaweb/templates/logbook/dialogs/success_save_logbook_entry.mako
+waskaweb/templates/phase/phase.mako
+waskaweb/templates/repeatgroup/dialogs/confirm_delete_rg_entry.mako
+waskaweb/templates/start/appointmentlist.mako
+waskaweb/templates/start/globalappointmentlist.mako
+waskaweb/templates/start/help.mako
+waskaweb/templates/start/remindlist.mako
+waskaweb/templates/start/responsible.mako
+waskaweb/templates/start/start.mako
+waskaweb/templates/statement/default_statement.mako
+waskaweb/templates/statement/edit.mako
+waskaweb/templates/statement/edit.mako.old
+waskaweb/templates/statement/list_statements.mako
+waskaweb/templates/statement/dialogs/confirm.mako
+waskaweb/templates/statement/dialogs/ee_accept_failed.mako
+waskaweb/templates/statement/dialogs/ee_accept_success.mako
+waskaweb/templates/statement/dialogs/ee_decline_failed.mako
+waskaweb/templates/statement/dialogs/ee_decline_success.mako
+waskaweb/templates/statement/dialogs/missing_statement.mako
+waskaweb/templates/statement/dialogs/missing_statement_body.mako
+waskaweb/templates/tests/trace.mako
+waskaweb/tests/__init__.py
+waskaweb/tests/test_models.py
+waskaweb/tests/functional/__init__.py
+waskaweb/tests/functional/test_CaseBase.py
+waskaweb/tests/functional/test_administration.py
+waskaweb/tests/functional/test_appointment.py
+waskaweb/tests/functional/test_case.py
+waskaweb/tests/functional/test_case_overview.py
+waskaweb/tests/functional/test_caseappointment.py
+waskaweb/tests/functional/test_casedocument.py
+waskaweb/tests/functional/test_document.py
+waskaweb/tests/functional/test_logbook.py
+waskaweb/tests/functional/test_phase.py
+waskaweb/tests/functional/test_usersettings.py
+waskaweb/tests/functional/test_waska.py
\ No newline at end of file
Modified: base/trunk/mpulsweb.egg-info/requires.txt
===================================================================
--- base/trunk/mpulsweb.egg-info/requires.txt 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb.egg-info/requires.txt 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1,2 +1,2 @@
Pylons>=0.9.7
-pyExcelerator
\ No newline at end of file
+pyOpenSSL
\ No newline at end of file
Modified: base/trunk/mpulsweb.egg-info/top_level.txt
===================================================================
--- base/trunk/mpulsweb.egg-info/top_level.txt 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/mpulsweb.egg-info/top_level.txt 2010-05-31 10:01:03 UTC (rev 2817)
@@ -1 +1,2 @@
mpulsweb
+waskaweb
Modified: base/trunk/setup.py
===================================================================
--- base/trunk/setup.py 2010-05-31 07:56:10 UTC (rev 2816)
+++ base/trunk/setup.py 2010-05-31 10:01:03 UTC (rev 2817)
@@ -30,13 +30,13 @@
setup(
name='mpulsweb',
- version="2.0.0-pre",
+ version="0.1",
description='mpuls ist ein Web-Applikations-Rahmen zur Verwaltung \
von elektronischen Fallakten (Schwerpunkt Sozialinformatik)',
author='Intevation GmbH',
author_email='info at intevation.de',
url='http://wald.intevation.org/projects/mpuls/',
- install_requires=["Pylons>=0.9.7", "pyExcelerator"],
+ install_requires=["Pylons>=0.9.7", "pyOpenSSL", "pyExcelerator"],
packages=find_packages(exclude=['ez_setup']),
include_package_data=True,
test_suite='nose.collector',
More information about the Mpuls-commits
mailing list