[Mpuls-commits] r1242 - in wasko/branches/2.0: . waskaweb/controllers waskaweb/lib waskaweb/model waskaweb/templates waskaweb/templates/administration waskaweb/templates/appointments waskaweb/templates/caselifetime waskaweb/templates/casemanagement waskaweb/templates/casemanagement/dialogs waskaweb/templates/dialogs waskaweb/templates/documents waskaweb/templates/evaluation waskaweb/templates/logbook waskaweb/templates/start waskaweb/templates/statement waskaweb/templates/usersettings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Feb 4 12:55:55 CET 2010
Author: torsten
Date: 2010-02-04 12:55:51 +0100 (Thu, 04 Feb 2010)
New Revision: 1242
Modified:
wasko/branches/2.0/ChangeLog
wasko/branches/2.0/waskaweb/controllers/case_overview.py
wasko/branches/2.0/waskaweb/lib/renderer.py
wasko/branches/2.0/waskaweb/model/statement.py
wasko/branches/2.0/waskaweb/templates/administration/delete_user_helper.mako
wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako
wasko/branches/2.0/waskaweb/templates/administration/edit_usergroup.mako
wasko/branches/2.0/waskaweb/templates/administration/new_user_result.mako
wasko/branches/2.0/waskaweb/templates/administration/overview_user.mako
wasko/branches/2.0/waskaweb/templates/administration/overview_usergroups.mako
wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako
wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako
wasko/branches/2.0/waskaweb/templates/administration/show_user_body.mako
wasko/branches/2.0/waskaweb/templates/administration/show_usergroup.mako
wasko/branches/2.0/waskaweb/templates/appointments/overview_body.mako
wasko/branches/2.0/waskaweb/templates/appointments/remindlist_body.mako
wasko/branches/2.0/waskaweb/templates/appointments/show_body.mako
wasko/branches/2.0/waskaweb/templates/caselifetime/overview.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_editor.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_standin.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_set_phase.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/digest.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/downloadCSV.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXLS.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXML.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/main.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako
wasko/branches/2.0/waskaweb/templates/casemanagement/upload.mako
wasko/branches/2.0/waskaweb/templates/dialogs/alert.mako
wasko/branches/2.0/waskaweb/templates/dialogs/confirm.mako
wasko/branches/2.0/waskaweb/templates/dialogs/failed.mako
wasko/branches/2.0/waskaweb/templates/dialogs/notification.mako
wasko/branches/2.0/waskaweb/templates/dialogs/success.mako
wasko/branches/2.0/waskaweb/templates/documents/case_overview.mako
wasko/branches/2.0/waskaweb/templates/documents/global_overview.mako
wasko/branches/2.0/waskaweb/templates/evaluation/evaluate.mako
wasko/branches/2.0/waskaweb/templates/evaluation/evaluate_adele.mako
wasko/branches/2.0/waskaweb/templates/logbook/overview.mako
wasko/branches/2.0/waskaweb/templates/logbook/overview_print.mako
wasko/branches/2.0/waskaweb/templates/logbook/show.mako
wasko/branches/2.0/waskaweb/templates/login.mako
wasko/branches/2.0/waskaweb/templates/start/globalappointmentlist.mako
wasko/branches/2.0/waskaweb/templates/start/newslist.mako
wasko/branches/2.0/waskaweb/templates/statement/list_statements.mako
wasko/branches/2.0/waskaweb/templates/usersettings/edit_standin.mako
Log:
Adopeted imports
* waskaweb/model/statement.py,
waskaweb/controllers/case_overview.py,
waskaweb/lib/renderer.py,
waskaweb/templates/appointments/show_body.mako,
waskaweb/templates/appointments/overview_body.mako,
waskaweb/templates/appointments/remindlist_body.mako,
waskaweb/templates/dialogs/confirm.mako,
waskaweb/templates/dialogs/failed.mako,
waskaweb/templates/dialogs/notification.mako,
waskaweb/templates/dialogs/alert.mako,
waskaweb/templates/dialogs/success.mako,
waskaweb/templates/administration/show_usergroup.mako,
waskaweb/templates/administration/show_user_body.mako,
waskaweb/templates/administration/delete_user_helper.mako,
waskaweb/templates/administration/edit_usergroup.mako,
waskaweb/templates/administration/show_settings.mako,
waskaweb/templates/administration/overview_user.mako,
waskaweb/templates/administration/overview_usergroups.mako,
waskaweb/templates/administration/reset_password.mako,
waskaweb/templates/administration/edit_user.mako,
waskaweb/templates/administration/new_user_result.mako,
waskaweb/templates/caselifetime/overview.mako,
waskaweb/templates/logbook/show.mako,
waskaweb/templates/logbook/overview_print.mako,
waskaweb/templates/logbook/overview.mako,
waskaweb/templates/start/globalappointmentlist.mako,
waskaweb/templates/start/newslist.mako,
waskaweb/templates/login.mako,
waskaweb/templates/usersettings/edit_standin.mako,
waskaweb/templates/documents/case_overview.mako,
waskaweb/templates/documents/global_overview.mako,
waskaweb/templates/statement/list_statements.mako,
waskaweb/templates/evaluation/evaluate_adele.mako,
waskaweb/templates/evaluation/evaluate.mako,
waskaweb/templates/casemanagement/bundle_standin.mako,
waskaweb/templates/casemanagement/dialogs/success_set_phase.mako,
waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako,
waskaweb/templates/casemanagement/digest_body.mako,
waskaweb/templates/casemanagement/organisation.mako,
waskaweb/templates/casemanagement/downloadXLS.mako,
waskaweb/templates/casemanagement/overview.mako,
waskaweb/templates/casemanagement/caselist.mako,
waskaweb/templates/casemanagement/bundle_editor.mako,
waskaweb/templates/casemanagement/digest.mako,
waskaweb/templates/casemanagement/downloadCSV.mako,
waskaweb/templates/casemanagement/main.mako,
waskaweb/templates/casemanagement/upload.mako,
waskaweb/templates/casemanagement/downloadXML.mako: Adopted imports
Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/ChangeLog 2010-02-04 11:55:51 UTC (rev 1242)
@@ -22,6 +22,54 @@
* waskaweb/lib/filters.py,
mpulsweb/lib/helper/filters.py: Moved file
* waskaweb/lib/helpers.py: Adopted import
+ * waskaweb/model/statement.py,
+ waskaweb/controllers/case_overview.py,
+ waskaweb/lib/renderer.py,
+ waskaweb/templates/appointments/show_body.mako,
+ waskaweb/templates/appointments/overview_body.mako,
+ waskaweb/templates/appointments/remindlist_body.mako,
+ waskaweb/templates/dialogs/confirm.mako,
+ waskaweb/templates/dialogs/failed.mako,
+ waskaweb/templates/dialogs/notification.mako,
+ waskaweb/templates/dialogs/alert.mako,
+ waskaweb/templates/dialogs/success.mako,
+ waskaweb/templates/administration/show_usergroup.mako,
+ waskaweb/templates/administration/show_user_body.mako,
+ waskaweb/templates/administration/delete_user_helper.mako,
+ waskaweb/templates/administration/edit_usergroup.mako,
+ waskaweb/templates/administration/show_settings.mako,
+ waskaweb/templates/administration/overview_user.mako,
+ waskaweb/templates/administration/overview_usergroups.mako,
+ waskaweb/templates/administration/reset_password.mako,
+ waskaweb/templates/administration/edit_user.mako,
+ waskaweb/templates/administration/new_user_result.mako,
+ waskaweb/templates/caselifetime/overview.mako,
+ waskaweb/templates/logbook/show.mako,
+ waskaweb/templates/logbook/overview_print.mako,
+ waskaweb/templates/logbook/overview.mako,
+ waskaweb/templates/start/globalappointmentlist.mako,
+ waskaweb/templates/start/newslist.mako,
+ waskaweb/templates/login.mako,
+ waskaweb/templates/usersettings/edit_standin.mako,
+ waskaweb/templates/documents/case_overview.mako,
+ waskaweb/templates/documents/global_overview.mako,
+ waskaweb/templates/statement/list_statements.mako,
+ waskaweb/templates/evaluation/evaluate_adele.mako,
+ waskaweb/templates/evaluation/evaluate.mako,
+ waskaweb/templates/casemanagement/bundle_standin.mako,
+ waskaweb/templates/casemanagement/dialogs/success_set_phase.mako,
+ waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako,
+ waskaweb/templates/casemanagement/digest_body.mako,
+ waskaweb/templates/casemanagement/organisation.mako,
+ waskaweb/templates/casemanagement/downloadXLS.mako,
+ waskaweb/templates/casemanagement/overview.mako,
+ waskaweb/templates/casemanagement/caselist.mako,
+ waskaweb/templates/casemanagement/bundle_editor.mako,
+ waskaweb/templates/casemanagement/digest.mako,
+ waskaweb/templates/casemanagement/downloadCSV.mako,
+ waskaweb/templates/casemanagement/main.mako,
+ waskaweb/templates/casemanagement/upload.mako,
+ waskaweb/templates/casemanagement/downloadXML.mako: Adopted imports
2010-02-04 Torsten Irländer <torsten.irlaender at intevation.de>
Modified: wasko/branches/2.0/waskaweb/controllers/case_overview.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case_overview.py 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/controllers/case_overview.py 2010-02-04 11:55:51 UTC (rev 1242)
@@ -36,7 +36,7 @@
from paste.httpexceptions import HTTPNotFound
from waskaweb.lib.base import c, h, render, request, session
-import waskaweb.lib.filters as F
+import mpulsweb.lib.helper.filters as F
from waskaweb.lib.validators import SearchCaseForm, BundleActionForm, \
SetBundleEditorForm, SetBundleStandinForm, CasePartSelectionForm
from mpulsweb.lib.security import checkRole
Modified: wasko/branches/2.0/waskaweb/lib/renderer.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/renderer.py 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/lib/renderer.py 2010-02-04 11:55:51 UTC (rev 1242)
@@ -35,7 +35,7 @@
from formed.instance.tree import RepeatInstanceContainerNode, RepeatInstanceNode
from formed.instance.backends.postgres import DBFactory as InstanceFactory
from mpulsweb.lib.db import PostgresDBInterface
-from waskaweb.lib.filters import NA
+from mpulsweb.lib.helper.filters import NA
from waskaweb.lib.helpers import dd_mm_YYYY as format_date
import formed.meta.data as data
from pylons.i18n import _
Modified: wasko/branches/2.0/waskaweb/model/statement.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/statement.py 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/model/statement.py 2010-02-04 11:55:51 UTC (rev 1242)
@@ -31,7 +31,7 @@
from string import Template
from cgi import escape
-import waskaweb.lib.filters as F
+import mpulsweb.lib.helper.filters as F
from mpulsweb.lib.db import db
Modified: wasko/branches/2.0/waskaweb/templates/administration/delete_user_helper.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/delete_user_helper.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/delete_user_helper.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/administration">${_('adm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/edit_user.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%
formular_labels = {'firstname' : 'adm_form_user_firstname',
'lastname' : 'adm_form_user_lastname',
Modified: wasko/branches/2.0/waskaweb/templates/administration/edit_usergroup.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/edit_usergroup.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/edit_usergroup.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="../main.mako" />
<%
formular_labels = {'name' : 'adm_form_usergroup_name'
Modified: wasko/branches/2.0/waskaweb/templates/administration/new_user_result.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/new_user_result.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/new_user_result.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/administration">${_('adm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/administration/overview_user.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/overview_user.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/overview_user.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/administration">${_('adm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/administration/overview_usergroups.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/overview_usergroups.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/overview_usergroups.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/administration">${_('adm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/reset_password.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/administration">${_('adm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/show_settings.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
Modified: wasko/branches/2.0/waskaweb/templates/administration/show_user_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/show_user_body.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/show_user_body.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,4 +1,4 @@
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<h2>${_('adm_form_legend_personal')}</h2>
<table>
<tr>
Modified: wasko/branches/2.0/waskaweb/templates/administration/show_usergroup.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/administration/show_usergroup.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/administration/show_usergroup.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
Modified: wasko/branches/2.0/waskaweb/templates/appointments/overview_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/appointments/overview_body.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/appointments/overview_body.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<table class="appointment">
<tr>
<th class="date table_header_h">${_('app_overview_tbl_header_date')}</th>
Modified: wasko/branches/2.0/waskaweb/templates/appointments/remindlist_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/appointments/remindlist_body.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/appointments/remindlist_body.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<table class="appointment">
<tr>
<th class="date table_header_h">${_('app_overview_tbl_header_date')}</th>
Modified: wasko/branches/2.0/waskaweb/templates/appointments/show_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/appointments/show_body.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/appointments/show_body.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,4 +1,4 @@
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<table>
<tbody>
<tr>
Modified: wasko/branches/2.0/waskaweb/templates/caselifetime/overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/caselifetime/overview.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/caselifetime/overview.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -3,7 +3,7 @@
## der dazu gehördende, noch fürchterlichere Code direkt wieder entfernt werden kann.
<%inherit file="/casemanagement/main.mako" />
<%!
-import waskaweb.lib.filters as F
+import mpulsweb.lib.helper.filters as F
from pylons import g
EXTRA_MAPPING = { u"anmerkungen": u"Begründung für die Wiederaufnahme" }
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_editor.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_editor.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_editor.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_standin.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_standin.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/bundle_standin.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/caselist.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -2,7 +2,7 @@
<%!
from pylons.i18n import _
-import waskaweb.lib.filters as F
+import mpulsweb.lib.helper.filters as F
import waskaweb.lib.helpers as h
def hide_if_anonymized(case, value):
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/failed_xml_import2.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_set_phase.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_set_phase.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/dialogs/success_set_phase.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/digest.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/digest.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/digest.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/digest_body.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%!
-import waskaweb.lib.filters as F
+import mpulsweb.lib.helper.filters as F
fields = [
"name",
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/downloadCSV.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/downloadCSV.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/downloadCSV.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXLS.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXLS.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXLS.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXML.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXML.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/downloadXML.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/main.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/main.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/main.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
${next.body()}
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/organisation.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/overview.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case">${_('cm_np_root')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/casemanagement/upload.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/casemanagement/upload.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/casemanagement/upload.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
Modified: wasko/branches/2.0/waskaweb/templates/dialogs/alert.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/dialogs/alert.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/dialogs/alert.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,4 +1,4 @@
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog">
<h1><img src="/images/alert.png" alt="achtung"/>${_('dialog_header_alert')}</h1>
<h2>${c.alert_for | F.NA, h}</h2>
Modified: wasko/branches/2.0/waskaweb/templates/dialogs/confirm.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/dialogs/confirm.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/dialogs/confirm.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
<h1><img src="/images/question.png" alt="achtung"/>${c.confirm_for}</h1>
<p>${c.question}</p>
Modified: wasko/branches/2.0/waskaweb/templates/dialogs/failed.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/dialogs/failed.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/dialogs/failed.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
<h1><img src="/images/failure.png" alt="Fehler"/>${c.failed_for | F.NA, h}</h1>
<p>${c.failed_text | F.NA}</p>
Modified: wasko/branches/2.0/waskaweb/templates/dialogs/notification.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/dialogs/notification.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/dialogs/notification.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
<h1><img src="/images/alert.png" alt="Achtung"/>${c.notification_for}</h1>
<p>${c.notification_text}</p>
Modified: wasko/branches/2.0/waskaweb/templates/dialogs/success.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/dialogs/success.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/dialogs/success.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div class="dialog" />
<h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.success_for | F.NA, h}</h1>
<p>${c.success_text | F.NA, h}</p>
Modified: wasko/branches/2.0/waskaweb/templates/documents/case_overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/documents/case_overview.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/documents/case_overview.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -29,7 +29,7 @@
% endif
</div>
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<table>
<tr>
<th class="table_header_h table_description">
Modified: wasko/branches/2.0/waskaweb/templates/documents/global_overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/documents/global_overview.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/documents/global_overview.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/document/globalOverview">${_('doc_np_overview')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/evaluation/evaluate.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/evaluation/evaluate.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/evaluation/evaluate.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="/main.mako"/>
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div>
##<div class="widget modusfield actions">
## <ul>
Modified: wasko/branches/2.0/waskaweb/templates/evaluation/evaluate_adele.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/evaluation/evaluate_adele.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/evaluation/evaluate_adele.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="/main.mako"/>
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div>
##<div class="widget modusfield actions">
## <ul>
Modified: wasko/branches/2.0/waskaweb/templates/logbook/overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/logbook/overview.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/logbook/overview.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="/casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
Modified: wasko/branches/2.0/waskaweb/templates/logbook/overview_print.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/logbook/overview_print.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/logbook/overview_print.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="/casemanagement/main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/logbook/show.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/logbook/show.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/logbook/show.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
<%inherit file="/casemanagement/main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/login.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/login.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/login.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%inherit file="main_login.mako" />
<h1>${_('login_header_waska_login')}</h1>
<div id="waska_form_login">
Modified: wasko/branches/2.0/waskaweb/templates/start/globalappointmentlist.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/start/globalappointmentlist.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/start/globalappointmentlist.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,4 +1,4 @@
-<%! import waskaweb.lib.filters as F %>
+<%! 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="/images/icons/view_red.gif" border="0" alt="${_('cm_overview_a_show')}" title="${_('cm_overview_a_show')}"></a>
Modified: wasko/branches/2.0/waskaweb/templates/start/newslist.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/start/newslist.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/start/newslist.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,5 +1,5 @@
## -*- coding: utf-8 -*-
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
%for news in c.news.getList():
<table class="news">
<tr>
Modified: wasko/branches/2.0/waskaweb/templates/statement/list_statements.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/statement/list_statements.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/statement/list_statements.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="/casemanagement/main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
Modified: wasko/branches/2.0/waskaweb/templates/usersettings/edit_standin.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/usersettings/edit_standin.mako 2010-02-04 11:44:51 UTC (rev 1241)
+++ wasko/branches/2.0/waskaweb/templates/usersettings/edit_standin.mako 2010-02-04 11:55:51 UTC (rev 1242)
@@ -1,6 +1,6 @@
## -*- coding: utf-8 -*-
<%inherit file="../main.mako" />
-<%! import waskaweb.lib.filters as F %>
+<%! import mpulsweb.lib.helper.filters as F %>
<div id="content_header_small">
<div id="content_ueberschrift">
${_('usrset_header_changestandin')}
More information about the Mpuls-commits
mailing list