Changeset 26216 for main

Timestamp:

2012-09-19T15:33:31+12:00 (12 years ago)

Author:

sjm84

Message:

Removed the option to resize the zoom window and made it the same as other view options. Also made the back to top links a gsf:option

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• images/zoom.png (added)
• style/core.css (modified) (3 diffs)
• transform/layouts/toc.xsl (modified) (2 diffs)
• transform/pages/document.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/style/core.css

@@ -168 +168 @@
     padding: 20px 20px 10px;
     min-height: 300px;
+}
+
+#gs-document {
+    /*width:67%;
+    overflow:auto;*/
 }
 
@@ -210 +215 @@
 #viewOptions li {
     list-style:none;
+    float:left;
     padding: 5px;
-}
-
-#zoomOptions {
-    margin: 0px;
-    padding: 0px;
-    width: 100%;
-}
-
-#zoomOptions li {
-    margin:5px;
-    list-style:none;
-    display: inline-block;
 }
 
@@ -658 +652 @@
 .tableOfContentsContainer {
     padding:1px;
+    max-height:500px;
+    overflow:auto;
 }
 

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

@@ -286 +286 @@
                     </li>
                 </xsl:if><xsl:text> </xsl:text>
-            </ul>
-            <ul id="zoomOptions">
-                <!-- This is invisible unless it is made visible by Javascript controlling the image zooming -->
-                <xsl:attribute name="style">display: none;</xsl:attribute>
-                <li style="width:10%;">
-                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.zoom')"/>
-                </li>
-                <li style="width:5%;">
+                
+                <li id="zoomOptions" style="display:none;">
+                    <img>
+                        <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'zoom_image')"/></xsl:attribute>
+                    </img>
                     <input id="zoomToggle" type="checkbox"/>
                     <script type="text/javascript">
@@ -304 +301 @@
                     </script>
                 </li>
-                <li style="width:15%;"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.zoom_size')"/><xsl:text>:</xsl:text></li>
-                <li id="zoomSlider" style="width:50%; height:5px;"><xsl:text> </xsl:text></li>
-                <script type="text/javascript">
-                    <xsl:text disable-output-escaping="yes">
-                        $("#zoomSlider").slider(
-                        {
-                            change: function(event, ui)
-                            {
-                                var sliderValue = ui.value;
-                                var divs = document.getElementsByTagName("DIV");
-                                for(var i = 0; i &lt; divs.length; i++)
-                                {
-                                    if(divs[i].getAttribute("id") &amp;&amp; divs[i].getAttribute("id").search(/^mover.*/) != -1)
-                                    {
-                                        divs[i].style.height = 400 + (2 * sliderValue) + "px";
-                                        divs[i].style.width = 400 + (2 * sliderValue) + "px";
-                                    }
-                                }
-                            }
-                        });
-                    </xsl:text>
-                </script>
-                <style>.ui-slider .ui-slider-handle{height:0.8em; width:1.0em;}</style>
             </ul>
+            <div style="clear:both;"><xsl:text> </xsl:text></div>
         </div>
     </xsl:template>

main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

@@ -156 +156 @@
             
             <!-- "back to top" link -->
-            <xsl:if test="util:hashToDepthClass(@nodeID) != 'sectionHeaderDepthTitle'">
+            <xsl:if test="util:hashToDepthClass(@nodeID) != 'sectionHeaderDepthTitle' and not(/page/pageResponse/format[@type='display']/gsf:option[@name='backToTopLinks']) or /page/pageResponse/format[@type='display']/gsf:option[@name='backToTopLinks']/@value='true'">
                 <td class="backToTop headerTD">
                     <a href="javascript:scrollToTop();">
@@ -481 +481 @@
                                 });
 
-                                $("#zoomOptions").css("display", "block");
+                                $("#zoomOptions").css("display", null);
                             }
                         </xsl:text>