Merge branch 'geocat/stable' into geocat/trunk

geonetwork · Jun 22, 2012 · a2e9d6a · a2e9d6a
2 parents 8e29e6a + 42be3e0
commit a2e9d6a
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 52 deletions.
diff --git a/web/pom.xml b/web/pom.xml
@@ -526,7 +526,6 @@
               <!-- files to include, path relative to output's directory or absolute path-->
               <includes>
                 <include>${geonetwork.build.dir}/scripts/sarissa.js</include>
-                <include>${geonetwork.build.dir}/scripts/prototype.js</include>
               </includes>
             </aggregation>
 			 <aggregation>

diff --git a/web/src/main/webapp/xsl/extent-admin.xsl b/web/src/main/webapp/xsl/extent-admin.xsl
@@ -17,14 +17,7 @@
     <xsl:template mode="script" match="/">
 
         <!-- To avoid an interaction with prototype and ExtJs.Tooltip, should be loaded before ExtJs -->
-        <xsl:choose>
-            <xsl:when test="/root/request/debug">
-                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
-            </xsl:when>
-            <xsl:otherwise>
-              <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>      
-            </xsl:otherwise>
-        </xsl:choose>
+        <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
 
         <xsl:call-template name="geoHeader"/>
         <xsl:call-template name="mapfish_script_includes"/>

diff --git a/web/src/main/webapp/xsl/extent-edit.xsl b/web/src/main/webapp/xsl/extent-edit.xsl
@@ -16,14 +16,7 @@
     <xsl:template mode="script" match="/">
 
         <!-- To avoid an interaction with prototype and ExtJs.Tooltip, should be loaded before ExtJs -->
-        <xsl:choose>
-            <xsl:when test="/root/request/debug">
-                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
-            </xsl:when>
-            <xsl:otherwise>
-              <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>      
-            </xsl:otherwise>
-        </xsl:choose>
+        <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
 
         <xsl:call-template name="geoHeader"/>
         <xsl:call-template name="mapfish_script_includes"/>

diff --git a/web/src/main/webapp/xsl/geo/utils.xsl b/web/src/main/webapp/xsl/geo/utils.xsl
@@ -22,14 +22,14 @@
                 <script type="text/javascript" src="{/root/gui/url}/scripts/form_check.js"></script>
             </xsl:when>
             <xsl:otherwise>
-                <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>
+                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
                 <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.scriptaculous.js"></script>
                 <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.js"></script>    
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
 
-    <xsl:template name="geoCssHeader">
+    <xsl:template name="geoCssHeader">ß
         <link rel="stylesheet" type="text/css" href="../../scripts/ext/resources/css/ext-all.css"/>
         <link rel="stylesheet" type="text/css" href="{/root/gui/url}/scripts/ext/resources/css/file-upload.css" />
         <link rel="stylesheet" type="text/css" href="../../scripts/openlayers/theme/geonetwork/style.css"/>

diff --git a/web/src/main/webapp/xsl/geocat.xsl b/web/src/main/webapp/xsl/geocat.xsl
@@ -23,14 +23,7 @@
     <xsl:template mode="script" match="/">
 
         <!-- To avoid an interaction with prototype and ExtJs.Tooltip, should be loaded before ExtJs -->
-        <xsl:choose>
-            <xsl:when test="/root/request/debug">
-                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
-            </xsl:when>
-            <xsl:otherwise>
-              <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>      
-            </xsl:otherwise>
-        </xsl:choose>
+        <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
 
         <xsl:call-template name="geoHeader"/>
         <xsl:call-template name="mapfish_script_includes"/>

diff --git a/web/src/main/webapp/xsl/main-page.xsl b/web/src/main/webapp/xsl/main-page.xsl
@@ -19,14 +19,7 @@
 	<xsl:template mode="script" match="/">
 
         <!-- To avoid an interaction with prototype and ExtJs.Tooltip, should be loadded before ExtJs -->
-        <xsl:choose>
-            <xsl:when test="/root/request/debug">
-                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
-            </xsl:when>
-            <xsl:otherwise>
-              <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>      
-            </xsl:otherwise>
-        </xsl:choose>
+        <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
 
 		<xsl:call-template name="geoHeader"/>
 

diff --git a/web/src/main/webapp/xsl/reusable_admin_non_validated_results.xsl b/web/src/main/webapp/xsl/reusable_admin_non_validated_results.xsl
@@ -15,14 +15,7 @@
     <xsl:template mode="script" match="/">
 
         <!-- To avoid an interaction with prototype and ExtJs.Tooltip, should be loaded before ExtJs -->
-        <xsl:choose>
-            <xsl:when test="/root/request/debug">
-                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
-            </xsl:when>
-            <xsl:otherwise>
-              <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>      
-            </xsl:otherwise>
-        </xsl:choose>
+        <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
 
         <xsl:call-template name="geoHeader"/>
         <script src="{/root/gui/url}/scripts/RowExpander.js" type="text/javascript"/>

diff --git a/web/src/main/webapp/xsl/search-results.xsl b/web/src/main/webapp/xsl/search-results.xsl
@@ -28,15 +28,7 @@
 		</script>
 
          <!-- To avoid an interaction with prototype and ExtJs.Tooltip, should be loadded before ExtJs -->
-         <xsl:choose>
-            <xsl:when test="/root/request/debug">
-                <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
-            </xsl:when>
-            <xsl:otherwise>
-              <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"></script>
-            </xsl:otherwise>
-        </xsl:choose>
-
+        <script type="text/javascript" src="{/root/gui/url}/scripts/prototype.js"></script>
 
         <xsl:choose>
             <xsl:when test="/root/request/debug">