Permalink
Browse files

Fix for Ticket #996

Cleanup headers to avoid duplicate loading of the same headers.
Duplicate loading of the protocol.js was causing ie7 to fail.
  • Loading branch information...
1 parent a0d8656 commit 5eb4ef2410a8f3e1545f4ea6f1046b034a4621fe @ianwallen ianwallen committed Feb 4, 2013
Showing with 0 additions and 28 deletions.
  1. +0 −25 web/src/main/webapp/xsl/main-page.xsl
  2. +0 −3 web/src/main/webapp/xsl/metadata-show.xsl
@@ -18,16 +18,6 @@
-->
<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"/><xsl:text>&#10;</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.js"/><xsl:text>&#10;</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
-
<xsl:call-template name="geoHeader"/>
<!-- Required by keyword selection panel -->
@@ -37,10 +27,6 @@
<xsl:choose>
<xsl:when test="/root/request/debug">
- <script type="text/javascript" src="{/root/gui/url}/scripts/geonetwork.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/scriptaculous/scriptaculous.js?load=slider,effects,controls"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/modalbox.js"/><xsl:text>&#10;</xsl:text>
-
<script type="text/javascript" src="{/root/gui/url}/scripts/gn_search.js"/><xsl:text>&#10;</xsl:text>
<!--link rel="stylesheet" type="text/css" href="{/root/gui/url}/scripts/ext/resources/css/ext-all.css" />
@@ -49,15 +35,6 @@
<link rel="stylesheet" type="text/css" href="{/root/gui/url}/scripts/openlayers/theme/default/style.css"/>
<link rel="stylesheet" type="text/css" href="{/root/gui/url}/geonetwork_map.css" /-->
- <script type="text/javascript" src="{/root/gui/url}/scripts/ext/adapter/ext/ext-base.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/ext/ext-all.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/ext/form/FileUploadField.js"/><xsl:text>&#10;</xsl:text>
-
- <script type="text/javascript" src="{/root/gui/url}/scripts/openlayers/OpenLayers.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/openlayers/addins/LoadingPanel.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/openlayers/addins/ScaleBar.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/geo/proj4js-compressed.js"/><xsl:text>&#10;</xsl:text>
-
<script type="text/javascript" src="{/root/gui/url}/scripts/geoext/lib/GeoExt.js"/><xsl:text>&#10;</xsl:text>
<script type="text/javascript" src="{/root/gui/url}/scripts/mapfish/MapFish.js"/><xsl:text>&#10;</xsl:text>
@@ -119,8 +96,6 @@
<script type="text/javascript" src="{/root/gui/url}/scripts/editor/metadata-editor.js"/><xsl:text>&#10;</xsl:text>
</xsl:when>
<xsl:otherwise>
- <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.libs.scriptaculous.js"/><xsl:text>&#10;</xsl:text>
- <script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.js"/><xsl:text>&#10;</xsl:text>
<script type="text/javascript" src="{/root/gui/url}/scripts/lib/gn.search.js"/><xsl:text>&#10;</xsl:text>
<!-- Editor JS is still required here at least for batch operation -->
@@ -34,9 +34,6 @@
<xsl:template mode="script" match="/">
<script type="text/javascript" src="{/root/gui/url}/scripts/core/kernel/kernel.js"/>
<xsl:call-template name="geoHeader"/>
- <xsl:call-template name="jsHeader">
- <xsl:with-param name="small" select="false()"/>
- </xsl:call-template>
<xsl:choose>
<xsl:when test="/root/request/debug">

0 comments on commit 5eb4ef2

Please sign in to comment.