[Mpuls-commits] r2583 - in wasko/branches/2.0: . mpulsweb/public/images/icons mpulsweb/public/images/svg mpulsweb/public/styles mpulsweb/templates/casemanagement

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Apr 30 15:40:10 CEST 2010


Author: roland
Date: 2010-04-30 15:40:07 +0200 (Fri, 30 Apr 2010)
New Revision: 2583

Added:
   wasko/branches/2.0/mpulsweb/public/images/icons/arrow_double_left.png
   wasko/branches/2.0/mpulsweb/public/images/svg/arrow_double_right.svg
Removed:
   wasko/branches/2.0/mpulsweb/public/images/icons/logout_22.png
   wasko/branches/2.0/mpulsweb/public/images/svg/logout.svg
Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/public/styles/menu.css
   wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako
Log:
added dynamic menus

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-30 10:53:13 UTC (rev 2582)
+++ wasko/branches/2.0/ChangeLog	2010-04-30 13:40:07 UTC (rev 2583)
@@ -1,3 +1,8 @@
+2010-04-29  Roland Geider <roland.geider at intevation.de>
+
+	* mpulsweb/public/styles/menu.css:
+	* mpulsweb/templates/casemanagement/main.mako: added dynamic menus
+
 2010-04-30  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/model/phase.py (PhasePart.getLinks): Show all required

Added: wasko/branches/2.0/mpulsweb/public/images/icons/arrow_double_left.png
===================================================================
(Binary files differ)


Property changes on: wasko/branches/2.0/mpulsweb/public/images/icons/arrow_double_left.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: wasko/branches/2.0/mpulsweb/public/images/icons/logout_22.png
===================================================================
(Binary files differ)

