[Mpuls-commits] r540 - in wasko/trunk: . waskaweb/lib waskaweb/templates

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-07-14 09:33:55 +0200 (Tue, 14 Jul 2009)
New Revision: 540

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/lib/helpers.py
   wasko/trunk/waskaweb/templates/main.mako
Log:
Fixed issue339


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-07-10 15:52:09 UTC (rev 539)
+++ wasko/trunk/ChangeLog.txt	2009-07-14 07:33:55 UTC (rev 540)
@@ -1,3 +1,10 @@
+2009-07-14	Torsten Irlaender  <torsten.irlaender at intevation.de> 
+
+	Fixed issue339
+
+	* lib/helpers.py,
+	  templates/main.mako: Display time when the session will expire.
+
 2009-07-10	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Set version to 1.0.4

Modified: wasko/trunk/waskaweb/lib/helpers.py
===================================================================
--- wasko/trunk/waskaweb/lib/helpers.py	2009-07-10 15:52:09 UTC (rev 539)
+++ wasko/trunk/waskaweb/lib/helpers.py	2009-07-14 07:33:55 UTC (rev 540)
@@ -156,6 +156,9 @@
 def status_message(s):
     return "%s: %s" % (dd_mm_yyyy_HH_MM(datetime.datetime.now()), s)
 
+def get_logouttime():
+    return HH_MM(datetime.datetime.now() + datetime.timedelta(minutes=28))
+
 def timedelta_in_minutes(ti):
     if ti is None: return None
     days = float(ti.days * (24*60))

Modified: wasko/trunk/waskaweb/templates/main.mako
===================================================================
--- wasko/trunk/waskaweb/templates/main.mako	2009-07-10 15:52:09 UTC (rev 539)
+++ wasko/trunk/waskaweb/templates/main.mako	2009-07-14 07:33:55 UTC (rev 540)
@@ -199,8 +199,7 @@
           % if c.status_msg:
             <span class="redcolor">${c.status_msg}</span>
           % else:
-            <strong>Hinweis:</strong> Nach 30 Minuten ohne Aktivität/ohne Speichern wird die Sitzung
-      automatisch beendet, ggf. gehen Daten verloren!
+            <strong>Hinweis:</strong>Gegen ${h.get_logouttime()} Uhr wird diese Sitzung automatisch beendet. Speichern sie bitte vorher Ihre Eingaben! 
           % endif
         </div>
         ${self.buildContentHeader()}