Changeset 38087 for main/trunk

Timestamp:

2023-09-10T17:42:04+12:00 (10 months ago)

Author:

davidb

Message:

Variety of changes: (i) Using 'class' to make these <br>'s eaiser to identify, similar to other XSL files; (ii) relocation of ace.js script to be only used when editing (done to avoid seeing the warning message all the time that this file triggers in browsers such as Chrome; (iii) Some jquery-ui class name changes -- while I don't now recall the exact reason for this, I believe it was to bring these elements more into line with how this is done elsewhere in the banner; (iv) the CSS that gets deleted in this commit is now present in core.css

File:

• main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl (modified) (6 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/header.xsl

@@ -140 +140 @@
     <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-ui-1.13.0.custom/jquery-ui.min.js"><xsl:text> </xsl:text></script>
     <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.blockUI.js"><xsl:text> </xsl:text></script>
-    <script type="text/javascript" src="interfaces/{$interface_name}/js/ace/ace.js"><xsl:text> </xsl:text></script>
 
     <xsl:call-template name="opt-google-maps-api"/>
@@ -172 +171 @@
       <xsl:if test="/page/pageRequest/paramList/param[(@name='docEdit') and (@value='on' or @value='true' or @value='1')]">
        
-         
+            <script type="text/javascript" src="interfaces/{$interface_name}/js/ace/ace.js"><xsl:text> </xsl:text></script>      
         <script type="text/javascript" src="interfaces/{$interface_name}/js/ckeditor/ckeditor.js" defer="true"><xsl:text> </xsl:text></script>  
         <!--            <xsl:call-template name="init-direct-edit"/>    -->
@@ -361 +360 @@
     
   </xsl:template>
+
   <!-- ***** BROWSING TABS ***** -->
   <xsl:template name="browsing-tabs">
@@ -463 +463 @@
 
   <xsl:template name="home-help-preferences-tab-alternative">
-    <style>
-      #bannerLinksTab {
-        list-style: none outside none;
-        padding: 0px;
-        margin: 0 0 0 20px;
-        font-size: 14px;
-      }
-
-      #bannerLinksTab li {
-        float: right;
-        display: inline;
-        margin-right: 5px;
-        padding: 3px 5px 5px 7px;
-        text-transform: capitalize;
-        text-align: center;
-        border-bottom: 0px;
-      }
-      
-      li.ui-tab-styling {
-      }
-    </style>    
     <ul id="bannerLinksTab">
       <xsl:if test="/page/pageResponse/format[@type='display' or @type='browse' or @type='search' or not(@type)]/gsf:option[@name='RSS']/@value = 'true'">
-        <li class="ui-tab-styling"><xsl:call-template name="RSSLink"/></li>
-      </xsl:if>
-      <li class="ui-tab-styling"><xsl:call-template name="PrefsLink"/></li>
-      <li class="ui-tab-styling"><xsl:call-template name="HelpLink"/></li>
-      <li class="ui-tab-styling" id="userMenuButton"><xsl:call-template name="LoginoutLink"/></li>
+        <li class="ui-state-default ui-corner-top"><xsl:call-template name="RSSLink"/></li>
+      </xsl:if>
+      <li class="ui-state-default ui-corner-top"><xsl:call-template name="PrefsLink"/></li>
+      <li class="ui-state-default ui-corner-top"><xsl:call-template name="HelpLink"/></li>
+      <li class="ui-state-default ui-corner-top" id="userMenuButton"><xsl:call-template name="LoginoutLink"/></li>
       <xsl:if test="/page/pageRequest/paramList/param[(@name='debug') and (@value='on' or @value='true' or @value='1' or @value='yes')]">
-        <li class="ui-tab-styling"><xsl:call-template name="DebugLink"/></li>
+        <li class="ui-state-default ui-corner-top"><xsl:call-template name="DebugLink"/></li>
       </xsl:if>
       <!--
@@ -698 +677 @@
     
     <xsl:variable name="url" select="/page/pageRequest/@fullURL"/>
+
     <xsl:variable name="beforeLogout" select="substring-before($url, '&amp;amp;logout=')"/>
     <xsl:variable name="tmpAfter" select="substring-after($url, '&amp;amp;logout=')"/>
@@ -954 +934 @@
             </xsl:attribute>
           </input>
-          <br/>
+          <br id="br-afterQuickSearchSubmitButton"/>
         </xsl:if>
           </form>
         </xsl:when>
-        <xsl:otherwise><br/></xsl:otherwise>
+        <xsl:otherwise><br id="br-otherwiseQueryFormRelated"/></xsl:otherwise>
       </xsl:choose>         
     </xsl:if>