Changeset 26307

Timestamp:

2012-10-11T16:39:21+13:00 (12 years ago)

Author:

sjm84

Message:

The view option images can now be clicked as well as the checkboxes

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/document_scripts.js (modified) (2 diffs)
• transform/layouts/toc.xsl (modified) (7 diffs)

main/trunk/greenstone3/web/interfaces/default/js/document_scripts.js

@@ -950 +950 @@
 * HIGHLIGHTING SCRIPTS *
 ***********************/
-function swapHighlight()
+function swapHighlight(imageClicked)
 {
     var hlCheckbox = document.getElementById("highlightOption");
+
+    if(imageClicked)
+    {
+        $(hlCheckbox).attr("checked", !$(hlCheckbox).attr("checked"));
+    }
     
     var from;
@@ -1035 +1040 @@
 {
     var option = document.getElementById("rbOption");
+    var optionImage = document.getElementById("rbOptionImage");
+    
     if(rbOn)
     {
         option.setAttribute("onclick", "hideText(); showBook(); swapLinkJavascript(false);");
+        optionImage.setAttribute("onclick", "hideText(); showBook(); swapLinkJavascript(false);");
+        $(option).attr("checked", false);
     }
     else
     {
         option.setAttribute("onclick", "hideBook(); showText(); swapLinkJavascript(true);");
+        optionImage.setAttribute("onclick", "hideBook(); showText(); swapLinkJavascript(true);");
+        $(option).attr("checked", true);
     }
 }

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

@@ -265 +265 @@
                         </xsl:choose>
                     </xsl:attribute>
-                    <img>
+                    <img onclick="showSlideShow()">
                         <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'slideshow_image')"/></xsl:attribute>
                     </img>
@@ -283 +283 @@
                     <li>
                         <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.realisticBooksTooltip')"/></xsl:attribute>
-                        <img>
+                        <img id="rbOptionImage" onclick="bookInit();">
                             <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'realistic_books_image')"/></xsl:attribute>
                         </img>
@@ -294 +294 @@
                     <li>
                         <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.highlightTooltip')"/></xsl:attribute>
-                        <img>
+                        <img onclick="swapHighlight(true);">
                             <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'highlight_image')"/></xsl:attribute>
                         </img>
-                        <input id="highlightOption" type="checkbox" class="optionCheckBox" onclick="swapHighlight();">
+                        <input id="highlightOption" type="checkbox" class="optionCheckBox" onclick="swapHighlight(false);">
                             <xsl:if test="/page/pageRequest/paramList/param[@name = 'hl']/@value = 'on'">
                                 <xsl:attribute name="checked">true</xsl:attribute>
@@ -308 +308 @@
                 <li id="zoomOptions" style="display:none;">
                     <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.zoomTooltip')"/></xsl:attribute>
-                    <img>
+                    <img id="zoomToggleImage">
                         <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'zoom_image')"/></xsl:attribute>
                     </img>
@@ -318 +318 @@
                                 _imageZoomEnabled = $("#zoomToggle").attr("checked");
                             });
+                            
+                            $("#zoomToggleImage").click(function()
+                            {
+                                $("#zoomToggle").attr("checked", !$("#zoomToggle").attr("checked"));
+                                _imageZoomEnabled = $("#zoomToggle").attr("checked");
+                            });
                         </xsl:text>
                     </script>
@@ -326 +332 @@
                     <li id="floatingTOCOptions">
                         <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.floatingTooltip')"/></xsl:attribute>
-                        <img>
+                        <img id="floatTOCToggleImage">
                             <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'float_toc_image')"/></xsl:attribute>
                         </img>
@@ -337 +343 @@
                                     floatMenu($("#floatTOCToggle").attr("checked"));
                                 });
+                                
+                                $("#floatTOCToggleImage").click(function()
+                                {
+                                    $("#floatTOCToggle").attr("checked", !$("#floatTOCToggle").attr("checked"))
+                                    floatMenu($("#floatTOCToggle").attr("checked"));
+                                });
                             </xsl:text>
                         </script>