Button styling in masthead.inc is still conflicting with the js load() functions...

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

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 5482d17..480ce8e 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -70,8 +70,8 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
-           <!-- TMPL_IF NAME="opacbookbag" -->var cartButton = new YAHOO.widget.Button("cartmenulink");<!-- /TMPL_IF -->
-               <!--TMPL_IF NAME="virtualshelves" -->var listsButton = new YAHOO.widget.Button("listsmenulink");<!-- /TMPL_IF -->
+         //  <!-- TMPL_IF NAME="opacbookbag" -->var cartButton = new YAHOO.widget.Button("cartmenulink");<!-- /TMPL_IF -->
+               //<!--TMPL_IF NAME="virtualshelves" -->var listsButton = new YAHOO.widget.Button("listsmenulink");<!-- /TMPL_IF -->
  });
  
    <!--TMPL_IF NAME="virtualshelves" -->YAHOO.util.Event.onContentReady("listsmenu", function () {
@@ -102,8 +102,8 @@ $(document).ready(function() {
                YAHOO.util.Event.addListener(window, "load", init);<!-- /TMPL_IF -->
 </script>
 
-<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" href="#basket">Cart<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF -->
-<!--TMPL_IF NAME="virtualshelves" --><a id="listsmenulink" href="#listmenu">Lists</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" href="#">Cart<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF -->
+<!--TMPL_IF NAME="virtualshelves" --><a id="listsmenulink" href="#">Lists</a><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="virtualshelves" -->
 <div id="listsmenu" class="yuimenu">
@@ -119,12 +119,11 @@ $(document).ready(function() {
                        <ul class="second-of-type">
             <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl">Manage Lists</a></li>
         </ul>
-               </li><!-- TMPL_ELSE --><ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to Create Your Own Lists</li></ul><!-- /TMPL_IF -->
+               </li><!-- TMPL_ELSE --><ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Create Your Own Lists</a></li></ul><!-- /TMPL_IF -->
          </div>
 </div>
 <!-- /TMPL_IF -->
 
-<!-- <!-- TMPL_IF NAME="opacbookbag" --><div><a class="button cart" href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections"><span><span><span><span>Book Bag</span></span></span></span></a></div><!-- /TMPL_IF --> -->
 
 </div>
 </div>

diff --git a/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png b/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png
new file mode 100644 (file)
index 0000000..afd65e0
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/en/lib/yui/yui-sprite.png differ

diff --git a/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif b/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif
new file mode 100644 (file)
index 0000000..a62357d
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/more-up-arrow.gif differ

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index ef2985c..62fe01c 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -100,15 +100,9 @@ foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtype
 }
 $template->param(itemtypeloop => \@itemtypesloop);
 
-<<<<<<< HEAD:opac/opac-search.pl
-# load the ccodes
-# my ($ccodecount,@ccode_loop) = GetCcodes();
-# $template->param(ccodeloop=>\@ccode_loop,);
-=======
 # # load the itypes (Called item types in the template -- just authorized values for searching)
 # my ($itypecount,@itype_loop) = GetCcodes();
 # $template->param(itypeloop=>\@itype_loop,);
->>>>>>> Styling facets; correcting markup error in search results; removing language picker from opac-main (is now in the footer); continuing unfinished work on cart/lists buttons:opac/opac-search.pl
 
 # The following should only be loaded if we're bringing up the advanced search template
 if ( $template_type eq 'advsearch' ) {
@@ -153,20 +147,6 @@ if ( $template_type eq 'advsearch' ) {
     $template->param(uc(C4::Context->preference("marcflavour")) => 1,
                       search_boxes_loop => \@search_boxes_array);
 
-<<<<<<< HEAD:opac/opac-search.pl
-    # load the language limits (for search)
-    my $languages_limit_loop = getAllLanguages();
-    $template->param(search_languages_loop => $languages_limit_loop,);
-
-    # use the global setting by default
-    if ( C4::Context->preference("expandedSearchOption") == 1) {
-        $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
-    }
-    # but let the user override it
-    if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
-        $template->param( expanded_options => $cgi->param('expanded_options'));
-    }
-=======
 # use the global setting by default
        if ( C4::Context->preference("expandedSearchOption") == 1) {
                $template->param( expanded_options => C4::Context->preference("expandedSearchOption") );
@@ -175,7 +155,6 @@ if ( $template_type eq 'advsearch' ) {
        if ( ($cgi->param('expanded_options') == 0) || ($cgi->param('expanded_options') == 1 ) ) {
        $template->param( expanded_options => $cgi->param('expanded_options'));
        }
->>>>>>> Styling facets; correcting markup error in search results; removing language picker from opac-main (is now in the footer); continuing unfinished work on cart/lists buttons:opac/opac-search.pl
 
     output_html_with_http_headers $cgi, $cookie, $template->output;
     exit;