From e04c8702a8592ddeb10b9fde23a10e1af805a0f6 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 8 Sep 2005 20:55:20 +0000 Subject: [PATCH] massive web updates, moved search bar made depths dynamic git-svn-id: svn://svn.open-ils.org/ILS/trunk@1815 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/css/mediumfont.css | 29 ++-- Open-ILS/web/opac/common/js/CGI.js | 5 +- Open-ILS/web/opac/common/js/config.js | 2 + Open-ILS/web/opac/common/js/init.js | 1 + Open-ILS/web/opac/common/js/org_utils.js | 8 + Open-ILS/web/opac/common/js/utils.js | 15 +- Open-ILS/web/opac/locale/en-US/lang.dtd | 3 + Open-ILS/web/opac/skin/default/css/layout.css | 53 +++---- Open-ILS/web/opac/skin/default/js/mresult.js | 5 +- Open-ILS/web/opac/skin/default/js/rdetail.js | 8 - .../web/opac/skin/default/js/result_common.js | 39 +++-- .../web/opac/skin/default/js/search_bar.js | 74 +++++++--- Open-ILS/web/opac/skin/default/js/sidebar.js | 6 +- .../web/opac/skin/default/xml/advanced.xml | 9 +- .../web/opac/skin/default/xml/altcanvas.xml | 1 - Open-ILS/web/opac/skin/default/xml/header.xml | 9 +- Open-ILS/web/opac/skin/default/xml/index.xml | 10 +- Open-ILS/web/opac/skin/default/xml/logo.xml | 2 +- .../web/opac/skin/default/xml/mresult.xml | 2 + Open-ILS/web/opac/skin/default/xml/myopac.xml | 7 +- .../web/opac/skin/default/xml/orgtree.xml | 4 +- .../web/opac/skin/default/xml/rdetail.xml | 32 ++-- .../opac/skin/default/xml/result_table.xml | 49 ++++++- .../web/opac/skin/default/xml/rresult.xml | 2 + .../web/opac/skin/default/xml/searchbar.xml | 138 +++++++----------- .../web/opac/skin/default/xml/sidebar.xml | 19 ++- Open-ILS/xsl/oilsMARC21slim2HTML.xsl | 8 +- 27 files changed, 301 insertions(+), 239 deletions(-) diff --git a/Open-ILS/web/opac/common/css/mediumfont.css b/Open-ILS/web/opac/common/css/mediumfont.css index dc5af9f492..08f4210af4 100644 --- a/Open-ILS/web/opac/common/css/mediumfont.css +++ b/Open-ILS/web/opac/common/css/mediumfont.css @@ -1,17 +1,20 @@ -body { font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 95%;} +body { font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 9pt;} +table { font-size: 9pt; } +table tr { font-size: 9pt; } +table tr td { font-size: 9pt; } -/*body table tr td { font-size: inherit; }*/ +body table tr td { font-size: inherit; } /*body table tr td { font-size: 95%;}*/ -.org_link { font-size: 92%; } -.sidebar_extra_item { font-size: 97%; } -.searchbar_tag { font-size: 90%; } -#offset_start { font-weight: 600; } -#offset_end { font-weight: 600; } -#result_count { font-weight: 600; } -.nav_link_active { font-weight: 600;} -.copy_count_cell { font-size: 80%; } +.org_link { font-size: 9pt; } +.sidebar_extra_item { font-size: 9pt; } +.searchbar_tag { font-size: 9pt; } +#offset_start { font-weight: 600; font-size: 9pt;} +#offset_end { font-weight: 600; font-size; 9pt;} +#result_count { font-weight: 600; font-size; 9pt;} +.nav_link_active { font-weight: 600; font-size; 9pt;} +.copy_count_cell { font-size: 80%; font-size; 9pt; } -#rdetail_copy_info_table { font-size: 92%; } -.rdetail_copy_nav_link { font-weight: normal; font-size: 95%; } -#rdetail_view_marc { font-size: 90%; } +#rdetail_copy_info_table { font-size: 9pt; } +.rdetail_copy_nav_link { font-weight: normal; font-size: 9pt; } +#rdetail_view_marc { font-size: 9pt; } diff --git a/Open-ILS/web/opac/common/js/CGI.js b/Open-ILS/web/opac/common/js/CGI.js index 7d11096f48..5274e79ef7 100644 --- a/Open-ILS/web/opac/common/js/CGI.js +++ b/Open-ILS/web/opac/common/js/CGI.js @@ -43,9 +43,8 @@ function CGI() { */ CGI.prototype.param = function(p) { if(this.data[p] == null) return null; - - if(this.data[p].length == 1) - return this.data[p][0]; + //if(this.data[p].length == 1) + //return this.data[p][0]; return this.data[p]; } diff --git a/Open-ILS/web/opac/common/js/config.js b/Open-ILS/web/opac/common/js/config.js index 32999b085e..49e47c35af 100644 --- a/Open-ILS/web/opac/common/js/config.js +++ b/Open-ILS/web/opac/common/js/config.js @@ -152,6 +152,8 @@ config.ids.xul = {}; /* shared CSS */ config.css.hide_me = "hide_me"; +config.css.dim = "dim"; +config.css.dim2 = "dim2"; /* ---------------------------------------------------------------------------- */ diff --git a/Open-ILS/web/opac/common/js/init.js b/Open-ILS/web/opac/common/js/init.js index 3fb26423b2..8fff2fc203 100644 --- a/Open-ILS/web/opac/common/js/init.js +++ b/Open-ILS/web/opac/common/js/init.js @@ -17,6 +17,7 @@ function init() { setFontSize(getFontSize()); runEvt("common", "run"); checkUserSkin(); + G.ui.common.now_searching.appendChild(text(findOrgUnit(getLocation()).name())); } function windowUnload() { runEvt("common", "unload"); } diff --git a/Open-ILS/web/opac/common/js/org_utils.js b/Open-ILS/web/opac/common/js/org_utils.js index fd7753a32d..d8f8d66be0 100644 --- a/Open-ILS/web/opac/common/js/org_utils.js +++ b/Open-ILS/web/opac/common/js/org_utils.js @@ -7,6 +7,14 @@ function findOrgDepth(org_id_or_node) { return findOrgType(findOrgUnit(org_id_or_node).ou_type()).depth(); } +function findOrgTypeFromDepth(depth) { + if( depth == null ) return null; + for( var type in globalOrgTypes ) { + var t = globalOrgTypes[type]; + if( t.depth() == depth ) return t; + } +} + /* takes the org type id from orgunit.ou_type() field and returns the org type object */ function findOrgType(type_id) { diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js index 361ce2a062..43398f530e 100644 --- a/Open-ILS/web/opac/common/js/utils.js +++ b/Open-ILS/web/opac/common/js/utils.js @@ -258,13 +258,22 @@ function setActivateStyleSheet(name) { function scaleFonts(type) { var size = ""; + var ssize = ""; + var a; + switch(type) { - case "large": size = "113%"; break; - case "small": size = "87%"; break; + case "large": + size = "148%"; + ssize = "94%"; + break; } document.body.style.fontSize = size; - for (i = 0; (a = document.getElementsByTagName ("table")[i]); i++) a.style.fontSize = size; + for (i = 0; (a = document.getElementsByTagName ("td")[i]); i++) a.style.fontSize = size;; + for (i = 0; (a = document.getElementsByTagName ("div")[i]); i++) a.style.fontSize = ssize; + for (i = 0; (a = document.getElementsByTagName ("option")[i]); i++) a.style.fontSize = ssize; + for (i = 0; (a = document.getElementsByTagName ("li")[i]); i++) a.style.fontSize = ssize; + for (i = 0; (a = document.getElementsByTagName ("span")[i]); i++) a.style.fontSize = ssize; } diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index b842556a4c..cc457f856f 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -18,6 +18,9 @@ + + + diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css index 0a5295bffe..1f9215ad83 100644 --- a/Open-ILS/web/opac/skin/default/css/layout.css +++ b/Open-ILS/web/opac/skin/default/css/layout.css @@ -1,49 +1,45 @@ +body { margin: 6px; } + .main_header { width: 100%; } .space { padding-right:5px; } .vert_space { padding-top: 82px; width: 100%;} .right { position:absolute; right: 0px; } -.hide_me {display:none; visibility: hidden;} +.hide_me { display:none; visibility: hidden; } + +table { border-collapse: collapse; } + +.encircled { border: 1px solid black; } /*.vertical {writing-mode: tb-rl; filter: flipv fliph; }*/ /* ---------------------------------------------------------------------- */ -.canvas { float:right; width: 80%; text-align: left;} +.canvas { float:right; width: 79%; text-align: left;} #loading_div { width: 100%;} - -.logo { height: 80px; width: 200px; position: absolute; top: 0px; left: 0px; } - -.org_tree { height: 500px; padding-left: 2px; padding-right: 2px; - overflow:-moz-scrollbars-vertical; overflow-y:scroll; overflow-x:hidden; } - +.logo { height: 65px; width: 180px; }*/ +.org_tree { height: 500px; padding-left: 2px; padding-right: 2px; } .org_link { padding-right: 15px; } #org_link_container { margin-bottom: 5px; padding-left: 4px; padding-bottom: 3px; padding-top: 3px; width: 100%; } - -#fonts_div { position: absolute; left: 220px; top: 10px; } +#left_div { float:left; width: 20%; } +#statusbar {} /* ---------------------------------------------------------------------- */ -.sidebar_div { float: left; width: 19%; } -.side_bar_item { padding-left: 15px; padding-right: 10px; padding-top: 5px; padding-bottom: 5px; } -.sidebar_chunk {margin-bottom: 2px;} -.sidebar_extra_item { padding: 2px; } +.sidebar_div { width: 100%; font-size: 9pt; } +.side_bar_item { padding-left: 8px; padding-right: 8px; padding-top: 4px; padding-bottom: 4px; } +.sidebar_extra_item { padding: 0px; } .sidebar_header { margin-top: 10px; padding-left: 3px; } /* ---------------------------------------------------------------------- */ -#searchbar { position: absolute; text-align: right; top: 2px; right: 3px; } - -.searchbar_item { text-align: center; padding: 3px; } -.searchbar_tag { text-align: right; - padding-left: 5px; padding-right: 5px; padding-bottom: 3px; } - -#searchbar_main { text-align: right; - padding-top: 2px; padding-bottom: 3px; padding-right: 2px; padding-left: 3px; } - -.searchbar_extra_td { padding-top: 10px; } +#searchbar { margin-top: 18px; width: 100%; } +#searchbar table tr td {font-weight: bold; font-size: 8pt; } +#searchbar select, input { border-collapse: collapse; border: solid 1px; font-size: 9pt; } +.searchbar_item { margin: 3px; font-size: 9pt; } +.searchbar_label_span { font-size: 9pt; } #searchbar_table { border-collapse: collapse; } + /* ---------------------------------------------------------------------- */ #login_box { width: 60%; padding: 5px;} - .login_text { margin-left: 8px; } /* ---------------------------------------------------------------------- */ @@ -84,5 +80,10 @@ .rdetail_copy_count_cell { text-align: center; } -.tor_pic { width: 20px; height: 20px; border: none;} +.tor_pic { width: 17px; height: 17px; border: none;} + +.dim2 { filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5; text-decoration: none; } +.dim { filter:alpha(opacity=10); -moz-opacity:0.1; opacity: 0.1; text-decoration: none; } + + diff --git a/Open-ILS/web/opac/skin/default/js/mresult.js b/Open-ILS/web/opac/skin/default/js/mresult.js index 2fdbad7e19..f632e3b18d 100644 --- a/Open-ILS/web/opac/skin/default/js/mresult.js +++ b/Open-ILS/web/opac/skin/default/js/mresult.js @@ -1,5 +1,6 @@ var records = {}; var ranks = {}; +var onlyrecord = {}; var table; var rowtemplate; var idsCookie = new cookieObject("ids", 1, "/", COOKIE_IDS); @@ -62,8 +63,9 @@ function mresultCollectIds(method) { } else { + var form = (getForm() == "all") ? null : getForm(); var req = new Request(method, getStype(), getTerm(), - getLocation(), getDepth(), getDisplayCount() * 10, getOffset(), getForm() ); + getLocation(), getDepth(), getDisplayCount() * 10, getOffset(), form ); req.callback(mresultHandleMRIds); req.send(); } @@ -85,6 +87,7 @@ function mresultSetRecords(idstruct) { if(idstruct[x-o] == null) break; records[x] = parseInt(idstruct[x - o][0]); ranks[x] = parseFloat(idstruct[x - o][1]); + onlyrecord[x] = parseInt(idstruct[x - o][4]); } idsCookie.put(COOKIE_IDS, js2JSON({ recs: records, ranks : ranks }) ); idsCookie.write(); diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index d9f19cc2b1..beee5fe645 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -218,14 +218,6 @@ function rdetailBuildStatusColumns() { var data = findNodeByName( node, config.names.rdetail.cp_status); data.appendChild(text(name)); - -/* - for( var x = 0; x < name.length; x++ ) { - var c = name.charAt(x); - data.appendChild(text(c)); - data.appendChild(document.createElement("br")); - } -*/ parent.appendChild(node); } } diff --git a/Open-ILS/web/opac/skin/default/js/result_common.js b/Open-ILS/web/opac/skin/default/js/result_common.js index 03ca9ef89b..4811ce347e 100644 --- a/Open-ILS/web/opac/skin/default/js/result_common.js +++ b/Open-ILS/web/opac/skin/default/js/result_common.js @@ -84,8 +84,16 @@ function resultDisplayRecord(rec, pos, is_mr) { var title_link = findNodeByName(r, config.names.result.item_title); var author_link = findNodeByName(r, config.names.result.item_author); - if( is_mr ) buildTitleLink(rec, title_link); - else buildTitleDetailLink(rec, title_link); + if( is_mr ) { + var onlyrec = onlyrecord[ getOffset() + pos ]; + if(onlyrec) { + var id = rec.doc_id(); + rec.doc_id(onlyrec); + buildTitleDetailLink(rec, title_link); + rec.doc_id(id); + } else buildTitleLink(rec, title_link); + } else buildTitleDetailLink(rec, title_link); + buildSearchLink(STYPE_AUTHOR, rec.author(), author_link); findNodeByName(r, "result_table_title_cell").width = @@ -103,24 +111,33 @@ function resultDisplayRecord(rec, pos, is_mr) { function resultBuildFormatIcons( row, rec ) { - var td = findNodeByName( row, config.names.result.format_cell ); - var linkt = td.removeChild(findNodeByName( row, config.names.result.format_link )); - var resources = rec.types_of_resource(); + var ress = rec.types_of_resource(); + + for( var i in ress ) { + + var res = ress[i]; + var link = findNodeByName(row, res + "_link"); + link.title = res; + var img = link.getElementsByTagName("img")[0]; + removeCSSClass( img, config.css.dim ); + + var f = getForm(); + if( f != "all" ) { + if( f != modsFormatToMARC(res) ) + addCSSClass( img, config.css.dim2); + } - for( var i in resources ) { - var link = linkt.cloneNode(true); var args = {}; args.page = RRESULT; args[PARAM_OFFSET] = 0; args[PARAM_MRID] = rec.doc_id(); - args[PARAM_FORM] = modsFormatToMARC(resources[i]); + args[PARAM_FORM] = modsFormatToMARC(res); + link.setAttribute("href", buildOPACLink(args)); - var img = findNodeByName(link, config.names.result.format_pic); - setResourcePic( img, resources[i] ); - td.appendChild(link); } + } diff --git a/Open-ILS/web/opac/skin/default/js/search_bar.js b/Open-ILS/web/opac/skin/default/js/search_bar.js index f7c0d36068..cdba7f2620 100644 --- a/Open-ILS/web/opac/skin/default/js/search_bar.js +++ b/Open-ILS/web/opac/skin/default/js/search_bar.js @@ -5,17 +5,13 @@ var _ts, _fs, _ds; 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() { - /* ----------------------------------- */ - //setActivateStyleSheet("color_test"); - /* ----------------------------------- */ - _ts = G.ui.searchbar.type_selector; _ds = G.ui.searchbar.depth_selector; _fs = G.ui.searchbar.form_selector; @@ -25,14 +21,23 @@ function searchBarInit() { function(evt) {if(userPressedEnter(evt)) searchBarSubmit();}; G.ui.searchbar.submit.onclick = searchBarSubmit; - G.ui.searchbar.tag.onclick = searchBarToggle; + + _ds.onchange = depthSelectorChanged; + + if( getLocation() == globalOrgTree.id() ) { + unHideMe( G.ui.searchbar.lib_sel_span ); + G.ui.searchbar.lib_sel_link.onclick = _opacHandleLocationTagClick; + } else { + unHideMe( G.ui.searchbar.depth_sel_span ); + buildLocationSelector(); + } /* set up the selector objects, etc */ G.ui.searchbar.text.value = (getTerm() != null) ? getTerm() : ""; setSelector(_ts, getStype()); setSelector(_ds, getDepth()); setSelector(_fs, getForm()); - G.ui.searchbar.location_tag.onclick = _opacHandleLocationTagClick; + } function _opacHandleLocationTagClick() { @@ -41,42 +46,63 @@ function _opacHandleLocationTagClick() { swapCanvas(G.ui.common.org_container); } +function depthSelectorChanged() { + var i = _ds.selectedIndex; + if( i == _ds.options.length - 1 ) { + setSelector( _ds, getDepth() ); + _opacHandleLocationTagClick(); + } +} + +function buildLocationSelector() { + + if( getLocation() == globalOrgTree.id() ) return; + + var selector = G.ui.searchbar.depth_selector + var node = selector.removeChild(selector.getElementsByTagName("option")[0]); + + var location = findOrgUnit(getLocation()); + var type = findOrgType(location.ou_type()); + + while( type && location ) { + var n = node.cloneNode(true); + n.setAttribute("value", type.depth()); + removeChildren(n); + n.appendChild(text(type.opac_label())); + selector.appendChild(n); + location = findOrgUnit(location.parent_ou()); + if(location) type = findOrgType(location.ou_type()); + else type = null; + } + + selector.appendChild(node); +} + function updateLoc(location, depth) { if( location != null ) newSearchLocation = location; - if( depth != null ) + if( depth != null ) { setSelector(G.ui.searchbar.depth_selector, depth); + newSearchDepth = depth; + } } + + function searchBarSubmit() { var text = G.ui.searchbar.text.value; if(!text || text == "") return; - var args = {}; args.page = MRESULT; args[PARAM_OFFSET] = 0; args[PARAM_TERM] = text; args[PARAM_STYPE] = _ts.options[_ts.selectedIndex].value; args[PARAM_LOCATION] = newSearchLocation; - args[PARAM_DEPTH] = parseInt(_ds.options[_ds.selectedIndex].value); + args[PARAM_DEPTH] = (newSearchDepth != null) ? newSearchDepth : parseInt(_ds.options[_ds.selectedIndex].value); args[PARAM_FORM] = _fs.options[_fs.selectedIndex].value; goTo(buildOPACLink(args)); } -function searchBarToggle() { - if(searchBarExpanded) { - hideMe(G.ui.searchbar.extra_row); - hideMe(G.ui.searchbar.tag_on); - unHideMe(G.ui.searchbar.tag_off); - } else { - unHideMe(G.ui.searchbar.extra_row); - hideMe(G.ui.searchbar.tag_off); - unHideMe(G.ui.searchbar.tag_on); - } - searchBarExpanded = !searchBarExpanded; -} - - diff --git a/Open-ILS/web/opac/skin/default/js/sidebar.js b/Open-ILS/web/opac/skin/default/js/sidebar.js index 67c1affbeb..64ec2f7289 100644 --- a/Open-ILS/web/opac/skin/default/js/sidebar.js +++ b/Open-ILS/web/opac/skin/default/js/sidebar.js @@ -5,13 +5,10 @@ attachEvt("common", "init", initSideBar); attachEvt("common", "init", setSidebarLinks); function initSideBar() { - - for( var p in G.ui.sidebar ) - removeCSSClass(p, config.css.color_2); - var page = findCurrentPage(); unHideMe(G.ui.sidebar[page]); addCSSClass(G.ui.sidebar[page], config.css.color_2); + addCSSClass(G.ui.sidebar[page], config.css.encircled); /* if we're logged in, show it and replace the Login link with the Logout link */ if(grabUser()) { @@ -23,7 +20,6 @@ function initSideBar() { if(G.ui.sidebar.login) G.ui.sidebar.login.onclick = initLogin; if(G.ui.sidebar.logout) G.ui.sidebar.logout.onclick = doLogout; - G.ui.common.top_logo.setAttribute("src", buildImageLink(config.images.logo)); } /* sets up the login ui components */ diff --git a/Open-ILS/web/opac/skin/default/xml/advanced.xml b/Open-ILS/web/opac/skin/default/xml/advanced.xml index 9f211c1b41..68d051093f 100644 --- a/Open-ILS/web/opac/skin/default/xml/advanced.xml +++ b/Open-ILS/web/opac/skin/default/xml/advanced.xml @@ -13,13 +13,10 @@ -
- - - -
- +
+ +
Advanced Search Goes Here
diff --git a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml index 6ea65393b7..908dbb3a1a 100644 --- a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml +++ b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml @@ -11,7 +11,6 @@ - - + diff --git a/Open-ILS/web/opac/skin/default/xml/mresult.xml b/Open-ILS/web/opac/skin/default/xml/mresult.xml index e86d496af6..4223b5153b 100644 --- a/Open-ILS/web/opac/skin/default/xml/mresult.xml +++ b/Open-ILS/web/opac/skin/default/xml/mresult.xml @@ -15,6 +15,8 @@
+ +
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac.xml b/Open-ILS/web/opac/skin/default/xml/myopac.xml index accbf01666..214430c119 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac.xml @@ -1,18 +1,19 @@ %ent; ] > - + Evergreen: My OPAC - +
+ +
My OPAC Goes Here
diff --git a/Open-ILS/web/opac/skin/default/xml/orgtree.xml b/Open-ILS/web/opac/skin/default/xml/orgtree.xml index d01fcdaade..f6925781c1 100644 --- a/Open-ILS/web/opac/skin/default/xml/orgtree.xml +++ b/Open-ILS/web/opac/skin/default/xml/orgtree.xml @@ -5,8 +5,8 @@ diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail.xml b/Open-ILS/web/opac/skin/default/xml/rdetail.xml index 1e5fddbdc6..fdf748297f 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail.xml @@ -22,27 +22,25 @@
+ +
-
-
- - - - - - - -
- &rdetail.detailMain.headerLabel; - - &rdetail.detailMain.viewMarc; -
-
- -
+ + + + + + + +
+ &rdetail.detailMain.headerLabel; + + &rdetail.detailMain.viewMarc; +
+

