massive web updates,
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 8 Sep 2005 20:55:20 +0000 (20:55 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 8 Sep 2005 20:55:20 +0000 (20:55 +0000)
moved search bar
made depths dynamic

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

27 files changed:
Open-ILS/web/opac/common/css/mediumfont.css
Open-ILS/web/opac/common/js/CGI.js
Open-ILS/web/opac/common/js/config.js
Open-ILS/web/opac/common/js/init.js
Open-ILS/web/opac/common/js/org_utils.js
Open-ILS/web/opac/common/js/utils.js
Open-ILS/web/opac/locale/en-US/lang.dtd
Open-ILS/web/opac/skin/default/css/layout.css
Open-ILS/web/opac/skin/default/js/mresult.js
Open-ILS/web/opac/skin/default/js/rdetail.js
Open-ILS/web/opac/skin/default/js/result_common.js
Open-ILS/web/opac/skin/default/js/search_bar.js
Open-ILS/web/opac/skin/default/js/sidebar.js
Open-ILS/web/opac/skin/default/xml/advanced.xml
Open-ILS/web/opac/skin/default/xml/altcanvas.xml
Open-ILS/web/opac/skin/default/xml/header.xml
Open-ILS/web/opac/skin/default/xml/index.xml
Open-ILS/web/opac/skin/default/xml/logo.xml
Open-ILS/web/opac/skin/default/xml/mresult.xml
Open-ILS/web/opac/skin/default/xml/myopac.xml
Open-ILS/web/opac/skin/default/xml/orgtree.xml
Open-ILS/web/opac/skin/default/xml/rdetail.xml
Open-ILS/web/opac/skin/default/xml/result_table.xml
Open-ILS/web/opac/skin/default/xml/rresult.xml
Open-ILS/web/opac/skin/default/xml/searchbar.xml
Open-ILS/web/opac/skin/default/xml/sidebar.xml
Open-ILS/xsl/oilsMARC21slim2HTML.xsl

index dc5af9f..08f4210 100644 (file)
@@ -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; }
index 7d11096..5274e79 100644 (file)
@@ -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];
 }
 
index 32999b0..49e47c3 100644 (file)
@@ -152,6 +152,8 @@ config.ids.xul = {};
 
 /* shared CSS */
 config.css.hide_me = "hide_me";
+config.css.dim = "dim";
+config.css.dim2 = "dim2";
 
 
 /* ---------------------------------------------------------------------------- */
index 3fb2642..8fff2fc 100644 (file)
@@ -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"); }
index fd7753a..d8f8d66 100644 (file)
@@ -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) {
index 361ce2a..43398f5 100644 (file)
@@ -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;
 }
 
 
index b842556..cc457f8 100644 (file)
@@ -18,6 +18,9 @@
 <!ENTITY navigate.titleGroupResults "Title Group Results">
 <!ENTITY navigate.titleResults "Title Results">
 
+<!ENTITY common.nowSearching "Now searching ">
+<!ENTITY common.at " at ">
+
 
 <!-- Sidebar Header Labels -->
 <!ENTITY sidebar.relevantSubjects.headerLabel "Relevant Subjects">
index 0a5295b..1f9215a 100644 (file)
@@ -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; }
 
 /* ---------------------------------------------------------------------- */
 .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; }
+
+
 
index 2fdbad7..f632e3b 100644 (file)
@@ -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();
index d9f19cc..beee5fe 100644 (file)
@@ -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);
                }       
        }       
index 03ca9ef..4811ce3 100644 (file)
@@ -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);
        }
+
 }
 
 
index f7c0d36..cdba7f2 100644 (file)
@@ -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;
-}
-
-
index 67c1aff..64ec2f7 100644 (file)
@@ -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 */
index 9f211c1..68d0510 100644 (file)
        </head>
 
        <body onload="init();">