Added: wasko/branches/2.0/mpulsweb/public/images/svg/arrow_double_right.svg
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/arrow_double_right.svg	2010-04-30 10:53:13 UTC (rev 2582)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/arrow_double_right.svg	2010-04-30 13:40:07 UTC (rev 2583)
@@ -0,0 +1,655 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg1306"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
+   sodipodi:docname="arrow_double_right.svg"
+   inkscape:export-filename="/home/roland/Projekte/mpuls/mpulsweb/mpulsweb/public/images/svg/arrow_left.png"
+   inkscape:export-xdpi="64.999962"
+   inkscape:export-ydpi="64.999962"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1308">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective118" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3346">
+      <stop
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;"
+         offset="0"
+         id="stop3349" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 0;"
+         offset="1"
+         id="stop3351" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3325"
+       inkscape:collect="always">
+      <stop
+         id="stop3327"
+         offset="0"
+         style="stop-color: rgb(186, 189, 182); stop-opacity: 1;" />
+      <stop
+         id="stop3333"
+         offset="1"
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3284">
+      <stop
+         style="stop-color: rgb(206, 92, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop3286" />
+      <stop
+         style="stop-color: rgb(245, 121, 0); stop-opacity: 1;"
+         offset="1"
+         id="stop3288" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3276">
+      <stop
+         style="stop-color: white; stop-opacity: 1;"
+         offset="0"
+         id="stop3278" />
+      <stop
+         style="stop-color: white; stop-opacity: 0;"
+         offset="1"
+         id="stop3280" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         id="stop3271"
+         offset="0"
+         style="stop-color: rgb(254, 203, 129); stop-opacity: 1;" />
+      <stop
+         id="stop3273"
+         offset="1"
+         style="stop-color: rgb(252, 175, 62); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2397"
+       inkscape:collect="always">
+      <stop
+         id="stop2399"
+         offset="0"
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;" />
+      <stop
+         id="stop2401"
+         offset="1"
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2391"
+       inkscape:collect="always">
+      <stop
+         id="stop2393"
+         offset="0"
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;" />
+      <stop
+         id="stop2395"
+         offset="1"
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2379"
+       inkscape:collect="always">
+      <stop
+         id="stop2381"
+         offset="0"
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;" />
+      <stop
+         id="stop2383"
+         offset="1"
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3487">
+      <stop
+         style="stop-color: white; stop-opacity: 1;"
+         offset="0"
+         id="stop3489" />
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 0;"
+         offset="1"
+         id="stop3491" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3473">
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 1;"
+         offset="0"
+         id="stop3475" />
+      <stop
+         id="stop3481"
+         offset="0.5"
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(206, 206, 200); stop-opacity: 1;"
+         offset="1"
+         id="stop3477" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3303">
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 1;"
+         offset="0"
+         id="stop3305" />
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"
+         offset="1"
+         id="stop3307" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3417">
+      <stop
+         style="stop-color: white; stop-opacity: 1;"
+         offset="0"
+         id="stop3419" />
+      <stop
+         style="stop-color: rgb(238, 238, 236); stop-opacity: 0;"
+         offset="1"
+         id="stop3421" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3397"
+       inkscape:collect="always">
+      <stop
+         id="stop3399"
+         offset="0"
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;" />
+      <stop
+         id="stop3401"
+         offset="1"
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3387">
+      <stop
+         style="stop-color: rgb(143, 147, 136); stop-opacity: 1;"
+         offset="0"
+         id="stop3389" />
+      <stop
+         id="stop3354"
+         offset="0.5"
+         style="stop-color: rgb(198, 202, 194); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 0;"
+         offset="1"
+         id="stop3391" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3377">
+      <stop
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 0;"
+         offset="1"
+         id="stop3381" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3359">
+      <stop
+         style="stop-color: white; stop-opacity: 1;"
+         offset="0"
+         id="stop3361" />
+      <stop
+         style="stop-color: white; stop-opacity: 0;"
+         offset="1"
+         id="stop3363" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3351">
+      <stop
+         style="stop-color: white; stop-opacity: 1;"
+         offset="0"
+         id="stop3353" />
+      <stop
+         style="stop-color: white; stop-opacity: 0;"
+         offset="1"
+         id="stop3355" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3327">
+      <stop
+         style="stop-color: white; stop-opacity: 1;"
+         offset="0"
+         id="stop3329" />
+      <stop
+         style="stop-color: white; stop-opacity: 0;"
+         offset="1"
+         id="stop3331" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3188">
+      <stop
+         style="stop-color: black; stop-opacity: 1;"
+         offset="0"
+         id="stop3190" />
+      <stop
+         style="stop-color: black; stop-opacity: 0;"
+         offset="1"
+         id="stop3192" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3487"
+       id="radialGradient2504"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.21225, 0, 0, 0.254807, 12.0116, 16.3291)"
+       cx="7.0126991"
+       cy="22.25555"
+       fx="7.0126991"
+       fy="22.25555"
+       r="13" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3303"
+       id="linearGradient2506"
+       gradientUnits="userSpaceOnUse"
+       x1="23.467106"
+       y1="20.201925"
+       x2="23.467106"
+       y2="17.015749" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3397"
+       id="linearGradient2508"
+       gradientUnits="userSpaceOnUse"
+       x1="32.309578"
+       y1="15.875"
+       x2="44.187737"
+       y2="15.875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="linearGradient2510"
+       gradientUnits="userSpaceOnUse"
+       x1="37.124252"
+       y1="13.375"
+       x2="47.5625"
+       y2="13.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3359"
+       id="linearGradient2512"
+       gradientUnits="userSpaceOnUse"
+       x1="37.551125"
+       y1="26.433243"
+       x2="46.821011"
+       y2="26.433243" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3325"
+       id="linearGradient2514"
+       gradientUnits="userSpaceOnUse"
+       x1="36.122208"
+       y1="15.875"
+       x2="47.312737"
+       y2="15.875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2397"
+       id="linearGradient2516"
+       gradientUnits="userSpaceOnUse"
+       x1="41.125"
+       y1="13.375"
+       x2="47.5625"
+       y2="13.375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3417"
+       id="radialGradient2518"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.02714, 7.04976e-07, -2.34168e-07, 0.341179, -0.857269, 11.2548)"
+       cx="31.349806"
+       cy="14.914701"
+       fx="31.349794"
+       fy="14.914677"
+       r="12" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3351"
+       id="linearGradient2520"
+       gradientUnits="userSpaceOnUse"
+       x1="35.176235"
+       y1="17.240854"
+       x2="47.651093"
+       y2="17.240854" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3327"
+       id="linearGradient2522"
+       gradientUnits="userSpaceOnUse"
+       x1="35.253414"
+       y1="14.589205"
+       x2="48.08326"
+       y2="14.589205" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3359"
+       id="linearGradient2524"
+       gradientUnits="userSpaceOnUse"
+       x1="37.551125"
+       y1="26.433243"
+       x2="46.258511"
+       y2="26.433243" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3346"
+       id="linearGradient2526"
+       gradientUnits="userSpaceOnUse"
+       x1="34.122208"
+       y1="15.8125"
+       x2="44.853527"
+       y2="16.0625" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2391"
+       id="linearGradient2528"
+       gradientUnits="userSpaceOnUse"
+       x1="37.5"
+       y1="13.4375"
+       x2="47.5625"
+       y2="13.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3359"
+       id="linearGradient2530"
+       gradientUnits="userSpaceOnUse"
+       x1="37.551125"
+       y1="26.433243"
+       x2="44.822086"
+       y2="26.433243" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3387"
+       id="linearGradient2532"
+       gradientUnits="userSpaceOnUse"
+       x1="29.861185"
+       y1="15.875"
+       x2="46.562737"
+       y2="15.875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2379"
+       id="linearGradient2534"
+       gradientUnits="userSpaceOnUse"
+       x1="41.125"
+       y1="13.375"
+       x2="47.5625"
+       y2="13.375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3417"
+       id="radialGradient2536"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.751224, 2.34594e-06, -7.16423e-07, 0.229414, 8.25611, 12.9316)"
+       cx="35.973373"
+       cy="14.052355"
+       fx="35.973362"
+       fy="14.05233"
+       r="12" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3351"
+       id="linearGradient2538"
+       gradientUnits="userSpaceOnUse"
+       x1="35.176235"
+       y1="17.240854"
+       x2="47.651093"
+       y2="17.240854" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3327"
+       id="linearGradient2540"
+       gradientUnits="userSpaceOnUse"
+       x1="35.253414"
+       y1="14.589205"
+       x2="48.08326"
+       y2="14.589205" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3359"
+       id="linearGradient2542"
+       gradientUnits="userSpaceOnUse"
+       x1="37.551125"
+       y1="26.433243"
+       x2="44.571289"
+       y2="26.433243" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3473"
+       id="linearGradient2544"
+       gradientUnits="userSpaceOnUse"
+       x1="20"
+       y1="24"
+       x2="20"
+       y2="19.121248" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3269"
+       id="linearGradient2546"
+       gradientUnits="userSpaceOnUse"
+       x1="22.750002"
+       y1="40.000755"
+       x2="23.062502"
+       y2="36.472179" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3284"
+       id="linearGradient2548"
+       gradientUnits="userSpaceOnUse"
+       x1="17.25"
+       y1="41.147343"
+       x2="17.25"
+       y2="36.103439" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3276"
+       id="linearGradient2550"
+       gradientUnits="userSpaceOnUse"
+       x1="18.875"
+       y1="35.183414"
+       x2="18.875"
+       y2="43.978611" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3188"
+       id="radialGradient2552"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.194656, 0, 34.6298)"
+       cx="23.8125"
+       cy="43"
+       fx="23.8125"
+       fy="43"
+       r="16.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3269"
+       id="linearGradient2473"
+       gradientUnits="userSpaceOnUse"
+       x1="22.750002"
+       y1="40.000755"
+       x2="23.062502"
+       y2="36.472179" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3284"
+       id="linearGradient2475"
+       gradientUnits="userSpaceOnUse"
+       x1="17.25"
+       y1="41.147343"
+       x2="17.25"
+       y2="36.103439" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3276"
+       id="linearGradient2477"
+       gradientUnits="userSpaceOnUse"
+       x1="18.875"
+       y1="35.183414"
+       x2="18.875"
+       y2="43.978611" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568544"
+     inkscape:cx="13.966024"
+     inkscape:cy="2.0801278"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     fill="#fcaf3e"
+     stroke="#555753"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1085"
+     inkscape:window-height="760"
+     inkscape:window-x="214"
+     inkscape:window-y="175"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     inkscape:grid-points="true"
+     width="48px"
+     height="48px">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       color="#0000ff"
+       empcolor="#0000ff"
+       opacity="0.2"
+       empopacity="0.4"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1311">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Insert Link</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://www.gnome.org</dc:source>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>insert</rdf:li>
+            <rdf:li>link</rdf:li>
+            <rdf:li>anchor</rdf:li>
+            <rdf:li>url</rdf:li>
+            <rdf:li>generic</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4123"
+       transform="matrix(0,-1,1,0,-15.64644,49.504318)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path4125"
+         d="M 15.500002,35.500004 L 32.500012,35.500004 L 24.000007,44.499996 L 15.500002,35.500004 z"
+         style="fill:url(#linearGradient2546);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2548);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <path
+         transform="translate(0,2)"
+         d="M 17.8125,34.5 L 24,41.0625 L 30.1875,34.5 L 17.8125,34.5 z"
+         id="path4127"
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2550);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         inkscape:original="M 15.5 33.5 L 24 42.5 L 32.5 33.5 L 15.5 33.5 z "
+         inkscape:radius="-1"
+         sodipodi:type="inkscape:offset" />
+    </g>
+    <g
+       transform="matrix(0,-1,1,0,-11.64644,49.504318)"
+       id="g2467">
+      <path
+         style="fill:url(#linearGradient2473);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2475);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;stroke-miterlimit:4;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M 15.500002,35.500004 L 32.500012,35.500004 L 24.000007,44.499996 L 15.500002,35.500004 z"
+         id="path2469"
+         sodipodi:nodetypes="cccc" />
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="-1"
+         inkscape:original="M 15.5 33.5 L 24 42.5 L 32.5 33.5 L 15.5 33.5 z "
+         style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2477);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path2471"
+         d="M 17.8125,34.5 L 24,41.0625 L 30.1875,34.5 L 17.8125,34.5 z"
+         transform="translate(0,2)" />
+    </g>
+  </g>
+</svg>

