Changeset 34626

Timestamp:

2020-12-18T23:40:31+13:00 (3 years ago)

Author:

anupama

Message:

1. Pou (GS3 group) image and full group description now link, not just the title overlaid on the image. 2. Tidying up css file added today and xsl modifications.

Location:

main/trunk/model-interfaces-dev/wmtb

Files:

• styles/gs-wmtb-custom.css (modified) (5 diffs)
• transform/layouts/header.xsl (modified) (1 diff)
• transform/layouts/main.xsl (modified) (1 diff)
• transform/pages/home.xsl (modified) (5 diffs)

main/trunk/model-interfaces-dev/wmtb/styles/gs-wmtb-custom.css

@@ -2 +2 @@
     text-decoration: none;
     font-weight: normal;
-    color: rgb(86, 154, 189);
+    color: rgb(86, 154, 189); /* a light blue */
 }
 
+/* rgb(79, 79, 78);*/ /* a dark black/grey */
+
 a:hover, span#addNewMD:hover, span#clearSaved:hover {
-    color: rgb(250, 138, 0); /*orange*/ /* rgb(79, 79, 78);*/ /*dark black/grey*/
+    color: rgb(250, 138, 0); /*orange*/ 
 }
 
@@ -34 +36 @@
 }
 #gs_content a {
-    /*text-decoration: underline;*/
-    /*font-weight: bold;*/
-
-    /*text-decoration: none;*/
-    /*color: DarkGrey;*/
-    /*color: rgb(79, 79 ,78); rgb(86, 154, 189);*/
     line-height: 1.5rem;
 }
-/*
-#gs_content a:hover {
-    color: DarkGrey; rgb(86, 154, 189);
-}
-*/
+
 /*
 #gs_content a:visited {
@@ -72 +64 @@
     margin: 0.25rem 1.5rem 0.5rem 1.5rem;
 }
-/* overriding */
-#wsite-content div.img-and-desc div.paragraph a {
-    /*text-decoration: none;*/
+
+span.pou-group-title { /* if overriding: #wsite-content div.img-and-desc div.paragraph a {*/
     font-variant: small-caps;
     color: white;
@@ -101 +92 @@
     display: inline;
     margin: 0 0.5rem;
-    /*text-transform: capitalize;*/
+    /*text-transform: capitalize;*/ /* Will Titlecase all menus including Browsing Classifiers */
 }
-
 
 div#topnav li, .query-form-links li {
     line-height: 2rem;    
 }
-/*#wizardBar a, span#addNewMD, span#clearSaved {
-    color: rgb(86, 154, 189);
-}*/
 
 div#wizardContainer {
@@ -116 +103 @@
 }
 
-
-
+/* To insert a | between nav menu links */
 /*div#topnav li::after, .query-form-links li::after {
     content: " | ";
 }*/
-
-div#topline a, div#topnav a, .query-form-links a {
-    /*text-decoration: none;*/
-    font-weight: normal;
-}
 
 div#topnav {

main/trunk/model-interfaces-dev/wmtb/transform/layouts/header.xsl

@@ -77 +77 @@
         <link rel="stylesheet" type="text/css" href="interfaces/{$interface_name}/styles/wsite.css"/>
 
+        <!-- The all important Greenstone styling customisations -->
         <link rel="stylesheet" href="interfaces/{$interface_name}/styles/gs-wmtb-custom.css" type="text/css" />
         

main/trunk/model-interfaces-dev/wmtb/transform/layouts/main.xsl

@@ -28 +28 @@
       <div class="wrapper">
 
-    <!-- Whakatohea.co.nz's navbar -->
+    <!-- Whakatohea.co.nz's navbar - no longer in use now that the dl site is
+         embedded in iframe on whakatohea.co.nz site which provides the navbar -->
     <!--<xsl:call-template name="whakatohea-navbar"/>-->
     

main/trunk/model-interfaces-dev/wmtb/transform/pages/home.xsl

@@ -49 +49 @@
               </div>
             </xsl:if>
-            <!-- forced to add nbsp (which in XSL is &#160;) in div.wsite-spacer
+            <!-- NO LONGER A PROBLEM AS THE DL SITE IS NOW EMBEDDED IN AN IFRAME
+                 AND SO DOES NOT PROVIDE THE FOOTER OF THE whakatohea.co.nz SITE.
+                 Forced to add nbsp (which in XSL is &#160;) in div.wsite-spacer
                  because otherwise text overflows from the main page into footer 
                  caused by html rendering of div.wsite-spacer's subsequent sibling
@@ -213 +215 @@
       <xsl:if test="util:checkFileExistence($site_name, backgroundImage)">
         <div class="wsite-image wsite-image-border-thin " style="padding-top:10px;padding-bottom:10px;margin-left:0;margin-right:0;text-align:center">
+          <!-- the group (pou) image links to the collection's about page -->
+          <a href="{$group_href}" title="{$short}" alt="{$short}">
           <img class="groupLinkImage">
         <xsl:attribute name="alt"><xsl:value-of select="@name"/></xsl:attribute>
@@ -219 +223 @@
         <xsl:attribute name="src">sites/<xsl:value-of select="$site_name"/>/<xsl:value-of select="backgroundImage"/></xsl:attribute>
           </img>
+          </a>
         </div>
 
       </xsl:if>
 
+      <!-- group description also links to the collection's about page
+           since it is overlaid on the image with absolute positioning
+           and therefore obscures the image link
+      -->
       <!-- some text for the group -->
+      <a href="{$group_href}" title="{$short}" alt="{$short}">
       <div class="paragraph">
-        <!-- group title links to the collection's about page -->
-        <a href="{$group_href}" title="{$short}" alt="{$short}">
+        <span class="pou-group-title">
           <xsl:choose>
         <xsl:when test="boolean(title)">
@@ -235 +244 @@
         </xsl:otherwise>
           </xsl:choose>
-        </a>
+        </span>
         <br />      
         <xsl:choose>
@@ -247 +256 @@
           </xsl:otherwise>
         </xsl:choose>
-      </div>
-
-    </div>
+      </div><!--end div.paragraph-->
+      </a>
+    </div><!-- end div.img-and-desc-->
        <!-- <div style="display:block;font-size:90%"></div>   -->
     </xsl:template>