[Mpuls-commits] r2882 - in waska/branches/1.7: . waskaweb/lib waskaweb/public/images/icons waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-06-04 12:45:28 +0200 (Fri, 04 Jun 2010)
New Revision: 2882

Modified:
   waska/branches/1.7/ChangeLog
   waska/branches/1.7/waskaweb/lib/helpers.py
   waska/branches/1.7/waskaweb/public/images/icons/validity-0-22.png
   waska/branches/1.7/waskaweb/public/images/icons/validity-4.svg
   waska/branches/1.7/waskaweb/templates/casemanagement/caselist.mako
Log:
show validity name as tooltip on case overview

Modified: waska/branches/1.7/ChangeLog
===================================================================
--- waska/branches/1.7/ChangeLog	2010-06-03 14:44:15 UTC (rev 2881)
+++ waska/branches/1.7/ChangeLog	2010-06-04 10:45:28 UTC (rev 2882)
@@ -1,3 +1,8 @@
+2010-06-04 Roland Geider <roland.geider at intevation.de>
+	* waskaweb/lib/helpers.py: added function get_validity_name
+        * waskaweb/templates/casemanagement/caselist.mako: show the validity
+        name as tooltip
+
 2010-05-31 Roland Geider <roland.geider at intevation.de>
 	* waskaweb/templates/casemanagement/phase.mako: fixed error with dialog
         in phase overview

Modified: waska/branches/1.7/waskaweb/lib/helpers.py
===================================================================
--- waska/branches/1.7/waskaweb/lib/helpers.py	2010-06-03 14:44:15 UTC (rev 2881)
+++ waska/branches/1.7/waskaweb/lib/helpers.py	2010-06-04 10:45:28 UTC (rev 2882)
@@ -49,6 +49,11 @@
     if 3 in tags: return 4 # Grundsätzlich auswertbar
     else: return 0 # nicht wirklich auswertbar
 
+def get_validity_name(tags):
+    if 4 in tags: return 'ESF-Berichterstattung'
+    if 3 in tags: return 'Grundsätzlich auswertbar'
+    else: return 'Nicht auswertbar'
+
 def load_db_list_from_file(fname):
     if os.path.isfile(fname):
         global DBS_LIST

Modified: waska/branches/1.7/waskaweb/public/images/icons/validity-0-22.png
===================================================================
(Binary files differ)

Modified: waska/branches/1.7/waskaweb/public/images/icons/validity-4.svg
===================================================================
--- waska/branches/1.7/waskaweb/public/images/icons/validity-4.svg	2010-06-03 14:44:15 UTC (rev 2881)
+++ waska/branches/1.7/waskaweb/public/images/icons/validity-4.svg	2010-06-04 10:45:28 UTC (rev 2882)
@@ -16,7 +16,7 @@
    inkscape:version="0.46"
    version="1.0"
    sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
-   sodipodi:docname="validity-4.svg"
+   sodipodi:docname="validity-0.svg"
    inkscape:export-filename="/home/roland/Projekte/mpuls/waska-1.7/waskaweb/public/images/icons/validity-4-22.png"
    inkscape:export-xdpi="41.25"
    inkscape:export-ydpi="41.25"
@@ -191,16 +191,6 @@
        y1="6.7354665"
        x2="8.7223368"
        y2="10.858153" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4622"
-       id="linearGradient3190"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-2.2328909,4.6094483,0,-44.1518,51.219804)"
-       x1="8.6790628"
-       y1="6.7354665"
-       x2="8.7223368"
-       y2="10.858153" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -211,7 +201,7 @@
      inkscape:pageshadow="2"
      inkscape:zoom="8.0000001"
      inkscape:cx="16.732632"
-     inkscape:cy="17.772939"
+     inkscape:cy="22.772939"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
@@ -222,8 +212,8 @@
      inkscape:guide-bbox="true"
      inkscape:window-width="1116"
      inkscape:window-height="707"
-     inkscape:window-x="556"
-     inkscape:window-y="92" />
+     inkscape:window-x="484"
+     inkscape:window-y="64" />
   <metadata
      id="metadata4294">
     <rdf:RDF>
@@ -271,14 +261,9 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:nodetypes="ccccc"
+       sodipodi:nodetypes="cccc"
        id="path3176"
-       d="M 3.5776401,45.861409 L 22.908986,45.861409 L 22.73663,23.005315 L 3.5776401,23.005315 L 3.5776401,45.861409 z"
-       style="fill:#555753;fill-opacity:1;stroke:#555753;stroke-width:1.63610922999999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:url(#linearGradient3190);fill-opacity:1;stroke:#555753;stroke-width:1.63610923;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 27.57764,45.861411 L 46.908986,45.861411 L 46.73663,2.2553156 L 27.57764,2.2553156 L 27.57764,45.861411 z"
-       id="path3188"
-       sodipodi:nodetypes="ccccc" />
+       d="M 1.5776403,45.861407 L 46.351758,45.861407 L 46.023885,2.6303143 L 1.5776403,45.861407 z"
+       style="fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:1.63610923;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>

Modified: waska/branches/1.7/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- waska/branches/1.7/waskaweb/templates/casemanagement/caselist.mako	2010-06-03 14:44:15 UTC (rev 2881)
+++ waska/branches/1.7/waskaweb/templates/casemanagement/caselist.mako	2010-06-04 10:45:28 UTC (rev 2882)
@@ -214,5 +214,9 @@
 
 <%def name="show_case_validity(tags)">
   <% validity = h.get_validity(tags) %>
-  <img src="/images/icons/validity-${validity}-22.png" border="0" alt="${_('Validity')}" title="${_('Validity')}">
+  <% validity_name = h.get_validity_name(tags) %>
+  <img src     = "/images/icons/validity-${validity}-22.png"
+        border = "0"
+        alt    = "${_('Validity')}: ${validity_name}"
+        title  = "${_('Validity')}: ${validity_name}">
 </%def>