Deleted: wasko/branches/2.0/mpulsweb/public/images/svg/logout.svg
===================================================================
--- wasko/branches/2.0/mpulsweb/public/images/svg/logout.svg	2010-04-30 10:53:13 UTC (rev 2582)
+++ wasko/branches/2.0/mpulsweb/public/images/svg/logout.svg	2010-04-30 13:40:07 UTC (rev 2583)
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="41.25"
-   inkscape:export-xdpi="41.25"
-   inkscape:export-filename="/home/roland/Projekte/mpuls/mpulsweb/mpulsweb/public/images/svg/logout_22.png"
-   width="48px"
-   height="48px"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="logout.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective54" />
-    <linearGradient
-       id="linearGradient9896">
-      <stop
-         id="stop9898"
-         offset="0"
-         style="stop-color:#cecece;stop-opacity:1;" />
-      <stop
-         id="stop9900"
-         offset="1.0000000"
-         style="stop-color:#9e9e9e;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9888"
-       inkscape:collect="always">
-      <stop
-         id="stop9890"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop9892"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9880"
-       inkscape:collect="always">
-      <stop
-         id="stop9882"
-         offset="0"
-         style="stop-color:#525252;stop-opacity:1;" />
-      <stop
-         id="stop9884"
-         offset="1"
-         style="stop-color:#525252;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9868">
-      <stop
-         style="stop-color:#4e4e4e;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop9870" />
-      <stop
-         style="stop-color:#616161;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop9872" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9854">
-      <stop
-         id="stop9856"
-         offset="0.0000000"
-         style="stop-color:#4e4e4e;stop-opacity:1.0000000;" />
-      <stop
-         id="stop9858"
-         offset="1.0000000"
-         style="stop-color:#ababab;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9842"
-       inkscape:collect="always">
-      <stop
-         id="stop9844"
-         offset="0"
-         style="stop-color:#727e0a;stop-opacity:1;" />
-      <stop
-         id="stop9846"
-         offset="1"
-         style="stop-color:#727e0a;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9830">
-      <stop
-         id="stop9832"
-         offset="0.0000000"
-         style="stop-color:#505050;stop-opacity:1.0000000;" />
-      <stop
-         id="stop9834"
-         offset="1.0000000"
-         style="stop-color:#181818;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8650">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop8652" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop8654" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient8656"
-       cx="19.701141"
-       cy="2.8969381"
-       fx="19.701141"
-       fy="2.8969381"
-       r="17.171415"
-       gradientTransform="matrix(1.253442,-2.296195e-16,1.747460e-16,0.953900,-15.47908,11.27663)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       r="15.644737"
-       fy="36.421127"
-       fx="24.837126"
-       cy="36.421127"
-       cx="24.837126"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.673575e-15,16.87306)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient9826"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.017991,4.461116e-16,-5.888254e-16,2.64016,-144.5498,-62.03367)"
-       r="16.321514"
-       fy="40.545052"
-       fx="93.780037"
-       cy="40.545052"
-       cx="93.780037"
-       id="radialGradient9836"
-       xlink:href="#linearGradient9830"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1.025512,0,0,0.648342,-0.865496,15.63026)"
-       gradientUnits="userSpaceOnUse"
-       y2="28.112619"
-       x2="30.935921"
-       y1="43.757359"
-       x1="30.935921"
-       id="linearGradient9848"
-       xlink:href="#linearGradient9842"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="27.759069"
-       x2="18.031221"
-       y1="19.804117"
-       x1="46.845825"
-       id="linearGradient9864"
-       xlink:href="#linearGradient9854"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.565823,5.084556e-18,-2.416266e-14,1.403262,-37.78323,-9.483303)"
-       r="9.7227182"
-       fy="7.1396070"
-       fx="27.883883"
-       cy="7.1396070"
-       cx="27.883883"
-       id="radialGradient9876"
-       xlink:href="#linearGradient9868"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-1.116120,0.000000)"
-       gradientUnits="userSpaceOnUse"
-       y2="24.764584"
-       x2="34.007416"
-       y1="19.107729"
-       x1="31.852951"
-       id="linearGradient9886"
-       xlink:href="#linearGradient9880"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="43.449947"
-       x2="19.755548"
-       y1="13.663074"
-       x1="8.7600641"
-       id="linearGradient9894"
-       xlink:href="#linearGradient9888"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="18.064039"
-       x2="33.710651"
-       y1="21.511185"
-       x1="31.078955"
-       id="linearGradient9902"
-       xlink:href="#linearGradient9896"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#a40000"
-     fill="#727e0a"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.25490196"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="20.295477"
-     inkscape:cy="1.9717815"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1039"
-     inkscape:window-height="938"
-     inkscape:window-x="485"
-     inkscape:window-y="33" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title>System Log Out</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>log out</rdf:li>
-            <rdf:li>logout</rdf:li>
-            <rdf:li>exit</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       ry="0.7071048"
-       rx="0.70710522"
-       y="2.5692098"
-       x="13.501722"
-       height="41.942028"
-       width="31.99555"
-       id="rect9828"
-       style="opacity:1;color:#000000;fill:url(#radialGradient9836);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       y="31.736542"
-       x="14"
-       height="12.263458"
-       width="30.999998"
-       id="rect9840"
-       style="opacity:1;color:#000000;fill:url(#linearGradient9848);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       id="path9852"
-       d="M 14.037662,43.944859 L 13.998829,3.0545252 L 33.941125,3.0987194 L 33.985319,33.018175 L 14.037662,43.944859 z "
-       style="overflow:visible;display:inline;visibility:visible;stroke-opacity:1.0000000;stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-miterlimit:10.000000;marker-end:none;marker-mid:none;marker-start:none;marker:none;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000000;stroke:none;fill-rule:evenodd;fill-opacity:1.0;fill:url(#linearGradient9864);color:#000000;opacity:1.0000000" />
-    <path
-       style="opacity:0.42222222;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       d="M 13.969801,43.944859 L 34.117903,33.062369 L 15.556349,41.989592 L 15.556349,3.0103306 L 13.985886,3.0103306 L 13.969801,43.944859 z "
-       id="path1360"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient9826);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       id="path8660"
-       sodipodi:cx="24.837126"
-       sodipodi:cy="36.421127"
-       sodipodi:rx="15.644737"
-       sodipodi:ry="8.3968935"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       transform="matrix(0.778490,0.000000,0.000000,0.778490,-7.579815,1.598139)" />
-    <path
-       style="opacity:1.0000000;color:#000000;fill:#cc0000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#a40000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 1.7317981,17.593819 L 1.7317981,30.355364 L 9.6641034,30.355364 L 9.6641034,36.176147 L 21.887745,23.952503 L 9.5913424,11.656101 L 9.5913424,17.597067 L 1.7317981,17.593819 z "
-       id="path8643"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient8656);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 9.9240084,12.478043 L 9.9240084,17.865661 L 2.0746151,17.865661 L 2.0746151,24.531440 C 12.332521,20.703863 11.954992,27.773987 21.294280,23.946410 L 9.9240084,12.478043 z "
-       id="path8645"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8658"
-       d="M 2.7193259,18.399985 L 2.7193259,29.536029 L 10.553144,29.536029 L 10.553144,33.793979 L 20.404597,23.948406 L 10.488577,13.684714 L 10.488577,18.402867 L 2.7193259,18.399985 z "
-       style="overflow:visible;display:inline;visibility:visible;stroke-opacity:1.0000000;stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-miterlimit:10.000000;marker-end:none;marker-mid:none;marker-start:none;marker:none;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000000;stroke:url(#linearGradient9894);fill-rule:evenodd;fill-opacity:1.0000000;fill:none;color:#000000;opacity:0.48128340" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#radialGradient9876);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 14.044811,43.757359 L 14,3.0545252 L 33.941125,3.0545252 L 33.761879,33.681088 L 14.044811,43.757359 z "
-       id="path9866"
-       sodipodi:nodetypes="ccccc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       sodipodi:nodetypes="cccsscc"
-       id="path9878"
-       d="M 29.643025,18.456195 L 31.565472,20.908971 L 30.107064,25.726136 C 30.107064,25.726136 30.372229,27.228738 31.145627,26.212272 C 31.919025,25.195806 34.118082,22.630218 33.730986,20.754291 C 33.443724,19.362175 32.648229,18.699263 32.648229,18.699263 L 29.643025,18.456195 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient9886);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="csccscs"
-       id="path9862"
-       d="M 31.477084,17.351340 C 31.477084,17.351340 33.640354,18.353058 33.708889,19.229593 C 33.810670,20.531315 29.466248,24.665476 29.466248,24.665476 C 28.958015,25.284194 28.118326,24.731767 28.582365,24.135146 C 28.582365,24.135146 32.048969,20.017173 31.830637,19.693631 C 31.557026,19.288174 29.863996,18.655068 29.863996,18.655068 C 28.847530,17.903768 30.131617,16.349605 31.477084,17.351340 z "
-       style="overflow:visible;display:inline;visibility:visible;stroke-opacity:1.0000000;stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-miterlimit:10.000000;marker-end:none;marker-mid:none;marker-start:none;marker:none;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:1.0000000;stroke:none;fill-rule:evenodd;fill-opacity:1.0;fill:url(#linearGradient9902);color:#000000;opacity:1.0000000" />
-  </g>
-</svg>

