From 6e5be3a70f0297b7788577169933d6cdc3df9d1f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 17 Oct 2011 11:51:16 -0400
Subject: [PATCH] [SIGNED-OFF] Fix for Bug 7043 - masthead_search id used twice in template

Changing ID of library selector, and moving inline styles to
the CSS as requested by kf in the bug comments.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css          |    6 ++++++
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 665d143..14236c8 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -784,6 +784,12 @@ body#advsearch #listsmenulink {
 	margin : .2em .3em 0 0;
 }
 
+#masthead_search,
+#select_library {
+	max-width: 10em;
+	width: 10em;
+}
+
 
 #search-facets ul {
 	margin : 0;
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index b3672f4..ee8b468 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -35,7 +35,7 @@
 	[% END %]
     </label>
 
-	<select name="idx" id="masthead_search" class="left" style="max-width:10em;width:10em;">
+	<select name="idx" id="masthead_search" class="left">
 	[% IF ( ms_kw ) %]
         <option selected="selected" value="">Library Catalog</option>
 		[% ELSE %]
@@ -77,7 +77,7 @@
         <input type="text" id = "transl1" name="q" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
 [% END %]
    [% IF ( OpacAddMastheadLibraryPulldown ) %]
-      <select name="limit" id="masthead_search" class="left" style="max-width:10em;width:10em;">
+      <select name="limit" id="select_library" class="left">
          <option value="">All Libraries</option>
          [% FOREACH BranchesLoo IN BranchesLoop %]
             [% IF ( BranchesLoo.selected ) %]<option select="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
-- 
1.7.2.3