From 8990057d6801b92e67608cb9cdc0f7491e36441a Mon Sep 17 00:00:00 2001
From: dbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Fri, 15 Apr 2011 18:02:03 +0000
Subject: [PATCH] Move "Journal title" search into default skin and update NOSM
 skin

Who doesn't want a Journal Title search, eh?


git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/branches/rel_2_0@1366 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---
 web/opac/skin/{lul => default}/js/search_bar.js               | 0
 web/opac/skin/{lul => default}/xml/common/stypes_selector.xml | 0
 web/opac/skin/lul/xml/home/homesearch.xml                     | 2 +-
 web/opac/skin/nosm/xml/common/css_common.xml                  | 1 -
 web/opac/skin/nosm/xml/common/logo.xml                        | 2 +-
 web/opac/skin/nosm/xml/home/homesearch.xml                    | 6 +++---
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename web/opac/skin/{lul => default}/js/search_bar.js (100%)
 rename web/opac/skin/{lul => default}/xml/common/stypes_selector.xml (100%)

diff --git a/web/opac/skin/lul/js/search_bar.js b/web/opac/skin/default/js/search_bar.js
similarity index 100%
rename from web/opac/skin/lul/js/search_bar.js
rename to web/opac/skin/default/js/search_bar.js
diff --git a/web/opac/skin/lul/xml/common/stypes_selector.xml b/web/opac/skin/default/xml/common/stypes_selector.xml
similarity index 100%
rename from web/opac/skin/lul/xml/common/stypes_selector.xml
rename to web/opac/skin/default/xml/common/stypes_selector.xml
diff --git a/web/opac/skin/lul/xml/home/homesearch.xml b/web/opac/skin/lul/xml/home/homesearch.xml
index 1a91c02676..97ca3f53e6 100644
--- a/web/opac/skin/lul/xml/home/homesearch.xml
+++ b/web/opac/skin/lul/xml/home/homesearch.xml
@@ -7,7 +7,7 @@
 	<script language='javascript' type='text/javascript'
 		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js"> </script>
 	<script language='javascript' type='text/javascript'
-		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/lul/js/search_bar.js"> </script>
+		src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js"> </script>
 
 	<script language='javascript' type='text/javascript'>
 		config.ids.searchbar = {};
diff --git a/web/opac/skin/nosm/xml/common/css_common.xml b/web/opac/skin/nosm/xml/common/css_common.xml
index 7587c53a7f..f46c1cec13 100644
--- a/web/opac/skin/nosm/xml/common/css_common.xml
+++ b/web/opac/skin/nosm/xml/common/css_common.xml
@@ -20,5 +20,4 @@
 <style type="text/css">
 	@import '/js/dojo/dojo/resources/dojo.css';
 	@import '/js/dojo/dijit/themes/tundra/tundra.css';
-	@import '/js/dojo/dijit/themes/tundra/tundra_rtl.css';
 </style>
diff --git a/web/opac/skin/nosm/xml/common/logo.xml b/web/opac/skin/nosm/xml/common/logo.xml
index 602c3bde05..83508292a7 100644
--- a/web/opac/skin/nosm/xml/common/logo.xml
+++ b/web/opac/skin/nosm/xml/common/logo.xml
@@ -1,4 +1,4 @@
 <div id='logo_div'>
 	<script language='javascript' type='text/javascript'>config.ids.common.top_logo = "top_left_logo";</script>
-	<img style='margin-right: 4px;' src='<!--#echo var="OILS_BASE"-->/images/nosm_logo_small.png' id='top_left_logo' border='0' class='logo' />
+	<img style='margin-right: 4px; width: 234px; height: 95px;' src='<!--#echo var="OILS_BASE"-->/images/nosm_logo_small.png' id='top_left_logo' border='0' class='logo' />
 </div>
diff --git a/web/opac/skin/nosm/xml/home/homesearch.xml b/web/opac/skin/nosm/xml/home/homesearch.xml
index 9893a63c37..e42254f320 100644
--- a/web/opac/skin/nosm/xml/home/homesearch.xml
+++ b/web/opac/skin/nosm/xml/home/homesearch.xml
@@ -28,10 +28,10 @@
 
 
 	<div style='width: 100%; text-align: center'>
-		<img src='<!--#echo var="OILS_BASE"-->/images/nosm_logo.png' />
+		<img style='height: 82px; width: 500px;' src='<!--#echo var="OILS_BASE"-->/images/nosm_logo.png' />
 	</div>
 
-	<style>.rowpad { height: 20px; }</style>
+	<style type="text/css">.rowpad { height: 20px; }</style>
 
 	<table id='frontsearch_table' height='100%' width='100%' 
 		style='margin-top: 10px; border-collapse: collapse;'>
@@ -110,7 +110,7 @@
 		        <span style='vertical-align: top;'>&common.language;</span>
 		        <span dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore" 
                     searchAttr="label" required="false" jsId='opacLocaleSelector'>
-                    <script>
+                    <script type="text/javascript">
                         dojo.addOnLoad(function() {
                             opacLocaleSelector.setValue(locale);
                             dojo.connect(opacLocaleSelector, 'onChange', 
-- 
2.11.0