[Mpuls-commits] r3160 - in jmd/trunk: . jmdstrukturweb/templates

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-07-08 17:17:57 +0200 (Thu, 08 Jul 2010)
New Revision: 3160

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/templates/main.mako
Log:
* jmdstrukturweb/templates/main.mako: Make the usersettings link
point to the jmd app.  The usersettings page in jmdstrukturweb is
more limited than in jmdweb and having two slightly different user
settings pages would confuse the user.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-07-08 15:02:27 UTC (rev 3159)
+++ jmd/trunk/ChangeLog	2010-07-08 15:17:57 UTC (rev 3160)
@@ -1,3 +1,10 @@
+2010-07-08  Bernhard Herzog  <bh at intevation.de>
+
+	* jmdstrukturweb/templates/main.mako: Make the usersettings link
+	point to the jmd app.  The usersettings page in jmdstrukturweb is
+	more limited than in jmdweb and having two slightly different user
+	settings pages would confuse the user.
+
 2010-07-05  Bernhard Herzog  <bh at intevation.de>
 
 	* jmd.json: Another fix for the fields definition: there's no fn

Modified: jmd/trunk/jmdstrukturweb/templates/main.mako
===================================================================
--- jmd/trunk/jmdstrukturweb/templates/main.mako	2010-07-08 15:02:27 UTC (rev 3159)
+++ jmd/trunk/jmdstrukturweb/templates/main.mako	2010-07-08 15:17:57 UTC (rev 3160)
@@ -3,8 +3,13 @@
 <%def name="buildStatusBar()">
   <div id="statusbar">
     ${_('statusbar_logininfo')}:
-        <a href="${h.url_for(controller='/usersettings', action='showSettings',
-                             id=h.getUserId())}"
+        ## Instead creating the usersettings link with url_for we
+        ## construct the link explicitly because we need to make it
+        ## point to the other the normal case setting application.  The
+        ## usersettings in the struktur-part only offer limited
+        ## functionality and it's confusing for the user when there are
+        ## two slightly different user settings pages.
+        <a href="${config.get('jmd.otherapp.url').rstrip('/')}/usersettings/showSettings/${h.getUserId()}"
            title="${_('sm_menu_link_settings')}"
            onclick="return checkModification();">
     % if h.getLogin() != 'adm':