[Mpuls-commits] r2695 - in wasko/branches/2.0: . jmdweb/templates mpulsweb/templates

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-05-10 10:09:06 +0200 (Mon, 10 May 2010)
New Revision: 2695

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/templates/main.mako
   wasko/branches/2.0/mpulsweb/templates/main.mako
Log:
Wald #1373


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-05-07 15:38:05 UTC (rev 2694)
+++ wasko/branches/2.0/ChangeLog	2010-05-10 08:09:06 UTC (rev 2695)
@@ -1,3 +1,9 @@
+2010-05-10  Torsten Irländer <torsten.irlaender at intevation.de>
+	
+	* mpulsweb/templates/main.mako,
+	  jmdweb/templates/main.mako: Wald #1373. Restored old behavior to
+	  enter usersettings from the "start-menu".
+
 2010-05-07  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/export.py (to_str): Only convert to unicode if a

Modified: wasko/branches/2.0/jmdweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/main.mako	2010-05-07 15:38:05 UTC (rev 2694)
+++ wasko/branches/2.0/jmdweb/templates/main.mako	2010-05-10 08:09:06 UTC (rev 2695)
@@ -28,13 +28,13 @@
           ${_('sm_menu_link_home')}
         </a>
       </li>
-      <!--<li>
+      <li>
         <a href="${h.url_for(controller='/usersettings', action='showSettings',
                              id=h.getUserId())}"
            onclick="return checkModification();">
           ${_('sm_menu_link_settings')}
         </a>
-      </li>-->
+      </li>
       <!--<li>
         <a href="${h.url_for(controller='/info')}"
            onclick="return checkModification();">

Modified: wasko/branches/2.0/mpulsweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/main.mako	2010-05-07 15:38:05 UTC (rev 2694)
+++ wasko/branches/2.0/mpulsweb/templates/main.mako	2010-05-10 08:09:06 UTC (rev 2695)
@@ -28,13 +28,13 @@
           ${_('sm_menu_link_home')}
         </a>
       </li>
-      <!--<li>
+      <li>
         <a href="${h.url_for(controller='/usersettings', action='showSettings',
                              id=h.getUserId())}"
            onclick="return checkModification();">
           ${_('sm_menu_link_settings')}
         </a>
-      </li>-->
+      </li>
       <!--<li>
         <a href="${h.url_for(controller='/info')}"
            onclick="return checkModification();">