moving the lang switcher to a more reasonable location

git-svn-id: svn://svn.open-ils.org/ILS/trunk@10205 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index 72c9241..c493fbb 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -6,6 +6,7 @@
 <!ENTITY lang.author "PINES">
 <!ENTITY common.all "All">
 <!ENTITY common.currency "$">
+<!ENTITY common.language "Language: ">
 <!ENTITY common.name "Name">
 <!ENTITY common.none "None">
 <!ENTITY common.title "Title">

diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index 0eae7a7..e0f7971 100644 (file)
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -74,7 +74,7 @@ table { border-collapse: collapse; }
 
 /* ---------------------------------------------------------------------- */
 
-#searchbar { margin-top: 18px; width: 100%; }
+#searchbar { margin-top: 22px; width: 100%; }
 #searchbar table tr td {font-weight: bold; font-size: 8pt; }
 #searchbar select, input { border-collapse: collapse; font-size: 9pt; }
 .searchbar_item { margin: 3px; font-size: 9pt; } 

diff --git a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
index 5c19b0a..73cab30 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
@@ -1,10 +1,19 @@
 <div id='fonts_div'>
 
        <div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
-               <span>&common.textsize.title;</span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
-               <span> &common.textsize.separator; </span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
+               <span style='vertical-align: top;'>&common.textsize.title;</span>
+               <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
+               <span style='vertical-align: top;'> &common.textsize.separator; </span>
+               <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
+               <span style='vertical-align: top;'>&nbsp;<span style="font-weight:bold;">|</span>&nbsp;</span>
+               <span style='vertical-align: top;'>&common.language;</span>
+               <span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore" searchAttr="label" required="false">
+                       <script type="dojo/label" event="onChange">
+                               if (this.getValue()) {
+                                       location.href = location.href.replace( /opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+                               }
+                       </script>
+               </span>
        </div>
        
 </div>

diff --git a/Open-ILS/web/opac/skin/default/xml/footer.xml b/Open-ILS/web/opac/skin/default/xml/footer.xml
index 91a443c..d74a0ca 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/footer.xml
+++ b/Open-ILS/web/opac/skin/default/xml/footer.xml
@@ -31,17 +31,4 @@
         <div id='footer_logo'>&footer.logo;
             <a href='http://open-ils.org'><img style='border:none;' src='../../../../images/eg_tiny_logo.jpg'/></a>
         </div>
-
-        <div
-                       id='translation_switch'
-                       dojoType="dijit.form.FilteringSelect"
-                       store="openils.I18N.localeStore"
-                       searchAttr="label"
-               >
-            <script type="dojo/label" event="onChange">
-                if (this.getValue()) {
-                    location.href = location.href.replace( /opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
-                }
-            </script>
-        </div>
 </div>