Changeset 36024 for main

Timestamp:

2022-02-01T11:28:29+13:00 (2 years ago)

Author:

cstephen

Message:

Minor theme updates, fix theme switcher, modify theme loading

Location:

main/trunk/greenstone3/web/interfaces/default_wip

Files:

• interfaceConfig.xml (modified) (1 diff)
• style/themes/main/images/ui-bg_gloss-wave_50_43a21a_500x100.png (added)
• style/themes/main/jquery-ui.theme.css (modified) (1 diff)
• style/themes/main/jquery-ui.theme.min.css (deleted)
• transform/layouts/header.xsl (modified) (1 diff)
• transform/pages/pref.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default_wip/interfaceConfig.xml

@@ -47 +47 @@
     </actionList>
     <optionList>
-        <option name="cssTheme" value="interfaces/default_wip/style/themes/main/jquery-ui.theme.min.css"/>
+        <!-- Uncomment and update this option if you want to introduce custom CSS to this interface. -->
+        <!-- <option name="cssTheme" value="interfaces/default_wip/style/themes/main/jquery-ui.theme.css"/> -->
+
         <option name="highlightQueryTerms" value="true"/>
         <!-- Set one or other of the following two options (berryBasket and favouriteBasket) to true -->

main/trunk/greenstone3/web/interfaces/default_wip/style/themes/main/jquery-ui.theme.css

@@ -42 +42 @@
 .ui-widget-header {
     border: 1px solid #d4ccb0;
-    background: #ece8da url("images/ui-bg_gloss-wave_100_ece8da_500x100.png") 50% 50% repeat-x;
-    color: #433f38;
+    background: #ece8da url("images/ui-bg_gloss-wave_50_43a21a_500x100.png") 50% 50% repeat-x;
+    color: #ffffff;
     font-weight: bold;
 }
 .ui-widget-header a {
-    color: #433f38;
+    color: #ffffff;
 }
 

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

@@ -106 +106 @@
     </script>
 
-    <xsl:choose>
+    <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui.theme.css" type="text/css"/>
+    <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui.structure.min.css" type="text/css"/>
+    <link rel="stylesheet" href="interfaces/{$interface_name}/style/core.css" type="text/css"/>
+    <!-- Get the theme from the interfaceConfig.xml file -->
+    <xsl:choose>
         <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'cssTheme']/@value">
-            <!-- Get the theme from the interfaceConfig.xml file -->
             <link rel="stylesheet" href="{/page/pageResponse/interfaceOptions/option[@name = 'cssTheme']/@value}" type="text/css"/>
         </xsl:when>
-        <xsl:otherwise>
-            <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui.theme.min.css" type="text/css"/>
-        </xsl:otherwise>
     </xsl:choose>
-
-    <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui.structure.min.css" type="text/css"/>
-    <link rel="stylesheet" href="interfaces/{$interface_name}/style/core.css" type="text/css"/>
     <xsl:call-template name="favicon"/>
     

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/pref.xsl

@@ -265 +265 @@
                                         name: "custom-theme0",
                                         icon: "theme_90_greenstone.png",
-                                        url: "interfaces/" + gs.xsltParams.interface_name + "/style/themes/main/jquery-ui.theme.min.css"
+                                        url: "interfaces/" + gs.xsltParams.interface_name + "/style/themes/main/jquery-ui.theme.css"
                                     },
                                 ]