Changeset 19868 in main for trunk/ibisph-view/src/main/webapp/xslt/html/query/module/builder/Page.xslt

Timestamp:

02/19/20 00:49:59 (3 years ago)

Author:

GarthBraithwaite_STG

Message:

view - more css tweaks. Reworked common.xml to go back to add model maps be referenced. Added complete external path for xslt access.

File:

• trunk/ibisph-view/src/main/webapp/xslt/html/query/module/builder/Page.xslt (modified) (3 diffs)

trunk/ibisph-view/src/main/webapp/xslt/html/query/module/builder/Page.xslt

@@ -242 +242 @@
                         </button>
 
-                        <button type="button" accesskey="M" id="SelectNewMeasure" title="Select a new  query dataset measure"
-                                onclick="location.href='{concat($ibis.contextPath, /QUERY_MODULE/QUERY_CONFIGURATION_SELECTION/LOCAL_URL)}'"
-                        >
-                                Select Query Measure
-                                <xsl:call-template name="Help.content">
-                                        <xsl:with-param name="help">
-                                                <TEXT>
-                                                        Allows you to change the measure to be queried.  
-                                                </TEXT>
-                                        </xsl:with-param>
-                                </xsl:call-template>
-                        </button>
-
-                        <button type="button" accesskey="M" id="SelectNewMeasure" title="Reloads the default query definition"
+                        <button type="button" accesskey="M" id="defaultQuery" title="Reloads the default query definition"
                                 onclick="location.href='{concat($ibis.contextPath, 'query/builder/', /QUERY_MODULE/REQUEST/CONFIGURATION_PATH, '.html?Reload=x')}'"
                         >
-                                Reload Selections
+                                Load Default Query
                                 <xsl:call-template name="Help.content">
                                         <xsl:with-param name="help">
@@ -272 +259 @@
                         </button>
 
+                        <button type="button" accesskey="M" id="selectQueryMeasure" title="Select a new  query dataset measure"
+                                onclick="location.href='{concat($ibis.contextPath, /QUERY_MODULE/QUERY_CONFIGURATION_SELECTION/LOCAL_URL)}'"
+                        >
+                                Select Query Measure
+                                <xsl:call-template name="Help.content">
+                                        <xsl:with-param name="help">
+                                                <TEXT>
+                                                        Allows you to change the measure to be queried.  
+                                                </TEXT>
+                                        </xsl:with-param>
+                                </xsl:call-template>
+                        </button>
+
                         <button type="button" accesskey="D" id="saveDefinition" 
                                 title="Click this button to save the selections as a saved criteria definition"
@@ -288 +288 @@
                         </button>
 
-                        <button type="button" accesskey="D" id="saveDefinition" 
+                        <button type="button" accesskey="L" id="loadDefinition" 
                                 title="Click this button to access all query definitions"
                                 onclick="location.href='{concat($ibis.contextPath, 'query/definition/index/MyDefinitions.html')}'"