-               <div xmlns:xi="http://www.w3.org/2001/XInclude">
-                       <xi:include href="logo.xml"/>
-                       <xi:include href="fonts.xml"/>
-                       <xi:include href="sidebar.xml"/>
-               </div>
-
+               <xi:include href="header.xml"/>
                <div id='canvas' class='canvas'>
+                       <xi:include href="searchbar.xml"/>
+                       <xi:include href="statusbar.xml"/>
                        <xi:include href="altcanvas.xml"/>
                        <div id='canvas_main'>Advanced Search Goes Here</div>
                </div>
index 6ea6539..908dbb3 100644 (file)
@@ -11,7 +11,6 @@
        <!-- The org tree -->
        <xi:include href="orgtree.xml"/> 
 
-
        <!-- ============================================================================= -->
        <!-- Register the alternate canvases  -->
        <script language='javascript'>
index 01da7ac..9268e9e 100644 (file)
@@ -1,13 +1,6 @@
 <?xml version='1.0'?>
 
-<!--
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
--->
-
-<div xmlns:xi="http://www.w3.org/2001/XInclude">
+<div id='left_div' xmlns:xi="http://www.w3.org/2001/XInclude">
        <xi:include href="logo.xml"/>
-       <xi:include href="fonts.xml"/>
-       <xi:include href="searchbar.xml"/> 
-       <div class="vert_space"> </div>
        <xi:include href="sidebar.xml"/> 
 </div>
index d4b6372..07b4903 100644 (file)
@@ -1,12 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
-<!--
-<!DOCTYPE html PUBLIC 
-       "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
-       -->
-
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <head>
 
        <body onload="init();">
                <xi:include href="header.xml"/> 
-
                <div id='canvas' class='canvas'>
+                       <xi:include href="searchbar.xml"/>
+                       <xi:include href="statusbar.xml"/>
                        <xi:include href="altcanvas.xml"/>
                        <div id='canvas_main'>Home is here, show something interesting...</div>
                </div>
-
        </body>
 
 </html>
index 3111ff5..34e7b15 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
 <div id='logo_div'>
        <script language='javascript'>config.ids.common.top_logo = "top_left_logo";</script>
-       <img id='top_left_logo' border='0' class='logo'> </img>
+       <img src='../../../images/main_logo_cropped.jpg' id='top_left_logo' border='0' class='logo'> </img>
 </div>
index e86d496..4223b51 100644 (file)
@@ -15,6 +15,8 @@
        <body onload="init();">
                <xi:include href="header.xml"/> 
                <div id='canvas' class='canvas'>
+                       <xi:include href="searchbar.xml"/>
+                       <xi:include href="statusbar.xml"/>
                        <xi:include href="altcanvas.xml"/>
                        <xi:include href="result_common.xml"/>
                </div>
index accbf01..214430c 100644 (file)
@@ -1,18 +1,19 @@
 <?xml version='1.0'?>
 <!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
-<html xmlns="http://www.w3.org/1999/xhtml" 
-       xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <head>
                <title>Evergreen: My OPAC</title>
                <xi:include href="css_common.xml#xpointer(//link)"/>
-               <xi:include href="js_common.xml"/>
+               <xi:include href="js_common.xml#xpointer(//script)"/>
        </head>
 
        <body onload="init();">
                <xi:include href="header.xml"/> 
                <div id='canvas' class='canvas'>
+                       <xi:include href="searchbar.xml"/>
+                       <xi:include href="statusbar.xml"/>
                        <xi:include href="altcanvas.xml"/>
                        <div id='canvas_main'>My OPAC Goes Here</div>
                </div>
index d01fcda..f692578 100644 (file)
@@ -5,8 +5,8 @@
 <div id='org_container' class='hide_me'>
        <div id='org_link_container' class='color_1'>
                <span class='org_link'><a onclick='orgTreeSelector.openAll();' href='javascript:void(0);'>Expand All</a></span>