diff --git a/Open-ILS/web/opac/skin/default/xml/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result_table.xml index a9c13fa905..48ee8067a3 100644 --- a/Open-ILS/web/opac/skin/default/xml/result_table.xml +++ b/Open-ILS/web/opac/skin/default/xml/result_table.xml @@ -18,7 +18,7 @@ - + @@ -47,10 +47,51 @@ diff --git a/Open-ILS/web/opac/skin/default/xml/rresult.xml b/Open-ILS/web/opac/skin/default/xml/rresult.xml index fc83b7b50e..0969fe32f7 100644 --- a/Open-ILS/web/opac/skin/default/xml/rresult.xml +++ b/Open-ILS/web/opac/skin/default/xml/rresult.xml @@ -15,6 +15,8 @@
+ +
diff --git a/Open-ILS/web/opac/skin/default/xml/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/searchbar.xml index 4c60e673e8..861db2a3c4 100644 --- a/Open-ILS/web/opac/skin/default/xml/searchbar.xml +++ b/Open-ILS/web/opac/skin/default/xml/searchbar.xml @@ -19,101 +19,65 @@ config.ids.searchbar.extra_row = 'searchbar_extra'; config.ids.searchbar.main_row = 'searchbar_main_row'; config.ids.searchbar.table = 'searchbar_table'; - config.ids.searchbar.tag = 'search_tag_link'; - config.ids.searchbar.tag_on = 'searchbar_tag_on'; - config.ids.searchbar.tag_off = 'searchbar_tag_off'; config.ids.searchbar.location_tag = 'search_location_tag_link'; + config.ids.searchbar.lib_sel_span = 'lib_selector_span'; + config.ids.searchbar.lib_sel_link = 'lib_selector_link'; + config.ids.searchbar.depth_sel_span = 'depth_selector_span'; -
- -
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - + + +
- - - - - - + + + + + + - - - - - - - - - - - - - - - -
+ + + + + + + Options: + + + + + + + + + + + + - - - - + + Choose a library to search -
- - - - - - - -
- - - - - - - Search Location - - - - - - - More Options - Less Options - - - + +
diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml index 01d12d4b4c..2e067e3265 100644 --- a/Open-ILS/web/opac/skin/default/xml/sidebar.xml +++ b/Open-ILS/web/opac/skin/default/xml/sidebar.xml @@ -33,7 +33,9 @@ + @@ -41,10 +43,6 @@ &navigate.loggedinas; - + + + diff --git a/Open-ILS/xsl/oilsMARC21slim2HTML.xsl b/Open-ILS/xsl/oilsMARC21slim2HTML.xsl index ce515e92d7..9270fbe2ee 100644 --- a/Open-ILS/xsl/oilsMARC21slim2HTML.xsl +++ b/Open-ILS/xsl/oilsMARC21slim2HTML.xsl @@ -31,7 +31,7 @@ - - - - -- 2.43.2
+ LDR @@ -44,7 +44,7 @@
+ @@ -55,14 +55,14 @@
+ + .