we're gmail now. yay.
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 13 Sep 2005 21:04:22 +0000 (21:04 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 13 Sep 2005 21:04:22 +0000 (21:04 +0000)
style changes, layout changes

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

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/result_common.js
Open-ILS/web/opac/skin/default/js/sidebar.js
Open-ILS/web/opac/skin/default/xml/login.xml
Open-ILS/web/opac/skin/default/xml/orgtree.xml
Open-ILS/web/opac/skin/default/xml/result_table.xml
Open-ILS/web/opac/skin/default/xml/searchbar.xml
Open-ILS/web/opac/skin/default/xml/sidebar.xml
Open-ILS/web/opac/theme/default/css/colors.css

index b617152..39fccff 100644 (file)
@@ -10,9 +10,10 @@ table { border-collapse: collapse; }
 
 .encircled { border: 1px solid black; }
 
-#main_table { width: 100%; }
-#main_left_cell { width: 20%; vertical-align: top; }
-#main_right_cell { width: 80%; padding-left: 6px; vertical-align: top; }
+#main_table { border-collapse: collapse; width: 100%; height: 100%; }
+#main_left_cell { height: 100%; width: 20%; vertical-align: top;margin: 0px; padding: 0px;}
+#main_right_cell { height: 100%; width: 80%; vertical-align: top; margin: 0px; padding:0px;}
+
 
 /*.vertical {writing-mode: tb-rl; filter: flipv fliph; }*/
 
@@ -20,6 +21,16 @@ table { border-collapse: collapse; }
 /*
 .canvas { float:right; width: 79%; text-align: left;}
 */
+
+.canvas { min-height: 300px; }
+#not_the_canvas {}
+
+#canvas_main {min-height: 300px; border-left: 3px solid #A7EA9D; border-bottom: 3px solid #A7EA9D; 
+       border-top: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px;}
+
+.non_canvas { min-height: 300px; border-left: 3px solid #A7EA9D; border-top: 3px solid #A7EA9D; 
+       border-bottom: 3px solid #A7EA9D; padding-left: 6px; -moz-border-radius: 6px;}
+
 #loading_div { width: 100%;}
 .logo { height: 65px; width: 180px; }
 .org_tree { height: 500px; padding-left: 2px; padding-right: 2px; }            
@@ -29,10 +40,17 @@ table { border-collapse: collapse; }
 #statusbar {}
 
 /* ---------------------------------------------------------------------- */
-.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; }
+.sidebar_div { width: 100%; font-size: 9pt; margin-top: 12px; }
+.sidebar_header { margin-top: 10px; padding-left: 3px; margin-right: 6px; }
+
+.sidebar_extra_item { padding: 0px; margin-right: 8px;}
+.side_bar_item { padding-left: 8px; padding-right: 8px; padding-top: 4px; padding-bottom: 4px; margin-right: 8px; }
+.sidebar_item_active { background: #A7EA9D; margin-right: 0px; }
+.sidebar_chunk { width: 100%; }
+
+/*
+border-left: 1px solid #E0E0E0; border-top: 1px solid #E0E0E0; border-bottom: 1px solid #E0E0E0;}
+*/
 
 /* ---------------------------------------------------------------------- */
 
@@ -70,7 +88,7 @@ table { border-collapse: collapse; }
 .result_table_title_cell { text-align: left; }
 
 .copy_count_cell { width: 12%; vertical-align: middle; text-align: center; }
-.copy_count_div { text-align: center; vertical-align: middle; width:  4em; height: 100%; }
+.copy_count_div { width:  4em; height: 99%; vertical-align: middle; text-align: center; }
 
 .search_page_nav_link { margin-right: 5px; }
 
index 8d667e4..40ec13f 100644 (file)
@@ -16,7 +16,7 @@ function mresultDoSearch() {
 
        table = G.ui.result.main_table;
 
-       while( table.parentNode.rows.length <= getDisplayCount() )  /* add an extra row so IE and safari won't complain */
+       while( table.parentNode.rows.length <= getDisplayCount() + 1)  /* add an extra row so IE and safari won't complain */
                table.appendChild(G.ui.result.row_template.cloneNode(true));
 
        if(getOffset() == 0 || getHitCount() == null ) {
index b5ab809..dc75d05 100644 (file)
@@ -78,7 +78,7 @@ function resultDisplayRecord(rec, pos, is_mr) {
        /* hide the 'now loading...' message */
        hideMe(G.ui.common.loading);
 
-       var r = table.rows[pos];
+       var r = table.rows[pos + 1];
        
        try {
                var rank = parseFloat(ranks[pos + getOffset()]);
@@ -163,7 +163,7 @@ var resultCCHeaderApplied = false;
        'copy_count_cell_<depth>_<pagePosition>'  */
 function resultAddCopyCounts(rec, pagePosition) {
 
-       var r = table.rows[pagePosition];
+       var r = table.rows[pagePosition + 1];
        var countsrow = findNodeByName(r, config.names.result.counts_row );
        var ccell = findNodeByName(countsrow, config.names.result.count_cell);
 
@@ -218,6 +218,8 @@ function resultAddCopyCounts(rec, pagePosition) {
                        }
                }
        }
+
+       unHideMe(getId("search_info_table"));
 }
 
 /* collect copy counts for a record using method 'methodName' */
@@ -240,8 +242,11 @@ function resultDisplayCopyCounts(rec, pagePosition, copy_counts) {
        var i = 0;
        while(copy_counts[i] != null) {
                var cell = getId("copy_count_cell_" + i +"_" + pagePosition);
+               /*
                var span = cell.getElementsByTagName("div")[0];
-               span.appendChild(text(copy_counts[i].available + " / " + copy_counts[i].count));
+               */
+               cell.appendChild(text(copy_counts[i].available + " / " + copy_counts[i].count));
+
                i++;
        }
 }
index 64ec2f7..c421ee1 100644 (file)
@@ -7,8 +7,10 @@ attachEvt("common", "init", setSidebarLinks);
 function initSideBar() {
        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);
+
+       //addCSSClass(G.ui.sidebar[page], config.css.color_2);
+       //addCSSClass(G.ui.sidebar[page], config.css.encircled);
+       addCSSClass(G.ui.sidebar[page], "sidebar_item_active");
 
        /* if we're logged in, show it and replace the Login link with the Logout link */
        if(grabUser()) {
index 61eca7b..1236fb8 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ] >
 
 
-<div id='login_box' class='hide_me color_1'>
+<div id='login_box' class='hide_me color_1 non_canvas' style='margin-top: 6px;'>
 
        <script language='javascript'>
                config.ids.login = {};
        </script>
 
        <div class='login_text'>
-               <span> Login in with your username and password. </span>
-       </div>
-
-       <br/>
-       
-       <div>
-               <span class='login_text'><input id='login_username' type='text' size='16'> </input></span>
-               <span class='login_text'>Username</span>
-       </div>
-
-       <br/>
-
-       <div>
-               <span class='login_text'><input id='login_password' type='password' size='16'> </input></span>
-               <span class='login_text'>Password</span>
+               <span> Login with your username and password. </span>
        </div>
 
        <br/>
 
-       <div class='login_links_div'>
-               <span class='login_text'><a href="javascript:void(0);" id='login_button'> Login </a></span>
-               <span class='login_text'><a href='javascript:void(0);' id='login_cancel_button'> Cancel </a></span>
-       </div>
+       <table>
+               <tbody>
+                       <tr>
+                               <td><span class='login_text'>Username</span></td>
+                               <td><span class='login_text'><input id='login_username' type='text' size='16'> </input></span></td>
+                       </tr>
+                       <tr>
+                               <td><span class='login_text'>Password</span></td>
+                               <td><span class='login_text'><input id='login_password' type='password' size='16'> </input></span></td>
+                       </tr>
+                       <tr>
+                               <td><span class='login_text'><a href="javascript:void(0);" id='login_button'> Login </a></span></td>
+                               <td><span class='login_text'><a href='javascript:void(0);' id='login_cancel_button'> Cancel </a></span></td>
+                       </tr>
+               </tbody>
+       </table>
 
 </div>
 
index 787c294..26d6263 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE x [ <!ENTITY % ent SYSTEM "../../../locale/en-US/lang.dtd"> %ent; ]>
 
 <!-- the org tree -->
-<div id='org_container' class='hide_me'>
+<div id='org_container' class='hide_me non_canvas'>
        <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);'>Collapse All</a></span>
index 5b87f44..e9f3c17 100644 (file)
@@ -5,80 +5,70 @@
 
 <div id='result_table_div' xmlns:xi="http://www.w3.org/2001/XInclude">
 
-       <table id='search_nav_links'>
-               <tbody>
+       <table id='res_table'> 
+
+               <!-- for some reason, this is the only way i can force the cell widths -->
+               <thead id='result_thead'>
+                       <td class='result_table_pic_header'></td>
+                       <td> </td>
+               </thead>
+
+               <tbody id='result_table'>
+
                        <tr>
-                               <td valign='bottom' id='result_info_box'>
-                                       <!--
-                                       <div class='hide_me' id='result_info_div' style='font-size: 8pt;'>
-                                               <span> Results </span> 
-                                               <span id='offset_start'> </span>
-                                               <span> - </span>
-                                               <span id='offset_end'> </span>
-                                               <span> of </span>
-                                               <span id='result_count'> </span>
-                                               <span style='padding-left: 6px;'> (page </span>
-                                               <span id='current_page'> </span>
-                                               <span> of </span>
-                                               <span id='num_pages'> </span>
-                                       </div>
-                                       -->
-                               </td>
-                               <td width="36%" 
-                                       style='padding-bottom: 4px; text-align:center; border-bottom: 1px solid #A0A0A0;'>
-                                       <span style='font-size: 8pt;'> <b>Available copies / Total copies </b></span>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
 
+                               <td class='result_table_row'>
 
-       <table id='result_thead' width='100%' style='margin-right: 16px;'>
-               <tbody>
-                       <tr id='result_thead_row'>
+                                       <table style='width: 100%;'>
+                                               <tbody>
 
-                               <td style='vertical-align: middle;'  id='next_prev_links' valign='bottom'>
-                                       <a class='search_page_nav_link' id='search_home_link' title="First results page">Start</a>
-                                       <a class='search_page_nav_link' id='prev_link' title='Previus page'> &lt;&lt; </a>
-                                       <span class='search_page_nav_link' id='page_numbers'> </span>
-                                       <a  class='search_page_nav_link' id='next_link' title='Next Page'> &gt;&gt; </a>
-                                       <a  class='search_page_nav_link' id='end_link' title="Last results page">End</a>
-                               </td>
+                                                       <tr style='height: 1em; background: #E0F6E0'>
 
-                               <td align='left' style='padding-left: 10px;'>
-                                       <div class='hide_me' id='result_info_div' style='font-size: 9pt;'>
-                                               <span> Results </span> 
-                                               <span id='offset_start'> </span>
-                                               <span> - </span>
-                                               <span id='offset_end'> </span>
-                                               <span> of </span>
-                                               <span id='result_count'> </span>
-                                               <span style='padding-left: 6px;'> (page </span>
-                                               <span id='current_page'> </span>
-                                               <span> of </span>
-                                               <span id='num_pages'> </span>
-                                       </div>
-                               </td>
+                                                               <td style='vertical-align: top;'  id='next_prev_links'>
 
+                                                                       <span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
+                                                                               <span> Results </span> 
+                                                                               <span id='offset_start'> </span>
+                                                                               <span> - </span>
+                                                                               <span id='offset_end'> </span>
+                                                                               <span> of </span>
+                                                                               <span id='result_count'> </span>
+                                                                               <span style='padding-left: 6px;'> (page </span>
+                                                                               <span id='current_page'> </span>
+                                                                               <span> of </span>
+                                                                               <span id='num_pages'> </span>
+                                                                       </span>
 
-                               <td> </td>
-                               <td style='font-size: 8pt; padding-top: 4px;' width='12%' align='center' name='result_thead_ccell'> </td>
-                       </tr>
-               </tbody>
-       </table>
+                                                                       <span style='padding-left: 40px;' >
+                                                                               <a class='search_page_nav_link' id='search_home_link' title="First results page">Start</a>
+                                                                               <a class='search_page_nav_link' id='prev_link' title='Previus page'> &lt;&lt; </a>
+                                                                               <span class='search_page_nav_link' id='page_numbers'> </span>
+                                                                               <a  class='search_page_nav_link' id='next_link' title='Next Page'> &gt;&gt; </a>
+                                                                               <a  class='search_page_nav_link' id='end_link' title="Last results page">End</a>
+                                                                       </span>
 
-       
+                                                               </td>
 
-       <table id='res_table'> 
+                                                               <td  colspan='5' 
+                                                                       style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
+                                                                               <span id='search_info_table' class='hide_me' style='font-size: 8pt;'> <b>Available copies / Total copies </b></span>
+                                                               </td>
+                                                       </tr>
+
+                                                       <tr style='height: 2em;' id='result_thead_row'>
+                                                               <td> </td>
+                                                               <td rowspan='2' style='font-size: 8pt; padding-top: 4px;' class='copy_count_cell' 
+                                                                       width='12%' align='center' name='result_thead_ccell'> </td>
+                                                       </tr>
+
+
+                                               </tbody>
+                                       </table>
+                               </td>
+                       </tr>
 
 
-               <!-- for some reason, this is the only way i can force the cell widths -->
-               <thead id='result_thead'>
-                       <td class='result_table_pic_header'></td>
-                       <td> </td>
-               </thead>
 
-               <tbody id='result_table'>
 
                        <!-- Template for displaying a search result.  This row template is cloned and inserted
                                        for each result returned -->
                        <tr id='result_table_template' class='hide_me'>
 
                                <!-- Jacket image goes here -->
-                               <td  class='result_table_pic_header'><a><img name='item_jacket' class='result_table_pic'/></a></td>
 
-                               <td class='result_table_row'>
+                               <td class='result_table_row' align='left'>
                                        <table class='result_table_subtable'>
                                                <tbody class='result_table_subtbody'>
 
                                                        <tr style='height: 1em' name='counts_row'>
 
+                                                               <td  rowspan='3' class='result_table_pic_header'><a><img name='item_jacket' class='result_table_pic'/></a></td>
+
                                                                <td class='result_table_title_cell' name='result_table_title_cell'>
                                                                        <a title="View titles for this record" name='item_title' class='search_link'> 
                                                                                <!-- Title goes here -->
                                                                </td>
 
                                                                <!-- Copy this td for each copy count appended -->
-                                                               <td align='center' valign='middle' nowrap='nowrap' 
-                                                                       name="copy_count_cell" class='copy_count_cell' rowspan='3'> 
-                                                                       <div  class='copy_count_div'> </div>
+                                                               <td  rowspan='3' nowrap='nowrap' name="copy_count_cell" class='copy_count_cell'> 
                                                                </td>
 
                                                        </tr>
index a2f177a..78ba1ef 100644 (file)
@@ -30,7 +30,7 @@
                <tbody>
                        <tr>
 
-                               <td  align='center' style='width: 240px; padding: 3px; border: 1px solid #A0A0A0;' class='color_2'>
+                               <td  nowrap='nowrap' 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!' />
index 2e067e3..e22a263 100644 (file)
@@ -5,30 +5,30 @@
 
 <div id="sidebar_div" class="sidebar_div" xmlns:xi="http://www.w3.org/2001/XInclude">
 
-       <div class='sidebar_chunk color_1'>
+       <div class='sidebar_chunk'>
 
                <div title="&navigate.home.title;" 
-                       id='home_link_div' class="side_bar_item">
+                       id='home_link_div' class="side_bar_item ">
                        <a id='home_link' href='index.xml'>&navigate.home;</a>
                </div>
        
                <div title="&navigate.advanced.title;"
-                       id='advanced_link_div' class="side_bar_item">
+                       id='advanced_link_div' class="side_bar_item ">
                        <a id='advanced_link' href='advanced.xml'>&navigate.advanced;</a>
                </div>
 
                <div title="&navigate.myopac.title;"
-                       id='myopac_link_div' class="side_bar_item">
+                       id='myopac_link_div' class="side_bar_item ">
                        <a  id='myopac_link' href='myopac/myopac.xml'>&navigate.myopac;</a>
                </div>
 
                <div title="&navigate.login.title;"
-                       id='login_link_div' class="side_bar_item">
+                       id='login_link_div' class="side_bar_item ">
                        <a id='login_link' href='javascript:void(0);'>&navigate.login;</a>
                </div>
 
                <div title="&navigate.logout.title;"
-                       id='logout_link_div' class="side_bar_item hide_me">
+                       id='logout_link_div' class="side_bar_item hide_me ">
                        <a id='logout_link' href='javascript:void(0);'>&navigate.logout;</a>
                </div>
 
index 72fdf0b..4578769 100644 (file)
@@ -7,7 +7,7 @@ body a:hover    { color: red; text-decoration: underline;}
 .color_3 { background: #CCFFFF; color: #000000; }
 
 /* ---------------------------------------------------------------------- */
-.sidebar_chunk {border-right: 1px solid lightgrey;}
+.sidebar_chunk {}
 .sidebar_extra_link { text-decoration: none; }
 #searchbar_tag_on { color: red; }
 .searchbar_item { color: black; } 
@@ -16,14 +16,9 @@ body a:hover { color: red; text-decoration: underline;}
 .nav_link_active { text-decoration: underline; }
 .search_link { text-decoration: none; }
 .result_table_subtable { border-top: 1px solid #E0E0E0; }
-/*
-.copy_count_cell_even { border: 1px solid #E0E0E0; }
-*/
-/*
-.copy_count_cell_even { background: #E0F6E0; }
-*/
 
-.copy_count_div {      border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0;> 
+.copy_count_cell { border-right: 1px solid #E0E0E0; }
+.copy_count_div {      border-left: 2px solid #E0F6E0; border-right: 2px solid #E0F6E0; }
 
 .rdetail_desc { border: 1px solid #A7EA9D; }
 .rdetail_item { border: 1px solid #A7EA9D; }