Modified: wasko/branches/2.0/mpulsweb/public/styles/menu.css
===================================================================
--- wasko/branches/2.0/mpulsweb/public/styles/menu.css	2010-04-30 10:53:13 UTC (rev 2582)
+++ wasko/branches/2.0/mpulsweb/public/styles/menu.css	2010-04-30 13:40:07 UTC (rev 2583)
@@ -1,10 +1,16 @@
 ul.mainMenu, ul.mainMenu ul {
     /*min-width: 230px;*/
-    width:            16.8em;
-    background-color: #204a87;  /* a bg-color MUST be included for IE to work properly... */
-    padding-left:     0px;
+    width:            14.3em;
     cursor:           default;
+    
     margin-left:      0px;  /* Opera 7 final's margin and margin-box model cause problems */
+    margin-bottom:    0px;
+    padding:          0.1em 0em 0em 2.5em;
+    
+    background-color:    #D3D7CF;  /* a bg-color MUST be included for IE to work properly... */
+    background-image:    url("../images/icons/arrow_double_left.png");
+    background-position: 12px 4px !important;
+    background-repeat:   no-repeat;
 }
 ul.mainMenu li {
 height:20px;
@@ -14,29 +20,48 @@
     position:        relative;          /* makes the menu blocks be positioned relative to their parent menu item
                                   the lack of offset makes these appear normal, but it will make a difference
                                   to the absolutely positioned child blocks */
-    color:           white;                 /* sets the default font colour to white */
+    color:           black;                 /* sets the default font colour to white */
     
+    
 }
 ul.mainMenu li > ul {          /* using the > selector prevents many lesser browsers (and IE - see below) hiding child ULs */
     display:  none;               /* hides child menu blocks - one of the most important declarations */
     position: absolute;          /* make child blocks hover without leaving space for them */
     top:      -6px;                    /* position slightly lower than the parent menu item */
-    left:     16.8em;                  /* this must not be more than the width of the parent block, or the mouse will
+    left:     14.3em;                  /* this must not be more than the width of the parent block, or the mouse will
                                   have to move off the element to move between blocks, and the menu will close */
+    border-top:    1px solid #888a85;
+    border-bottom: 1px solid #888a85;
+    border-right:  1px solid #888a85;
+    
+    background-color: #BABDB6;
+    background-image: url("");
+    padding-left:     1em;
 }
 ul.mainMenu li:hover, ul.mainMenu h1:hover, ul.mainMenu li.CSStoHighlight {
-    background-color: #729fcf;
+    background-color: #BABDB6;
     color:            #000;
 }
 ul.mainMenu ul.CSStoShow {     /* must not be combined with the next rule or IE gets confused */
-    display: block;              /* specially to go with the className changes in the behaviour file */
+    display:          block;              /* specially to go with the className changes in the behaviour file */
 }
 ul.mainMenu li:hover > ul {    /* one of the most important declarations - the browser must detect hovering over arbitrary elements
                                   the > targets only the child ul, not any child uls of that child ul */
-    display: block;              /* makes the child block visible - one of the most important declarations */
+    display:          block;              /* makes the child block visible - one of the most important declarations */
 }
 
 /* and some link styles */
