# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1270806612 0
# Node ID f3f433053bddf7e392a261d885c5dc2b89645d33
# Parent  acf62a4a23dbec1eb6f35f3321514db5f2f8fecd
Changed the behavior of parameter-measurement-matrix (issue210).

gnv/trunk@893 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r acf62a4a23db -r f3f433053bdd gnv/ChangeLog
--- a/gnv/ChangeLog	Fri Apr 09 07:45:18 2010 +0000
+++ b/gnv/ChangeLog	Fri Apr 09 09:50:12 2010 +0000
@@ -1,3 +1,23 @@
+2010-04-09  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	  Issue210
+
+	* src/main/webapp/WEB-INF/config/templates/describe-ui.xsl: Changed the
+	  parameter-measurement matrix rendering. Its content is no more selectable
+	  - it is just to inform the user about the existence of a measurement for a
+	  given parameter. Instead, there is a new row with a checkbox for each 
+	  measurement in the header of the matrix. So, the user is able to select a
+	  measurement without a relation to a specific parameter - all parameters
+	  which are available for this measurement are effected by this choice in
+	  future outputs.
+
+	* src/main/webapp/styles/default.css: New classes for styling the
+	  parameter-measurement matrix.
+
+	* src/main/webapp/images/delete.png,
+	  src/main/webapp/images/tick.png: New icons to inform the user about the 
+	  existence of a measurement for a given parameter.
+
 2010-04-09  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue216
diff -r acf62a4a23db -r f3f433053bdd gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl
--- a/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl	Fri Apr 09 07:45:18 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/config/templates/describe-ui.xsl	Fri Apr 09 09:50:12 2010 +0000
@@ -92,6 +92,10 @@
                         <!-- take the first select node to render column labels -->
                         <xsl:apply-templates select="xform:select[1]/xform:item" mode="matrixHeader"/>
                     </tr>
+                    <tr>
+                        <td><!-- nothing here --></td>
+                        <xsl:apply-templates select="xform:select[1]/xform:item" mode="matrixSelectable"/>
+                    </tr>
                     <!-- render matrix' body -->
                     <xsl:apply-templates select="xform:select" mode="matrix" />
                 </table>
@@ -106,6 +110,15 @@
         </td>
     </xsl:template>
 
+    <!-- -->
+    <xsl:template match="xform:item" mode="matrixSelectable">
+        <xsl:variable name="value" select="xform:value/text()"/>
+        <xsl:variable name="name" select="@ref"/>
+        <td class="matrixSelectableHeader">
+            <input type="checkbox" name="{$name}" value="{$value}" />
+        </td>
+    </xsl:template>
+
 
     <!-- render the first column with parameter names into matrix -->
     <xsl:template match="xform:select" mode="matrix">
@@ -121,13 +134,13 @@
     <xsl:template match="xform:item" mode="matrix">
         <xsl:variable name="value" select="xform:value/text()"/>
         <xsl:variable name="name" select="@ref"/>
-        <td>
+        <td class="matrixContent">
             <xsl:choose>
             <xsl:when test="@disabled = 'true'">
-                <input type="checkbox" name="{$name}" value="{$value}" disabled="true"></input>
+                <img src="./images/delete.png"/>
             </xsl:when>
             <xsl:otherwise>
-                <input type="checkbox" name="{$name}" value="{$value}"></input>
+                <img src="./images/tick.png"/>
             </xsl:otherwise>
             </xsl:choose>
         </td>
diff -r acf62a4a23db -r f3f433053bdd gnv/src/main/webapp/images/delete.png
Binary file gnv/src/main/webapp/images/delete.png has changed
diff -r acf62a4a23db -r f3f433053bdd gnv/src/main/webapp/images/tick.png
Binary file gnv/src/main/webapp/images/tick.png has changed
diff -r acf62a4a23db -r f3f433053bdd gnv/src/main/webapp/styles/default.css
--- a/gnv/src/main/webapp/styles/default.css	Fri Apr 09 07:45:18 2010 +0000
+++ b/gnv/src/main/webapp/styles/default.css	Fri Apr 09 09:50:12 2010 +0000
@@ -138,6 +138,16 @@
 
 .matrixHeader {
     padding-left: 5px;
+    text-align: center;
+}
+
+.matrixSelectableHeader {
+    padding-left: 5px;
+    text-align: left;
+}
+
+.matrixContent {
+    text-align: center;
 }
 
 .wmsvalue {