[Mpuls-commits] r2076 - in wasko/branches/2.0: jmdweb/templates/casemanagement jmdweb/templates/casemanagement/dialogs mpulsweb/templates/casemanagement mpulsweb/templates/casemanagement/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Mar 23 14:22:15 CET 2010
Author: torsten
Date: 2010-03-23 14:22:15 +0100 (Tue, 23 Mar 2010)
New Revision: 2076
Added:
wasko/branches/2.0/mpulsweb/templates/casemanagement/appointments.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/editAppointment.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/newAppointment.mako
wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako
Removed:
wasko/branches/2.0/jmdweb/templates/casemanagement/appointments.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_create_appointment.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_delete_appointment.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_edit_appointment.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/editAppointment.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/newAppointment.mako
wasko/branches/2.0/jmdweb/templates/casemanagement/showAppointment.mako
Log:
Moved templates for caseappointments to mpulsbase
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/appointments.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/appointments.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/appointments.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,25 +0,0 @@
-<%inherit file="main.mako" />
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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">
- <div id="content_ueberschrift">
- ${_('app_header_overview')}
- </div>
-% if h.hasRole(['cm_ka']):
- <div id="modusfield">
- <div class="actions">
- <ul>
- <li><a href="${h.url_for(controller='/caseappointment', action='new', id=session.get('case').id)}"> ${_('app_actions_link_newappointment')}</a></li>
- </ul>
- </div>
- </div>
-% endif
-</div>
-<h2>Wiedervorlagen</h2>
-<%include file="/casemanagement/reminderlist.mako" />
-<h2>Termine</h2>
-<%include file="/casemanagement/appointmentlist.mako" />
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,8 +0,0 @@
-<%inherit file="../main.mako" />
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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" />
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_create_appointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_create_appointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_create_appointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,9 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../main.mako" />
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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" />
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_delete_appointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_delete_appointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,9 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../main.mako" />
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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" />
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_edit_appointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_edit_appointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,9 +0,0 @@
-## -*- coding: utf-8 -*-
-<%inherit file="../main.mako" />
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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" />
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/editAppointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/editAppointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/editAppointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,37 +0,0 @@
-<%inherit file="/casemanagement/main.mako" />
-<%
-formular_labels = {'start_date' : 'app_form_startdate',
- 'start_time' : 'app_form_startdate',
- 'end_date' : 'app_form_enddate',
- 'end_time' : 'app_form_endtime',
- 'title' : 'app_form_title'
- }
-%>
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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">
- <div id="content_ueberschrift">
- ${_('app_header_show')}
- </div>
- <div id="modusfield">
- <div class="actions">
- <ul>
- <li>
- <a href="${h.url_for(controller='/caseappointment', action='show', id=c.appointment.id, confirmed='0')}">${_('menu_app_link_show_back')}</a>
- </li>
- </ul>
- </div>
- </div>
-</div>
-${self.buildFormErrors(formular_labels)}
-<div id="admin_new_user">
-<div id="waska_form">
-<form action="${h.url_for(controller='caseappointment', action='editAction')}" method="POST">
-<%include file="../appointments/edit_body.mako" />
-</form>
-</div>
-</div>
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/newAppointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/newAppointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/newAppointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,37 +0,0 @@
-<%inherit file="main.mako" />
-<%
-formular_labels = {'start_date' : 'app_form_startdate',
- 'start_time' : 'app_form_startdate',
- 'end_date' : 'app_form_enddate',
- 'end_time' : 'app_form_endtime',
- 'title' : 'app_form_title'
- }
-%>
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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">
- <div id="content_ueberschrift">
-${_('cm_app_header_new')}
- </div>
- <div id="modusfield">
- <div class="actions">
- <ul>
- <li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=session['case'].id)}"> ${_('menu_app_link_overview_back')}</a>
- </li>
- </ul>
- </div>
- </div>
-</div>
-${self.buildFormErrors(formular_labels)}
-<div id="admin_new_user">
-<div id="waska_form">
-<form action="${h.url_for(controller='caseappointment', action='newAction')}" method="POST">
-<%include file="../appointments/edit_body.mako" />
-</form>
-</div>
-</div>
Deleted: wasko/branches/2.0/jmdweb/templates/casemanagement/showAppointment.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/casemanagement/showAppointment.mako 2010-03-23 13:04:45 UTC (rev 2075)
+++ wasko/branches/2.0/jmdweb/templates/casemanagement/showAppointment.mako 2010-03-23 13:22:15 UTC (rev 2076)
@@ -1,29 +0,0 @@
-<%inherit file="/casemanagement/main.mako" />
-<%def name="buildNavipath()">
- ${parent.buildNavipath()}
- <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="/caseappointment/show/${c.appointment.id}">${_('app_np_show')}</a></li>
-</%def>
-<div id="content_header_small">
- <div id="content_ueberschrift">
- ${_('app_header_show')}
- </div>
- <div id="modusfield">
- <div class="actions">
- <ul>
- % if h.hasRole(['cm_ka']):
- <li>
- <a href="${h.url_for(controller='/caseappointment', action='edit', id=c.appointment.id)}">
- ${_('sm_menu_link_edit_appointment')}
- </a>
- </li>
- % endif
- <li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('menu_app_link_overview_back')}</a>
- </li>
- </ul>
- </div>
- </div>
-</div>
-<%include file="/appointments/show_body.mako" />
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/appointments.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/appointments.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/appointments.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/confirm_delete_appointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_create_appointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_create_appointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_delete_appointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_delete_appointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/dialogs/success_edit_appointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/dialogs/success_edit_appointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/editAppointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/editAppointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/editAppointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/newAppointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/newAppointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/newAppointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako (from rev 2056, wasko/branches/2.0/jmdweb/templates/casemanagement/showAppointment.mako)
Property changes on: wasko/branches/2.0/mpulsweb/templates/casemanagement/showAppointment.mako
___________________________________________________________________
Name: svn:mergeinfo
+
More information about the Mpuls-commits
mailing list