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

diff --git a/web/opac/skin/default/js/search_bar.js b/web/opac/skin/default/js/search_bar.js
new file mode 100644 (file)
index 0000000..a8ebca1
--- /dev/null
+++ b/web/opac/skin/default/js/search_bar.js
@@ -0,0 +1,101 @@
+var searchBarExpanded = false;
+/* our search selector boxes */
+var _ts, _fs;
+
+
+var isFrontPage = false;
+
+
+G.evt.common.init.push(searchBarInit);
+
+/* if set by the org selector, this will be the location used the
+       next time the search is submitted */
+var newSearchLocation; 
+var newSearchDepth = null;
+
+
+function searchBarInit() {
+
+       _ts = G.ui.searchbar.type_selector;
+       _fs = G.ui.searchbar.form_selector;
+
+       try{G.ui.searchbar.text.focus();}catch(e){}
+       G.ui.searchbar.text.onkeydown = 
+               function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
+       _ts.onkeydown = 
+               function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
+       _fs.onkeydown = 
+               function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
+
+       G.ui.searchbar.submit.onclick = searchBarSubmit;
+
+       /* set up the selector objects, etc */
+       G.ui.searchbar.text.value = (getTerm() != null) ? getTerm() : "";
+       if (!isFrontPage) G.ui.searchbar.facets.value = (getFacet() != null) ? getFacet() : "";
+       setSelector(_ts,        getStype());
+       setSelector(_fs,        getForm());
+
+       /* If searching for journal title, set it to journal title */
+       if (getStype() == 'title' && getBibLevel() == 's') {
+               dojo.byId('jtitle').selected = true;
+       }
+
+       depthSelInit();
+
+
+       if(!isFrontPage && (findCurrentPage() != MYOPAC)) {
+               attachEvt('common','depthChanged', searchBarSubmit);
+       }
+
+    if( (limit = $('opac.result.limit2avail')) ) {
+        if(getAvail()) limit.checked = true;
+        if(getSort() && getSortDir()) 
+            setSelector($('opac.result.sort'), getSort()+'.'+getSortDir());
+    }
+}
+
+function searchBarSubmit(isFilterSort) {
+
+       var text = G.ui.searchbar.text.value;
+       var facet_text = isFrontPage ? '' : G.ui.searchbar.facets.value;
+
+       clearSearchParams();
+
+       if(!text || text == "") return;
+
+       var d   = (newSearchDepth != null) ?  newSearchDepth : depthSelGetDepth();
+       if(isNaN(d)) d = 0;
+
+       var args = {};
+
+       if(SHOW_MR_DEFAULT || findCurrentPage() == MRESULT) {
+               args.page                               = MRESULT;
+       } else {
+               args.page                               = RRESULT;
+               args[PARAM_RTYPE]               = _ts.options[_ts.selectedIndex].value;
+       }
+
+       args[PARAM_STYPE]               = _ts.options[_ts.selectedIndex].value;
+       args[PARAM_TERM]                = text;
+       args[PARAM_FACET]               = facet_text;
+       args[PARAM_LOCATION] = depthSelGetNewLoc();
+       args[PARAM_DEPTH]               = d;
+       args[PARAM_FORM]                = _fs.options[_fs.selectedIndex].value;
+
+    /* Set the bib level to 's' for serials if the magic "Journal title" has ben chosen */
+    if (_ts.options[_ts.selectedIndex].id == 'jtitle') {
+        args[PARAM_BIBLEVEL] = 's';
+    }
+
+    if($('opac.result.limit2avail')) {
+        args[PARAM_AVAIL] = ($('opac.result.limit2avail').checked) ? 1 : '';
+        if( (val = getSelectorVal($('opac.result.sort'))) ) {
+            args[PARAM_SORT] = val.split('.')[0]
+            args[PARAM_SORT_DIR] = val.split('.')[1]
+        }
+    }
+
+       goTo(buildOPACLink(args));
+}
+
+

diff --git a/web/opac/skin/default/xml/common/stypes_selector.xml b/web/opac/skin/default/xml/common/stypes_selector.xml
new file mode 100644 (file)
index 0000000..d1927b9
--- /dev/null
+++ b/web/opac/skin/default/xml/common/stypes_selector.xml
@@ -0,0 +1,9 @@
+<select id='search_type_selector'>
+       <option value='keyword' selected='selected'>&common.keyword;</option>
+       <option value='title'>&common.title;</option>
+       <option value='title' id='jtitle'>&common.journal.title;</option>
+       <option value='author'>&common.author;</option>
+       <option value='subject'>&common.subject;</option>
+       <option value='series'>&common.series;</option>
+</select>
+

