From 9aa1aec44a18721d3f414b6ad73c42c49fe8793d Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 26 Aug 2005 15:05:24 +0000 Subject: [PATCH] record details work git-svn-id: svn://svn.open-ils.org/ILS/trunk@1751 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/common/css/mediumfont.css | 3 +- Open-ILS/web/opac/common/js/utils.js | 2 +- Open-ILS/web/opac/locale/en-US/lang.dtd | 6 ++- Open-ILS/web/opac/skin/default/css/layout.css | 4 +- .../web/opac/skin/default/xml/rdetail.xml | 52 +++++++++++-------- .../web/opac/theme/default/css/colors.css | 5 +- 6 files changed, 45 insertions(+), 27 deletions(-) diff --git a/Open-ILS/web/opac/common/css/mediumfont.css b/Open-ILS/web/opac/common/css/mediumfont.css index 1864944166..a7f1c6ddb9 100644 --- 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 f5f9ab6a2b..361ce2a062 100644 --- 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 af97cfa098..d03adb54b5 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -33,9 +33,13 @@ - + + + + + diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css index f742da533d..5ab4d30308 100644 --- 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 f8acbaa689..50a52d6c1d 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail.xml @@ -30,42 +30,42 @@ - &rdetail.detailMain.title; + &rdetail.detailMain.title; - &rdetail.detailMain.author; + &rdetail.detailMain.author; - &rdetail.detailMain.isbn; + &rdetail.detailMain.isbn; - &rdetail.detailMain.edition; + &rdetail.detailMain.edition; - &rdetail.detailMain.pubdate; + &rdetail.detailMain.pubdate; - &rdetail.detailMain.publisher; + &rdetail.detailMain.publisher; - &rdetail.detailMain.tor; + &rdetail.detailMain.tor; - &rdetail.detailMain.abstract; + &rdetail.detailMain.abstract; @@ -79,33 +79,43 @@
-
- &rdetail.copyInfo.headerLabel; -
+ + + + + + + + + +
&rdetail.copyInfo.headerLabel; + &rdetail.copyInfo.local; + + &rdetail.copyInfo.all; +
- - - + + - - + - - + - - +
&rdetail.copyInfo.library;&rdetail.copyInfo.callnumber;&rdetail.copyInfo.library;&rdetail.copyInfo.callnumber;
Loading copy information...&rdetail.loading;
+
&rdetail.noneAvailable;
- diff --git a/Open-ILS/web/opac/theme/default/css/colors.css b/Open-ILS/web/opac/theme/default/css/colors.css index e152b9d3bb..e214b2238e 100644 --- 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; } /* ---------------------------------------------------------------------- */ -- 2.43.2