record details work

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

diff --git a/Open-ILS/web/opac/common/css/mediumfont.css b/Open-ILS/web/opac/common/css/mediumfont.css
index 1864944..a7f1c6d 100644 (file)
--- a/Open-ILS/web/opac/common/css/mediumfont.css
+++ b/Open-ILS/web/opac/common/css/mediumfont.css
@@ -12,4 +12,5 @@ body                          { font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 95%;}
 .nav_link_active { font-weight: 600;}
 .copy_count_cell { font-size: 80%; }
 
-
+#rdetail_copy_info_table { font-size: 92%; }
+.rdetail_copy_nav_link { font-weight: normal; font-size: 95%; }

diff --git a/Open-ILS/web/opac/common/js/utils.js b/Open-ILS/web/opac/common/js/utils.js
index f5f9ab6..361ce2a 100644 (file)
--- a/Open-ILS/web/opac/common/js/utils.js
+++ b/Open-ILS/web/opac/common/js/utils.js
@@ -201,7 +201,7 @@ function normalize(val) {
 
 /* returns true if n is null or stringifies to 'undefined' */
 function isNull(n) {
-       if( n == null || n.toString().toLowerCase() == "undefined" 
+       if( n == null || n == undefined || n.toString().toLowerCase() == "undefined" 
                || n.toString().toLowerCase() == "null" )
                return true;
        return false;

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index af97cfa..d03adb5 100644 (file)
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -33,9 +33,13 @@
 <!ENTITY rdetail.detailMain.edition "Edition">
 <!ENTITY rdetail.detailMain.pubdate "Publication Date">
 <!ENTITY rdetail.detailMain.publisher "Publisher">
-<!ENTITY rdetail.detailMain.tor "Type of Resource">
+<!ENTITY rdetail.detailMain.tor "Format">
 <!ENTITY rdetail.detailMain.subjects "Subjects">
 <!ENTITY rdetail.detailMain.abstract "Abstract">
 <!ENTITY rdetail.copyInfo.headerLabel "Copy Information">
 <!ENTITY rdetail.copyInfo.library "Library">
 <!ENTITY rdetail.copyInfo.callnumber "Callnumber">
+<!ENTITY rdetail.copyInfo.local "View Copy Information for this library only">
+<!ENTITY rdetail.copyInfo.all "View copy information for all libraries">
+<!ENTITY rdetail.loading "Loading copy infomation...">
+<!ENTITY rdetail.noneAvailable " * There are no copies in this library">

diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index f742da5..5ab4d30 100644 (file)
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -74,10 +74,12 @@
 #rdetail_detail_main { width 100%; }
 #rdetail_details_table { padding-top: 10px; width: 100%; padding: 30px; border-collapse: collapse;}
 .rdetail_header { padding: 3px; padding-left: 10px; font-weight: 600; }
-.rdetail_desc { padding-left: 5px; }
+.rdetail_desc { padding: 2px; padding-left: 4px; padding-right: 4px;}
 .rdetail_item { width: 75%; padding-left: 10px; }
 #rdetail_image { padding-right: 10px; }
 #rdetail_copy_info_table { padding: 4px; width: 100%; border-collapse: collapse; }
+.rdetail_copy_info_header_cell { padding: 6px; }
+.rdetail_copy_count_cell { text-align: center; }
 
 
 

diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail.xml b/Open-ILS/web/opac/skin/default/xml/rdetail.xml
index f8acbaa..50a52d6 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/rdetail.xml
+++ b/Open-ILS/web/opac/skin/default/xml/rdetail.xml
@@ -30,42 +30,42 @@
 
                                                                <tr>
                                                                        <td id='rdetail_image_cell' rowspan='8'><img id='rdetail_image'> </img></td>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.title;</td>                
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.title;</td>                
                                                                        <td class='rdetail_item' id='rdetail_title'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.author;</td>               
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.author;</td>               
                                                                        <td class='rdetail_item' id='rdetail_author'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.isbn;</td>                 
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.isbn;</td>                 
                                                                        <td class='rdetail_item' id='rdetail_isbn'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.edition;</td>              
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.edition;</td>              
                                                                        <td class='rdetail_item' id='rdetail_edition'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.pubdate;</td>              
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.pubdate;</td>              
                                                                        <td class='rdetail_item' id='rdetail_pubdate'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.publisher;</td>            
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.publisher;</td>            
                                                                        <td class='rdetail_item' id='rdetail_publisher'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.tor;</td>                  
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.tor;</td>                  
                                                                        <td class='rdetail_item' id='rdetail_tor'> </td>
                                                                </tr>
 
                                                                <tr>
-                                                                       <td class='rdetail_desc'>&rdetail.detailMain.abstract;</td>     
+                                                                       <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.abstract;</td>     
                                                                        <td class='rdetail_item' id='rdetail_abstract'> </td>
                                                                </tr>
 
@@ -79,33 +79,43 @@
                                <!-- This holds information for copies attached to this record -->
                                <div>
 
-                                       <div class='color_1 rdetail_header'>
-                                               <span>&rdetail.copyInfo.headerLabel;</span>
-                                       </div>
 
+                                       <!-- header bar for the copy info table.  this allows you to select local
+                                                       or global copy information -->
+                                       <table class='color_1 rdetail_header' width='100%' >
+                                               <tbody>
+                                                       <tr>
+                                                               <td align='left'>&rdetail.copyInfo.headerLabel;</td>
+                                                               <td align='right'>
+                                                                       <a href='javascript:void(0);' id='copy_info_local_link' 
+                                                                               class='rdetail_copy_nav_link hide_me'>&rdetail.copyInfo.local;</a>
+                                                               </td>
+                                                               <td align='right'>
+                                                                       <a href='javascript:void(0);' id='copy_info_all_link' 
+                                                                               class='rdetail_copy_nav_link'>&rdetail.copyInfo.all;</a>
+                                                               </td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
                                        <table id='rdetail_copy_info_table'>
                                                <tbody>
-
                                                        <tr>
-                                                               <td  nowrap='nowrap' class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.library;</td>
-                                                               <td  nowrap='nowrap' class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.callnumber;</td>
+                                                               <td  class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.library;</td>
+                                                               <td  class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.callnumber;</td>
                                                                <td  nowrap='nowrap' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'> </td>
                                                        </tr>
-
                                                        <tr id='rdetail_copy_info_row'>
                                                                <td name='rdetail_library_cell'> </td>
                                                                <td name='rdetail_callnumber_cell'> </td>
-                                                               <td name='rdetail_copy_count_cell' align='center'> </td>
+                                                               <td nowrap='nowrap' class='rdetail_copy_count_cell' name='rdetail_copy_count_cell'> </td>
                                                        </tr>
-
                                                        <tr id='rdetail_copy_info_loading'>
-                                                               <td>Loading copy information...</td>
+                                                               <td>&rdetail.loading;</td>
                                                        </tr>
-
-                                               </tbody>
+                                                                                                       </tbody>
                                        </table>
+                                       <div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
                                </div> <!-- copy info -->
-
                        </div>
                </div>
        </body>

diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css
index e152b9d..e214b22 100644 (file)
--- a/Open-ILS/web/opac/theme/default/css/colors.css
+++ b/Open-ILS/web/opac/theme/default/css/colors.css
@@ -4,7 +4,7 @@ body a:hover    { color: red; text-decoration: underline;}
 
 .color_1 { background: #A7EA9D; color: #000000; }
 .color_2 { background: #64EA4F; color: #000000; }
-.color_3 { background: #D8B4BE; color: #000000; }
+.color_3 { background: #CCFFFF; color: #000000; }
 
 /* ---------------------------------------------------------------------- */
 .sidebar_chunk {border-right: 1px solid lightgrey;}
@@ -22,7 +22,8 @@ body a:hover  { color: red; text-decoration: underline;}
 #rdetail_details_table { border: 1px solid #A7EA9D; }
 #rdetail_image_cell { border: 1px solid white; border-right: 1px solid #A7EA9D;}
 .rdetail_header { border: 1px solid #FCC; }
-.rdetail_copy_info_header_cell { padding-left: 3px; border: 1px solid #A7EA9D; }
+#rdetail_copy_info_table td { border: 1px solid #A7EA9D;}
+.rdetail_copy_info_header_cell { border: 1px solid #A7EA9D; }
 .rdetail_copy_info_alt { background: #A7EA9D; }
 /* ---------------------------------------------------------------------- */