-               <span class='org_link'><a onclick='orgTreeSelector.closeAll();' href='javascript:void(0);'>Close All</a></span>
-               <span class='org_link'><a onclick='showCanvas();' href='javascript:void(0);'> Exit </a></span>
+               <span class='org_link'><a onclick='orgTreeSelector.closeAll();' href='javascript:void(0);'>Collapse All</a></span>
+               <span class='org_link'><a onclick='showCanvas();' href='javascript:void(0);'> Close </a></span>
        </div>
        <div id='org_tree' class='org_tree'> </div>
 </div>
index 1e5fddb..fdf7482 100644 (file)
                
                <div id='canvas' class='canvas'>
 
+                       <xi:include href="searchbar.xml"/>
+                       <xi:include href="statusbar.xml"/>
                        <xi:include href="altcanvas.xml"/>
                        <xi:include href="rdetail_altcanvas.xml"/>
 
                        <div id='canvas_main'>
-                               <div>
-                                       <div class='rdetail_header color_1'>
-                                               <table width='100%'>
-                                                       <tbody>
-                                                               <tr>
-                                                                       <td>
-                                                                               <span>&rdetail.detailMain.headerLabel;</span>
-                                                                       </td>
-                                                                       <td align='right'>
-                                                                               <a href="javascript:void(0);" id='rdetail_view_marc'>&rdetail.detailMain.viewMarc;</a>
-                                                                       </td>
-                                                               </tr>
-                                                       </tbody>
-                                               </table>
-                                       </div>
-                                       <xi:include href="rdetail_summary.xml"/>
-                               </div> 
+                               <table class='rdetail_header color_1' width='100%'>
+                                       <tbody>
+                                               <tr>
+                                                       <td>
+                                                               <span>&rdetail.detailMain.headerLabel;</span>
+                                                       </td>
+                                                       <td align='right'>
+                                                               <a href="javascript:void(0);" id='rdetail_view_marc'>&rdetail.detailMain.viewMarc;</a>
+                                                       </td>
+                                               </tr>
+                                       </tbody>
+                               </table>
+                               <xi:include href="rdetail_summary.xml"/>
                                <br/><br/>
                                <xi:include href="rdetail_copyinfo.xml"/>
                        </div>
index a9c13fa..48ee806 100644 (file)
@@ -18,7 +18,7 @@
                        <tr id='result_table_template'>
 
                                <!-- Jacket image goes here -->
-                               <td width="10%"><a><img name='item_jacket' class='result_table_pic'/></a></td>
+                               <td width="10%" class='result_table_pic_header'><a><img name='item_jacket' class='result_table_pic'/></a></td>
 
                                <td class='result_table_row'>
                                        <table class='result_table_subtable'>
 
                                                        <tr>
                                                                <td name='result_table_format_cell' class='result_table_format_cell'>
-                                                                       <a name='resource_link' class='search_link'> 
-                                                                               <img name='format_pic' class='tor_pic'> </img>
-                                                                               <!-- Item formats go here -->
+
+                                                                       <a name='text_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/text.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='sound recording-nonmusical_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='moving image_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/moving image.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='software, multimedia_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/software, multimedia.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='sound recording-musical_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/sound recording-musical.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='cartographic_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/cartographic.jpg' class='dim tor_pic'> </img>
                                                                        </a>
+
+                                                                       <a name='mixed material_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/mixed material.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='notated music_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/notated music.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='sound recording_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/sound recording.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='still images_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/still images.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='three dimensional object_link' class='search_link'> 
+                                                                               <img src='../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
                                                                </td>
                                                        </tr>
 
index fc83b7b..0969fe3 100644 (file)
@@ -15,6 +15,8 @@
        <body onload="init();">
                <xi:include href="header.xml"/> 
                <div id='canvas' class='canvas'>
+                       <xi:include href="searchbar.xml"/>
+                       <xi:include href="statusbar.xml"/>
                        <xi:include href="altcanvas.xml"/>
                        <xi:include href="result_common.xml"/>
                </div>
index 4c60e67..861db2a 100644 (file)
                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';
        </script>
 
 
