Changeset 37868 for gs3-installations/thewillow

Timestamp:

2023-08-01T23:42:33+12:00 (11 months ago)

Author:

davidb

Message:

General improvements to bring the design more in-line with ThomFong

Location:

gs3-installations/thewillow/trunk/interfaces/thewillow

Files:

• style/core-extra.css (modified) (2 diffs)
• transform/layouts/header.xsl (modified) (9 diffs)
• transform/pages/query.xsl (modified) (2 diffs)

gs3-installations/thewillow/trunk/interfaces/thewillow/style/core-extra.css

@@ -77 +77 @@
 
 #container {
-    max-width: 1300px;
+    max-width: 1280px;
 }
 
 #topArea {
-    max-width: 1300px;
+    max-width: 1280px;
 }
 
@@ -346 +346 @@
 }
 
+#gs_content {
+    width: 80%;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.metadataTable{
+    width: 100%;
+}
+
+#commentarea textarea {
+    width: 100%;
+}
+
 #gs_content a {
     border-bottom: 1px solid #003FC5;

gs3-installations/thewillow/trunk/interfaces/thewillow/transform/layouts/header.xsl

@@ -67 +67 @@
 
   <xsl:template name="top-area">
+    <!--
     <xsl:if test="/page/pageRequest/paramList/param[@name = 'noheader']/@value != '1'">
-      <xsl:call-template name="top-area-streetlifeyork"/>
+    -->
+    <xsl:call-template name="top-area-streetlifeyork"/>
+    <!--
     </xsl:if>
+    -->
   </xsl:template>
   
@@ -141 +145 @@
               </div>
             </div>
+
+        
             <div id="banner">
               <div>
@@ -167 +173 @@
                   </div>
                 </div>
-        
+
+        <!-- **** supressed in ThomFong design **** -->
+        <!--
         <div id="block-breadcrumbs">    
           <nav role="navigation" aria-labelledby="system-breadcrumb">
@@ -187 +195 @@
           </nav>          
         </div>
-
+        -->
+        
               </div>
             </div>
@@ -264 +273 @@
 
 
-        <xsl:if test="/page/pageRequest/@subaction = 'about2'">
+        <xsl:if test="/page/pageRequest/@subaction = 'about2XXXX'">
       <style>
         #new-banner {
@@ -290 +299 @@
       <ul id="gs-nav">
     <!-- if this collection has additional tabs, add them here -->
-    <xsl:call-template name="additionalNavTabs"/>
+    <xsl:call-template name="additionalNavTabsPre"/>
     <!-- If this collection has a ClassifierBrowse service then add a tab for each classifier-->
     <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@type='browse' and @name='ClassifierBrowse']">
@@ -358 +367 @@
       <xsl:call-template name="navigationTab"/>
     </xsl:for-each>
+
+    <xsl:call-template name="additionalNavTabsPost"/>   
       </ul>
 
       <!-- consider developing inclusion of the following, expressed as a global gsf:option switch/text? -->
+      <!--
       <xsl:call-template name="home-help-preferences-tab-alternative"/>
+      -->
       
       <div style="clear:both;"><xsl:text> </xsl:text></div>
@@ -367 +380 @@
   </xsl:template>
   
-  <!--
+  
   <xsl:template name="create-banner">       
     <div id="gs_banner" class="ui-widget-header ui-corner-bottom">
+      <!--
       <div id="titlesearchcontainer">
     <xsl:call-template name="page-title-area"/>
+    - -
     <xsl:call-template name="quick-search-area"/>
+    - -
     <div style="clear:both;"><xsl:text> </xsl:text></div>
       </div>
-      <xsl:call-template name="browsing-tabs"/>
+      -->
+
+      <style>
+        #new-banner {
+          width: 1280px;
+          margin-left: auto;
+          margin-right: auto;
+          /*min-height: 250px; */
+          height: 250px;
+          /* background-image: url(interfaces/thewillow/images/banner-willow-disco.jpg); */
+          background-image: url(interfaces/thewillow/images/banner-images/5-love-it-Ceri-Oakes.png);
+          
+        }
+      </style>
+      <div id="new-banner">
+    <div style="float: right">
+      <!-- <br /> -->
+      <img height="240" src="interfaces/thewillow/images/willow-streetlife-motif-logo-vicki-fong-2023.png"/>
+      <div style="position: absolute; right: 1rem; bottom: -1.5rem;">
+        <i>Banner image courtesy of Ceri Oakes</i>
+      </div>
+    </div>
+    <!--
+    <div style="clear:both;"><xsl:text> </xsl:text></div>
+    -->
+    <div style="position: absolute; bottom: 0px;">
+      <xsl:call-template name="browsing-tabs"/>
+    </div>
+
+      </div>
+
+      
+
     </div>
   </xsl:template>
-  -->
-
-  <xsl:template name="additionalNavTabs">
+  
+
+  <xsl:template name="additionalNavTabsPre">
     <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">
       <a href="library/collection/{$collName}/page/about" title="About this collection">Willow Archive Project</a>
@@ -387 +435 @@
   </xsl:template>
 
+
+  <xsl:template name="additionalNavTabsPost">
+
+    <xsl:if test="/page/pageResponse/collection[@name=$collNameChecked]/serviceList/service[@name='TextQuery' and @type='query']">
+      <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active">        
+    <a>
+      <xsl:attribute name="href">
+        <xsl:value-of select="$library_name"/>/collection/<xsl:value-of select="$collNameChecked"/>/search/TextQuery
+      </xsl:attribute>
+      Explore More
+    </a>
+      </li>
+    </xsl:if>    
+  </xsl:template>
+  
 </xsl:stylesheet>

gs3-installations/thewillow/trunk/interfaces/thewillow/transform/pages/query.xsl

@@ -35 +35 @@
     .rt-column {
       float: left;
-      width: 24%;
+      /* width: 24%; */
+      width: 225px;
       margin: 6px;
       /*height: 300px;*/ /* Should be removed. Only for demonstration */
-      height: 250px;
-      background-color: #eeeeee;
+      height: 225px;
+      background-color: #f7f7f7;
     }
 
@@ -63 +64 @@
       </table>
 
+      <div style="clear:both;"><xsl:text> </xsl:text></div>
       <!-- Previous/Next buttons-->
       <xsl:call-template name="prevNextButtons"/>