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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-29 12:29:58 +0200 (Thu, 29 Apr 2010)
New Revision: 2559

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/templates/main.mako
   wasko/branches/2.0/mpulsweb/templates/main.mako
Log:
Removed logout icon

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-29 10:18:56 UTC (rev 2558)
+++ wasko/branches/2.0/ChangeLog	2010-04-29 10:29:58 UTC (rev 2559)
@@ -7,7 +7,10 @@
 2010-04-29  Roland Geider <roland.geider at intevation.de>
 	* jmdweb/templates/main.mako: additional filter in list comprehension
 	* mpulsweb/lib/renderer.py: Wald issue #1366: sort dropdowns using their
-        "target" as key
+	"target" as key
+	* jmdweb/templates/main.mako:
+	* mpulsweb/templates/main.mako: Wald issue #1389 (more or less): removed
+        "logout" icon
 
 2010-04-28  Torsten Irländer <torsten.irlaender at intevation.de>
 

Modified: wasko/branches/2.0/jmdweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/jmdweb/templates/main.mako	2010-04-29 10:18:56 UTC (rev 2558)
+++ wasko/branches/2.0/jmdweb/templates/main.mako	2010-04-29 10:29:58 UTC (rev 2559)
@@ -43,23 +43,12 @@
       <li>
           <a href="${h.url_for(controller='/help')}"
            onclick="return checkModification();">
-           ${_('sm_menu_link_help')}
-           <!--<img src = "/images/icons/info/question_22.png"
-                alt    = "${_('sm_menu_link_help')}"
-                title  = "${_('sm_menu_link_help')}"
-                width  = "22"
-                height = "22">--></a>
+           ${_('sm_menu_link_help')}</a>
       </li>
       <li>
-        <!--<a href="${h.url_for(controller='/auth', action='logout')}"
+        <a href="${h.url_for(controller='/auth', action='logout')}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_logout')}</a>-->
-          <a href="${h.url_for(controller='/auth', action='logout')}"
-           onclick="return checkModification();"><img src = "/images/icons/logout_22.png"
-                alt    = "${_('sm_menu_link_logout')}"
-                title  = "${_('sm_menu_link_logout')}"
-                width  = "22"
-                height = "22"></a>
+          ${_('sm_menu_link_logout')}</a>
       </li>
     </ul>
   </div>

Modified: wasko/branches/2.0/mpulsweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/main.mako	2010-04-29 10:18:56 UTC (rev 2558)
+++ wasko/branches/2.0/mpulsweb/templates/main.mako	2010-04-29 10:29:58 UTC (rev 2559)
@@ -43,23 +43,12 @@
       <li>
           <a href="${h.url_for(controller='/help')}"
            onclick="return checkModification();">
-           ${_('sm_menu_link_help')}
-           <!--<img src = "/images/icons/info/question_22.png"
-                alt    = "${_('sm_menu_link_help')}"
-                title  = "${_('sm_menu_link_help')}"
-                width  = "22"
-                height = "22">--></a>
+           ${_('sm_menu_link_help')}</a>
       </li>
       <li>
-        <!--<a href="${h.url_for(controller='/auth', action='logout')}"
+        <a href="${h.url_for(controller='/auth', action='logout')}"
            onclick="return checkModification();">
-          ${_('sm_menu_link_logout')}</a>-->
-          <a href="${h.url_for(controller='/auth', action='logout')}"
-           onclick="return checkModification();"><img src = "/images/icons/logout_22.png"
-                alt    = "${_('sm_menu_link_logout')}"
-                title  = "${_('sm_menu_link_logout')}"
-                width  = "22"
-                height = "22"></a>
+          ${_('sm_menu_link_logout')}</a>
       </li>
     </ul>
   </div>