More button style tests

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/login.css b/koha-tmpl/intranet-tmpl/prog/en/css/login.css
index 7e3364e..3e6c95e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/login.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/login.css
@@ -68,7 +68,7 @@ label {
 }
 
 #login h1 {
-       background: url(/intranet-tmpl/prog/img/koha-logo.gif) no-repeat top left;
+       background: url(../../img/koha-logo.gif) no-repeat top left;
        margin-top: 0;
 }
 
@@ -97,11 +97,16 @@ label {
 
 #login #userid, #password {
        font-size: 1.7em;
-       width: 80%;
+       width: 97%;
+}
+
+#login #branch {
+       width : 97%;
 }
 
 #login #submit {
-       font-size: 1.7em;
+       font-size: 1.4em;
+       padding : .3em .6em;
 }
 
 
@@ -113,7 +118,7 @@ label {
 }
 
 .submit input, .submit input:focus, .button {
-       background: url(/intranet-tmpl/prog/img/fade-butt.png );
+       background: url(../../img/fade-butt.png );
        border: 3px double #999;
        border-left-color: #ccc;
        border-top-color: #ccc;

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 903837f..3f0355c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -1,3 +1,30 @@
+<style type="text/css">
+       .btn { display: block; position: relative; background: #aaa; padding: 5px; float: right; color: #fff; text-decoration: none; cursor: pointer; }
+       .btn * { font-style: normal; background-image: url('../../opac-tmpl/prog/images/btn2.png'); background-repeat: no-repeat; display: block; position: relative; }
+       .btn i { background-position: top left; position: absolute; margin-bottom: -5px;  top: 0; left: 0; width: 5px; height: 5px; }
+       .btn span { background-position: bottom left; left: -5px; padding: 0 0 5px 10px; margin-bottom: -5px; }
+       .btn span i { background-position: bottom right; margin-bottom: 0; position: absolute; left: 100%; width: 10px; height: 100%; top: 0; }
+       .btn span span { background-position: top right; position: absolute; right: -10px; margin-left: 10px; top: -5px; height: 0; }
+
+       * html .btn span,
+       * html .btn i { float: left; width: auto; background-image: none; cursor: pointer; }
+
+       .btn.blue { background: #2ae; }
+       .btn.blue:hover { background-color: #6699FF;}
+       .btn.green { background: #9d4; }
+       .btn.pink { background: #e1a; }
+       .btn:hover { background-color: #a00; }
+       .btn:active { background-color: #444; }
+       .btn[class] {  background-image: url('../../opac-tmpl/prog/images/shade.png'); background-position: bottom; }
+
+       * html .btn { border: 3px double #aaa; }
+       * html .btn.blue { border-color: #2ae; }
+       * html .btn.green { border-color: #9d4; }
+       * html .btn.pink { border-color: #e1a; }
+       * html .btn:hover { border-color: #a00; }
+       #cartmenulink { margin-right :  1em;    }
+
+</style>
 <div id="members">
        <ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></a></span></li><li><a class="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Your Account</a></li><!-- /TMPL_IF -->
        </ul>   
@@ -12,7 +39,7 @@
 <div id="fluid">
 <div id="fluid-offset">
 <div id="fluid-content-1">
-    <form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+    <form name="searchform" style="border: 1px solid #FFC;" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
        <label for="masthead_search"> Search <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF --></label>
        <select name="idx" id="masthead_search">
        <!-- TMPL_IF NAME="ms_kw" -->
@@ -59,6 +86,7 @@
             <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
         <input type="submit" value="Search" class="submit" />
+               
     </form>
        
        <div id="moresearches"><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a><!-- TMPL_IF name="OpacBrowser" --> | <a href="/cgi-bin/koha/opac-browser.pl">Browse by Hierarchy</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacAuthorities" --> | <a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by Subject</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacCloud" --> | <a href="/cgi-bin/koha/opac-tags_subject.pl">Tag Cloud</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacTopissue" --> | <a href="/cgi-bin/koha/opac-topissues.pl">Most Popular</a><!-- /TMPL_IF --></div>
@@ -103,11 +131,25 @@ $(document).ready(function() {
                }
 
                YAHOO.util.Event.addListener(window, "load", init);<!-- /TMPL_IF -->
+       $(document).ready(function(){
+         $('.btn').each(function(){
+         var b = $(this);
+         var tt = b.text() || b.val();
+         if ($(':submit,:button',this)) {
+         b = $('<a>').insertAfter(this). addClass(this.className).attr('id',this.id);
+         $(this).remove();
+         }
+         b.text('').css({cursor:'pointer'}). prepend('<i></i>').append($('<span>').
+         text(tt).append('<i></i><span></span>'));
+         });
+         });
+          
 </script>
 
-<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" href="/cgi-bin/koha/opac-basket.pl">Cart<span id="basket"></span></a><!-- /TMPL_IF -->
-<!--TMPL_IF NAME="virtualshelves" --><a id="listsmenulink" href="#">Lists</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" class="btn green" href="/cgi-bin/koha/opac-basket.pl">Cart<span id="basket"></span></a><!-- /TMPL_IF -->
+<!--TMPL_IF NAME="virtualshelves" --><a class="btn blue" id="listsmenulink" href="#">Lists</a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="opacbookbag" --><div id="cartDetails" style="visibility:hidden">Your cart is empty.</div><!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="virtualshelves" -->
 <div id="listsmenu" class="yuimenu">
     <div class="bd">