diff --git a/web/opac/skin/lul/js/search_bar.js b/web/opac/skin/lul/js/search_bar.js
deleted file mode 100644 (file)
index a8ebca1..0000000
--- a/web/opac/skin/lul/js/search_bar.js
+++ /dev/null
@@ -1,101 +0,0 @@
-var searchBarExpanded = false;
-/* our search selector boxes */
-var _ts, _fs;
-
-
-var isFrontPage = false;
-
-
-G.evt.common.init.push(searchBarInit);
-
-/* if set by the org selector, this will be the location used the
-       next time the search is submitted */
-var newSearchLocation; 
-var newSearchDepth = null;
-
-
-function searchBarInit() {
-
-       _ts = G.ui.searchbar.type_selector;
-       _fs = G.ui.searchbar.form_selector;
-
-       try{G.ui.searchbar.text.focus();}catch(e){}
-       G.ui.searchbar.text.onkeydown = 
-               function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
-       _ts.onkeydown = 
-               function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
-       _fs.onkeydown = 
-               function(evt) {if(userPressedEnter(evt)) { searchBarSubmit(); } };
-
-       G.ui.searchbar.submit.onclick = searchBarSubmit;
-
-       /* set up the selector objects, etc */
-       G.ui.searchbar.text.value = (getTerm() != null) ? getTerm() : "";
-       if (!isFrontPage) G.ui.searchbar.facets.value = (getFacet() != null) ? getFacet() : "";
-       setSelector(_ts,        getStype());
-       setSelector(_fs,        getForm());
-
-       /* If searching for journal title, set it to journal title */
-       if (getStype() == 'title' && getBibLevel() == 's') {
-               dojo.byId('jtitle').selected = true;
-       }
-
-       depthSelInit();
-
-
-       if(!isFrontPage && (findCurrentPage() != MYOPAC)) {
-               attachEvt('common','depthChanged', searchBarSubmit);
-       }
-
-    if( (limit = $('opac.result.limit2avail')) ) {
-        if(getAvail()) limit.checked = true;
-        if(getSort() && getSortDir()) 
-            setSelector($('opac.result.sort'), getSort()+'.'+getSortDir());
-    }
-}
-
-function searchBarSubmit(isFilterSort) {
-
-       var text = G.ui.searchbar.text.value;
-       var facet_text = isFrontPage ? '' : G.ui.searchbar.facets.value;
-
-       clearSearchParams();
-
-       if(!text || text == "") return;
-
-       var d   = (newSearchDepth != null) ?  newSearchDepth : depthSelGetDepth();
-       if(isNaN(d)) d = 0;
-
-       var args = {};
-
-       if(SHOW_MR_DEFAULT || findCurrentPage() == MRESULT) {
-               args.page                               = MRESULT;
-       } else {
-               args.page                               = RRESULT;
-               args[PARAM_RTYPE]               = _ts.options[_ts.selectedIndex].value;
-       }
-
-       args[PARAM_STYPE]               = _ts.options[_ts.selectedIndex].value;
-       args[PARAM_TERM]                = text;
-       args[PARAM_FACET]               = facet_text;
-       args[PARAM_LOCATION] = depthSelGetNewLoc();
-       args[PARAM_DEPTH]               = d;
-       args[PARAM_FORM]                = _fs.options[_fs.selectedIndex].value;
-
-    /* Set the bib level to 's' for serials if the magic "Journal title" has ben chosen */
-    if (_ts.options[_ts.selectedIndex].id == 'jtitle') {
-        args[PARAM_BIBLEVEL] = 's';
-    }
-
-    if($('opac.result.limit2avail')) {
-        args[PARAM_AVAIL] = ($('opac.result.limit2avail').checked) ? 1 : '';
-        if( (val = getSelectorVal($('opac.result.sort'))) ) {
-            args[PARAM_SORT] = val.split('.')[0]
-            args[PARAM_SORT_DIR] = val.split('.')[1]
-        }
-    }
-
-       goTo(buildOPACLink(args));
-}
-
-

diff --git a/web/opac/skin/lul/xml/common/stypes_selector.xml b/web/opac/skin/lul/xml/common/stypes_selector.xml
deleted file mode 100644 (file)
index d1927b9..0000000
--- a/web/opac/skin/lul/xml/common/stypes_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<select id='search_type_selector'>
-       <option value='keyword' selected='selected'>&common.keyword;</option>
-       <option value='title'>&common.title;</option>
-       <option value='title' id='jtitle'>&common.journal.title;</option>
-       <option value='author'>&common.author;</option>
-       <option value='subject'>&common.subject;</option>
-       <option value='series'>&common.series;</option>
-</select>
-

diff --git a/web/opac/skin/lul/xml/home/homesearch.xml b/web/opac/skin/lul/xml/home/homesearch.xml
index 1a91c02..97ca3f5 100644 (file)
--- 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 7587c53..f46c1ce 100644 (file)
--- 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 602c3bd..8350829 100644 (file)
--- 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 9893a63..e42254f 100644 (file)
--- 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',