[Mpuls-commits] r406 - in wasko/trunk: . waskaweb/templates/caselifetime waskaweb/templates/caselifetime/dialogs

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-03-18 18:06:11 +0100 (Wed, 18 Mar 2009)
New Revision: 406

Added:
   wasko/trunk/waskaweb/templates/caselifetime/dialogs/
   wasko/trunk/waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako
   wasko/trunk/waskaweb/templates/caselifetime/dialogs/success_reopen.mako
   wasko/trunk/waskaweb/templates/caselifetime/verlaengerung.mako
Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/development_wsgi.ini
   wasko/trunk/production_wsgi.ini
Log:
Added missing files


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-18 16:49:36 UTC (rev 405)
+++ wasko/trunk/ChangeLog.txt	2009-03-18 17:06:11 UTC (rev 406)
@@ -10,6 +10,13 @@
 	  waskaweb/templates/casemanagement/neuaufnahme.mako,
 	  waskaweb/templates/casemanagement/wiederaufnahme.mako: New workflow
 
+	Added missing files
+
+	* waskaweb/templates/caselifetime/dialogs
+	  waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako
+	  waskaweb/templates/caselifetime/dialogs/success_reopen.mako
+	  waskaweb/templates/caselifetime/verlaengerung.mako
+
 2009-03-18	Sascha L. Teichmann <teichmann at intevation.de>
 
 	*  waskaweb/model/case.py: Convert session case back to form data

Modified: wasko/trunk/development_wsgi.ini
===================================================================
--- wasko/trunk/development_wsgi.ini	2009-03-18 16:49:36 UTC (rev 405)
+++ wasko/trunk/development_wsgi.ini	2009-03-18 17:06:11 UTC (rev 406)
@@ -48,8 +48,8 @@
 beaker.session.key = waskaweb
 beaker.session.secret = viw6thohg1Eveesha1tah1Ihie5thu
 beaker.session.timeout = 1800 
-#beaker.session.type = memory 
-beaker.session.type = ext:memcached
+beaker.session.type = memory 
+#beaker.session.type = ext:memcached
 
 #Sascha's java memcache
 #beaker.session.url = 192.168.11.17:22122 

Modified: wasko/trunk/production_wsgi.ini
===================================================================
--- wasko/trunk/production_wsgi.ini	2009-03-18 16:49:36 UTC (rev 405)
+++ wasko/trunk/production_wsgi.ini	2009-03-18 17:06:11 UTC (rev 406)
@@ -16,8 +16,8 @@
 # db_user:     first %s -> database name, second %s -> user
 db_database = ka_%s_db
 db_user     = ka_%s_%s
-db_host     = 192.168.11.17
-db_port     = 5434
+db_host     = 192.168.193.6
+db_port     = 5432 
 
 # for connections to PDF2XFA server
 pdf2xfa_host = 192.168.11.17

Added: wasko/trunk/waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako
===================================================================
--- wasko/trunk/waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako	2009-03-18 16:49:36 UTC (rev 405)
+++ wasko/trunk/waskaweb/templates/caselifetime/dialogs/confirm_reopen.mako	2009-03-18 17:06:11 UTC (rev 406)
@@ -0,0 +1,7 @@
+<%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="/case/caselifetime/${session.get('case').id}">${_('menu_app_link_overview')}</a></li>
+</%def>
+<%include file="../../dialogs/confirm.mako" />

Added: wasko/trunk/waskaweb/templates/caselifetime/dialogs/success_reopen.mako
===================================================================
--- wasko/trunk/waskaweb/templates/caselifetime/dialogs/success_reopen.mako	2009-03-18 16:49:36 UTC (rev 405)
+++ wasko/trunk/waskaweb/templates/caselifetime/dialogs/success_reopen.mako	2009-03-18 17:06:11 UTC (rev 406)
@@ -0,0 +1,8 @@
+## -*- coding: utf-8 -*- 
+<%inherit file="../../casemanagement/main.mako" />
+<%def name="buildNavipath()">
+	${parent.buildNavipath()}
+        <li><a href="/case">${_('cm_np_root')}</a></li>
+	<li><a href="#">${_('cm_np_delete_success')}</a></li>
+</%def>
+<%include file="../../dialogs/success.mako" />

Added: wasko/trunk/waskaweb/templates/caselifetime/verlaengerung.mako
===================================================================
--- wasko/trunk/waskaweb/templates/caselifetime/verlaengerung.mako	2009-03-18 16:49:36 UTC (rev 405)
+++ wasko/trunk/waskaweb/templates/caselifetime/verlaengerung.mako	2009-03-18 17:06:11 UTC (rev 406)
@@ -0,0 +1,40 @@
+## -*- coding: utf-8 -*-
+% if c.show_verlaengerung:
+  <form method="POST" action="/caselifetime/extraTimeAction">
+    <table>
+      <tr>
+        <td class="table_row_h">
+          <strong>Verlängerung des Integrationsprozesses</strong>
+          <a target="_blank" href="https://matz.pult/case/showhelp/wiederaufnahme"><img alt="Hilfesymbol" src="/images/form_help.png" border="0"></a>
+        </td>
+        <td class="table_row_h" align="right"><input value="Ausführen" type="submit"></td>
+      </tr>
+    </table>
+  </form>
+% else:
+    ## Verlängerung nicht möglich
+    <table>
+      <tr>
+        <td class="table_row_h inactive">
+          <strong>Verlängerung des Integrationsprozesses</strong>
+          <a target="_blank" href="https://matz.pult/case/showhelp/wiederaufnahme"><img alt="Hilfesymbol" src="/images/form_help.png" border="0"></a>
+        </td>
+        <td class="table_row_h" align="right"><input value="Ausführen" type="submit" disabled></td>
+      </tr>
+      % if c.num_verlaengerung > 1:
+        <tr>
+          <td class="note table_row_h note inactive">
+              Die maximale Anzahl von Verlängerungen wurde erreicht! 
+          </td>
+          <td class="table_row_h"></td>
+        </tr>
+      % else:
+        <tr>
+          <td class="note table_row_h note inactive">
+              Eine Verlängerung ist nicht möglich, das der Fall bereits beendet wurde
+          </td>
+          <td class="table_row_h"></td>
+        </tr>
+      % endif
+    </table>
+% endif