Changeset 37181

Timestamp:

2023-01-25T00:26:22+13:00 (15 months ago)

Author:

davidb

Message:

Further improvements after testing

Location:

gs3-installations/whakatohea-dl/trunk/sites/wmtb/collect/tipple-waiata

Files:

• etc/collectionConfig.xml (modified) (2 diffs)
• script/document_extra.js (added)

gs3-installations/whakatohea-dl/trunk/sites/wmtb/collect/tipple-waiata/etc/collectionConfig.xml

@@ -274 +274 @@
 
             <gsf:template name="documentContent">
+              <script type="text/javascript" src="sites/{$site_name}/collect/{$collName}/script/document_extra.js"><xsl:text> </xsl:text></script>
+                
               <div id="gs-document">
                 <xsl:call-template name="documentPre"/>
@@ -280 +282 @@
                   <gsf:when name="Type" test="equals">
                 <gsf:div>Type: <gsf:metadata name="Type"/></gsf:div>
-                <gsf:div>Lang: <xsl:value-of select="$lang"/></gsf:div>
-
+                
                 <xsl:choose>
                   <xsl:when test="$lang = 'mi'">
-                    <gsf:div> <gsf:metadata name="mi_NZ_TEASER_caption"/></gsf:div>
-                    <gsf:div> <gsf:metadata name="mi_NZ_TEASER_content"/></gsf:div>
+
+                    <gsf:div>
+                      Metadata in: Te reo Māori (or switch to <a href="{$library_name}/collection/{$collName}/document/{$docID}?l=en">English</a>)
+                    </gsf:div>
                     <hr />
-                    <gsf:div> <gsf:metadata name="mi_NZ_DESCRIPTION_caption" separator="; "/></gsf:div>
-                    <gsf:div> <gsf:metadata name="mi_NZ_DESCRIPTION_content" separator="; "/></gsf:div>
+
+                    <gsf:script>
+                      $(document).ready(function() {
+                          displayMetadataDiv("In brief:", ["caption","content"], ["mi_NZ_TEASER_caption", "mi_NZ_TEASER_content"], "tipple-metadata");
+                      });
+                    </gsf:script>
+                    
+                    <gsf:metadata hidden="true" name="mi_NZ_TEASER_caption"/>
+                    <gsf:metadata hidden="true" name="mi_NZ_TEASER_content"/>
+                    
+                    <gsf:script>
+                      $(document).ready(function() {
+                          displayMetadataDiv("In more detail:", ["caption","content"], ["mi_NZ_DESCRIPTION_caption", "mi_NZ_DESCRIPTION_content"], "tipple-metadata");
+                      });
+                    </gsf:script>
+                    
+                    <gsf:metadata hidden="true" name="mi_NZ_DESCRIPTION_caption"/>
+                    <gsf:metadata hidden="true" name="mi_NZ_DESCRIPTION_content"/>
+                    
                   </xsl:when>
                   <xsl:otherwise>
-                    <gsf:div> <gsf:metadata name="en_TEASER_caption"/></gsf:div>
-                    <gsf:div> <gsf:metadata name="en_TEASER_content"/></gsf:div>
+                    <gsf:div>
+                      Metadata in : English (or switch to <a href="{$library_name}/collection/{$collName}/document/{$docID}?l=mi">Te Reo Māori</a>)
+                    </gsf:div>
                     <hr />
-                    <gsf:div> <gsf:metadata name="en_DESCRIPTION_caption" separator="; "/></gsf:div>
-                    <gsf:div> <gsf:metadata name="en_DESCRIPTION_content" separator="; "/></gsf:div>
+
+                    <gsf:script>
+                      $(document).ready(function() {
+                          displayMetadataDiv("In brief:", ["caption","content"], ["en_TEASER_caption", "en_TEASER_content"], "tipple-metadata");
+                      });
+                    </gsf:script>
+                    
+                    <gsf:metadata hidden="true" name="en_TEASER_caption"/>
+                    <gsf:metadata hidden="true" name="en_TEASER_content"/>
+
+                    <gsf:script>
+                      $(document).ready(function() {
+                          displayMetadataDiv("In more detail:", ["caption","content"], ["en_DESCRIPTION_caption", "en_DESCRIPTION_content"], "tipple-metadata");
+                      });
+                    </gsf:script>                   
+                    <gsf:metadata hidden="true" name="en_DESCRIPTION_caption"/>
+                    <gsf:metadata hidden="true" name="en_DESCRIPTION_content"/>
                   </xsl:otherwise>
                 </xsl:choose>
-                
+                <gsf:div id="tipple-metadata"/>
                   </gsf:when>
                 </gsf:switch>
-                
+
+                <gsf:div id="tipple-assocfiles"/>
+                <gsf:metadata hidden="true" name="contentType"/>
+                <gsf:metadata hidden="true" name="sourceUri"/>              
+
+                <gsf:script>
+                  $(document).ready(function() {
+                      displayAssocfilesDiv("Media elements:", "tipple-assocfiles");
+                  });
+                </gsf:script>                   
+
                 <!--
                 <xsl:call-template name="wrappedSectionImage"/>
                 -->
-                <div id="gs-document-text" style="font-size: 65%; line-height: 140%">
+                <div id="gs-document-text" style="font-size: 75%; line-height: 120%; display: none;">
                 <xsl:call-template name="documentNodeText"/>
                 </div>
                   </div>
+
+              
               <xsl:call-template name="documentPost"/>