Changeset 28050

Timestamp:

2013-08-15T09:47:08+12:00 (11 years ago)

Author:

sjm84

Message:

Changing the top buttons into actual buttons and a new experimental look for the collection buttons

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• style/core.css (modified) (5 diffs)
• transform/layouts/header.xsl (modified) (4 diffs)

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

@@ -250 +250 @@
 }
 
+/*
 #collectionLinks a div{
     display: block;
@@ -261 +262 @@
     padding: 20px;
     min-width: 200px;
-}
+    text-align:center;
+}
+*/
 
 #collectionLinks a img{
@@ -274 +277 @@
 }
 
-/*
 .collectionLink {
     display: block;
@@ -283 +285 @@
     color: #444;
     text-decoration: none;
-    background: url(../images/collectionIconStripe.gif) scroll no-repeat 0 0;
-    padding: 20px;
-}
-*/
+    min-width: 200px;
+    text-align:center;
+}
+
+.collectionLinkText {
+    padding: 15px 15px 10px;
+}
 
 /* some text should not be rendered as it is just there for search engines */
@@ -364 +369 @@
     /*display: inline;*/
     float:right;
-    margin-left: 5px;
     padding: 1px 4px 1px 0px;
 }

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

@@ -228 +228 @@
 
             <!-- preferences -->
-            <li class="ui-state-default ui-corner-all">
+            <li>
                 <a href="{$library_name}/collection/{$collNameChecked}/page/pref">
                     <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_tip')"/></xsl:attribute>
-                    <ul>
-                        <li><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></span></li>
-                        <li><span class="ui-icon ui-icon-wrench"><xsl:text> </xsl:text></span></li>
-                    </ul>
+                    <span id="preferencesButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref_b')"/></span>
+                    <script type="text/javascript">
+                        <xsl:text disable-output-escaping="yes">
+                            $("#preferencesButton").button({icons:{primary:"ui-icon-wrench"}});
+                            $("#preferencesButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
+                        </xsl:text>
+                    </script>
                 </a>
             </li>
 
             <!-- help -->
-            <li class="ui-state-default ui-corner-all">
+            <li>
                 <a href="{$library_name}/collection/{$collNameChecked}/page/help">
                     <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_tip')"/></xsl:attribute>
-                    <ul>
-                        <li><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></span></li>
-                        <li><span class="ui-icon ui-icon-help"><xsl:text> </xsl:text></span></li>
-                    </ul>
+                    <span id="helpButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'help_b')"/></span>
+                    <script type="text/javascript">
+                        <xsl:text disable-output-escaping="yes">
+                            $("#helpButton").button({icons:{primary:"ui-icon-help"}});
+                            $("#helpButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
+                        </xsl:text>
+                    </script>
                 </a>
             </li>
             
             <!-- login/logout -->
-            <li class="ui-state-default ui-corner-all" id="userMenuButton">
+            <li id="userMenuButton">
                 <xsl:choose>
                     <xsl:when test="/page/pageRequest/userInformation/@username">
@@ -329 +335 @@
                                 </xsl:text>
                             </script>
-                            <ul>
-                                <li><span><xsl:value-of select="/page/pageRequest/userInformation/@username"/></span></li>
-                                <li><span class="ui-icon ui-icon-unlocked"><xsl:text> </xsl:text></span></li>
-                            </ul>
+                            <span id="loginButton"><xsl:value-of select="/page/pageRequest/userInformation/@username"/></span>
+                            <script type="text/javascript">
+                                <xsl:text disable-output-escaping="yes">
+                                    $("#loginButton").button({icons:{primary:"ui-icon-unlocked"}});
+                                    $("#loginButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
+                                </xsl:text>
+                            </script>
                         </a>
                     </xsl:when>
@@ -360 +369 @@
                             </xsl:attribute>
                             <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'login_tip')"/></xsl:attribute>
-                            <ul>
-                                <li><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'login_b')"/></span></li>
-                                <li><span class="ui-icon ui-icon-locked"><xsl:text> </xsl:text></span></li>
-                            </ul>
+                            <span id="loginButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'login_b')"/></span>
+                            <script type="text/javascript">
+                                <xsl:text disable-output-escaping="yes">
+                                    $("#loginButton").button({icons:{primary:"ui-icon-locked"}});
+                                    $("#loginButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
+                                </xsl:text>
+                            </script>
                         </a>
                     </xsl:otherwise>
@@ -370 +382 @@
             <!-- debuginfo (doesn't use class="ui-state-error" since the text is not legible due to inherited text-colour) -->
             <xsl:if test="/page/pageRequest/paramList/param[(@name='debug') and (@value='on' or @value='true' or @value='1')]">
-              <li class="ui-state-default ui-corner-all">
-                <a href="{$library_name}/collection/{$collNameChecked}/page/debug">
-                  <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_tip')"/></xsl:attribute>
-                  <ul>
-                <li><span><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_b')"/></span></li>
-                <li><span class="ui-icon ui-icon-info"><xsl:text> </xsl:text></span></li>
-                  </ul>
-                </a>
-              </li>
+                <li>
+                    <a href="{$library_name}/collection/{$collNameChecked}/page/debug">
+                        <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_tip')"/></xsl:attribute>
+                        <span id="debugButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'debuginfo_b')"/></span>
+                        <script type="text/javascript">
+                            <xsl:text disable-output-escaping="yes">
+                                $("#debugButton").button({icons:{primary:"ui-icon-info"}});
+                                $("#debugButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
+                            </xsl:text>
+                        </script>
+                    </a>
+                </li>
             </xsl:if>
         </ul>