-       <div id='searchbar_main' class='color_1'>
-
-               <table>
-
-                       <tbody id='searchbar_table'>
-
-                               <tr id='searchbar_main_row'>
-               
-                                       <!-- Search query text box -->
-                                       <td align='left' class='searchbar_main_td'>
-                                               <span class="searchbar_item">
-                                                       <input id='search_box' type='text' size='19'/>
-                                               </span>
-                                       </td>
-               
-
-                                       <!-- Selector for choosing the search type -->
-                                       <td align='left' class='searchbar_main_td'>
-                                               <span class="searchbar_item">
-                                                       <select id='search_type_selector'>
-                                                               <option value='keyword' selected='selected'>Keyword</option>
-                                                               <option value='title'>Title</option>
-                                                               <option value='author'>Author</option>
-                                                               <option value='subject'>Subject</option>
-                                                               <option value='series'>Series</option>
+       <table class='color_1' width='100%' style='border-collapse: collapse;'>
+               <tbody>
+                       <tr>
+
+                               <td  align='center' style='width: 240px; padding: 3px; border: 1px solid #A0A0A0;' class='color_2'>
+                                       <input id='search_box' style='width: 190px;' type='text' />
+                                       <span style='padding-left: 6px;'>
+                                               <input type='button' style='width: 40px;' id='search_submit' value='Go!' />
+                                       </span>
+                               </td>
+
+                               <td nowrap='nowrap' style='padding: 3px;' align='right' >
+
+                                       <span style='margin-left: 3px; margin-right: 6px;'> Options:  </span>
+
+                                       <span style='padding-right:9px;'>
+                                       <select id='search_type_selector'>
+                                               <option value='keyword' selected='selected'> Keyword </option>
+                                               <option value='title'>Title</option>
+                                               <option value='author'>Author</option>
+                                               <option value='subject'>Subject</option>
+                                               <option value='series'>Series</option>
+                                       </select>
+                                       </span>
+
+                                       <span style='padding-right:9px;'>
+                                       <select id='form_selector' style='width: 130px;' >
+                                               <option value='all'>All Formats</option>
+                                               <option value='at'>Books</option>
+                                               <option value='at-d'>Large Print Books</option>
+                                               <option value='i'>Audiobooks</option>
+                                               <option value='g'>Video Recording</option>
+                                               <option value='j'>Music</option>
+                                               <option value='m'>Electronic Resources</option>
+                                       </select>
+                                       </span>
+
+                                       <span>
+                                               <span class='hide_me' id='depth_selector_span'>
+                                                       <select id='depth_selector' >
+                                                               <option value='new'>Choose a different library...</option>
                                                        </select>
                                                </span>
-       
-                                               <!-- Submit Search Button -->
-                                               <span class="searchbar_item" style='padding-left: 15px;'>
-                                                       <input type='button' id='search_submit' value='Go!' />
+                                               <span class='hide_me' id='lib_selector_span'>
+                                                       <a id='lib_selector_link' href='javascript:void(0)'>Choose a library to search</a>
                                                </span>