-ul.mainMenu li a { color: white; display: block; width: 100%; text-decoration: none; }
-ul.mainMenu li a:hover, ul.mainMenu li a.CSStoHighLink { color: #000; }
-ul.mainMenu li:hover > a { color: #000; } /* supports links in branch headings - should not be display: block; */
+ul.mainMenu li a{
+    color:           black;
+    display:         block;
+    width:           100%;
+    text-decoration: none;
+}
+
+ul.mainMenu li a:hover, ul.mainMenu li a.CSStoHighLink{
+    color:          #000;
+}
+ul.mainMenu li:hover > a {
+    color:          #000;
+    font-weight:    bold;
+} /* supports links in branch headings - should not be display: block; */

Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako	2010-04-30 10:53:13 UTC (rev 2582)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako	2010-04-30 13:40:07 UTC (rev 2583)
@@ -27,7 +27,7 @@
 
 <%def name="buildPrivacyfield()">
   % if g.mpuls_config.is_enabled('case-module', 'privacy'):
-    <div class="menu">
+    <!--<div class="menu">
       <h1>${_('cm_main_header_data_protection')}</h1>
       <div class="actions">
         <div id="marked">
@@ -59,12 +59,13 @@
           % endif
           </ul>
         </div>
-      </div>
+      </div>-->
     
     
-    <!--<div class="menu">
+    <div class="menu">
+    <h1>${_('cm_main_header_data_protection')}</h1>
     <ul class="mainMenu">
-        <li><h1>${_('cm_main_header_data_protection')}</h1>
+        <li>Optionen
             <ul>
                 % if not session.get('case').hasPrivacyStatement():
                     <li>
@@ -91,30 +92,10 @@
                     </a>
                     </li>
                 % endif
-                <li>
-                    <a href="/privacy/listStatements" 
-                        onclick="return checkModification();"> Untermenue
-                    </a>
-                    <ul>
-                        <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
-                        <li><a href="/privacy/listStatements" onclick="return checkModification();"> ${_('statement_list_statement')}</a></li>
-                        <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
-                        <li>
-                            <a href="/privacy/listStatements" 
-                                onclick="return checkModification();"> Unteruntermenue
-                            </a>
-                            <ul>
-                                <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
-                                <li><a href="/privacy/listStatements" onclick="return checkModification();"> ${_('statement_list_statement')}</a></li>
-                                <li><a href="/case/markForAnonymize/${session.get('case').id}/0" onclick="return checkModification();">${_('cm_main_anonymize_case')}</a></li>
-                            </ul>
-                        </li>
-                    </ul>
-                </li>
             </ul>
         </li>
     </ul>
-      </div>-->
+      </div>
       
       
     </div>
@@ -129,15 +110,70 @@
       ${self.buildInfofield()}
       <ul>
         <li><a href="${h.url_for(controller='/case_overview')}" onclick="return checkModification();"> ${_('cm_menu_link_backtooverview')}</a></li>
+        <li>
+            <a href="/phase/overview/${session.get('case').id}"
+            onclick="return checkModification();">${_('case_cm_phase')}</a>
+        </li>
         <li><a href="/case/printAll/${session.get('case').id}/0" onclick="return checkModification();" target="_blank"> ${_('cm_menu_link_print')}</a></li>
         % if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'reminders'):
           <li><a href="/caseappointment/newReminder/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a></li>
         % endif
       </ul>
     % endif
-    </div>
+     </div>
+    <ul class="mainMenu">
+        <li>Weitere Optionen
+            <ul>
+            <li>
+            <a href="/case/digest/${session.get('case').id}" 
+                onclick="return checkModification();">
+                ${_('cm_menu_link_digest')}
+            </a>
+            </li>
+            % if h.hasRole(['cm_ka', 'admin_ka']):
+                <!--<li>
+                    <a href="/phase/overview/${session.get('case').id}"
+                    onclick="return checkModification();">
+                        ${_('case_cm_phase')}
+                    </a>
+                </li>-->
+                <li>
+                    <a href="/case/organisation/${session.get('case').id}" 
+                    onclick="return checkModification();">
+                        ${_('cm_menu_link_organisation')}
+                    </a>
+                </li>
+                % if g.mpuls_config.is_enabled('case-module', 'appointments'):
+                    <li>
+                        <a href="/caseappointment/index/${session.get('case').id}" 
+                            onclick="return checkModification();">
+                            ${_('cm_menu_link_appointment')}
+                        </a>
+                    </li>
+                % endif
+                % if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'logbook'):
+                    <li>
+                        <a href="/logbook/index/${session.get('case').id}" 
+                            onclick="return checkModification();">
+                            Tagebuch
+                        </a>
+                    </li>
+                % endif
+                % if g.mpuls_config.is_enabled('case-module', 'documents'):
+                    <li>
+                        <a href="/casedocument/index/${session.get('case').id}" 
+                            onclick="return checkModification();">
+                            ${_('cm_menu_link_documents')}
+                        </a>
+                    </li>
+                % endif
+            % endif
+            </ul>
+        </li>
+      </ul>
   </div>
-  <div class="menu">
+  
+  <!--<div class="menu">
     <h1>${_('cm_menu_header_seperator')}</h1>
     <div class="actions">
       <ul>
@@ -187,7 +223,7 @@
         % endif
       </ul>
     </div>
-  </div>
+  </div>-->
   <div class="menu">
     <h1>${_('cm_menu_header_structure')}</h1>
     ${h.literal(h.render_navigation())}



More information about the Mpuls-commits mailing list