-                                       </td>
-       
-                               </tr>   
-               
-                               <!-- Row of extra search options -->
-                               <tr id='searchbar_extra' class='hide_me'>
-               
-                                       <!-- Search format selector -->
-                                       <td align='left' class='searchbar_extra_td'>
-                                               <span class="searchbar_item">
-                                                       <select id='form_selector'>
-                                                               <option value='all'>All Formats</option>
-                                                               <option value='at'>Books</option>
-                                                               <option value='at-d'>Large Print Books</option>
-                                                               <option value='i'>Audiobooks</option>
-                                                               <option value='g'>Video Recording</option>
-                                                               <option value='j'>Music</option>
-                                                               <option value='m'>Electronic Resources</option>
-                                                       </select>
-                                               </span>
-                                       </td>
-               
-                                       <!-- Search 'range' selector -->
-                                       <td  align='left' class='searchbar_extra_td'>
-                                               <span class="searchbar_item">
-                                                       <select id='depth_selector'>
-                                                               <option value='2' selected='selected'>In This Library</option>
-                                                               <option value='1'>In This Region</option>
-                                                               <option value='0'>In All PINES Libraries</option>
-                                                       </select>
-                                               </span>
-                                       </td>
-               
-                               </tr>
-               
-                       </tbody>
-               </table>
-
-       </div>
-
-       <!-- Search location changer -->
-       <span class='searchbar_tag color_1'>
-               <a id='search_location_tag_link' href='javascript:void(0);'>
-                       <span> Search Location </span>
-               </a>
-       </span>
-       
-       <!-- Link for expanding/contracting the extra search options -->
-       <span class='searchbar_tag color_1'>
-               <a id='search_tag_link' href='javascript:void(0);'>
-                       <span id='searchbar_tag_off'> More Options </span>
-                       <span id='searchbar_tag_on' class='hide_me'> Less Options </span>
-               </a>
-       </span>
-
+                                       </span>
 
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
 </div>
 
 
index 01d12d4..2e067e3 100644 (file)
@@ -33,7 +33,9 @@
                </div>
 
 
+               <!--
                <xi:include href="xulsidebar.xml"/>
+               -->
 
                <!-- Informational sidebar components -->
 
                        <span >&navigate.loggedinas; <b id='username_dest'> </b></span>
                </div>
 
-               <div title="&navigate.titleGroupResults;" 
-                       id='mresult_link_div' class="side_bar_item hide_me">
-                       <span>&navigate.titleGroupResults;</span>
-               </div>
        
                <div title="&navigate.titleResults;"
                        id='result_link_div' class="side_bar_item hide_me">
                        <span>Record Details</span>
                </div>
 
+               <div title="&navigate.titleGroupResults;" 
+                       id='mresult_link_div' class="side_bar_item hide_me">
+                       <span>&navigate.titleGroupResults;</span>
+               </div>
+
        </div>
 
+       <!--
+       <br/>
+       <div style='padding-top: 3px;'>
+               <xi:include href="searchbar.xml"/> 
+       </div>
+       -->
 
        <div id='subject_sidebar' class='sidebar_chunk hide_me'> 
                <div class='sidebar_header color_1'>&sidebar.relevantSubjects.headerLabel;</div>
                config.names.sidebar.subject_item       = 'subject_item';
                config.names.sidebar.author_item                = 'author_item';
                config.names.sidebar.series_item                = 'series_item';
+
+               config.css.encircled                            = 'encircled';
        </script>
 
 </div>
index ce515e9..9270fbe 100644 (file)
@@ -31,7 +31,7 @@
        <xsl:template match="marc:record">
                <table class='marc_table'>
                        <tr class='marc_tag_row'>
-                               <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="TOP">
+                               <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
                                        LDR
                                </th>
                                <td class='marc_tag_data' COLSPAN='3'>
@@ -44,7 +44,7 @@
        
        <xsl:template match="marc:controlfield">
                <tr class='marc_tag_row'>
-                       <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="TOP">
+                       <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
                                <xsl:value-of select="@tag"/>
                        </th>
                        <td class='marc_tag_data' COLSPAN='3'>
        
        <xsl:template match="marc:datafield">
                <tr class='marc_tag_row'>
-                       <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="TOP">
+                       <th class='marc_tag_col' NOWRAP="TRUE" ALIGN="RIGHT" VALIGN="middle">
                                <xsl:value-of select="@tag"/>
                        </th>
                        <td class='marc_tag_ind'>
                                <xsl:value-of select="@ind1"/>
                        </td>
 
-                       <td class='marc_tag_ind' style='border-left: 1px solid black'>
+                       <td class='marc_tag_ind' style='border-left: 1px solid black; padding-left: 3px;'>
                                <xsl:value-of select="@ind2"/>
                                <span style='color:#FFF'>.</span> 
                        </td>