From: dbs Date: Thu, 9 Jul 2009 21:26:08 +0000 (+0000) Subject: First cut at updating skins, etc, to rel_1_6 standards X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9495e027dc2d1dd411a34390513ab48c920458c0;p=contrib%2FConifer.git First cut at updating skins, etc, to rel_1_6 standards git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@576 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh index 471d2f09a7..79f1905583 100644 --- a/tools/patch_conifer.sh +++ b/tools/patch_conifer.sh @@ -88,10 +88,7 @@ copy_opac_skins() done sed -i -e "s/\/$skin\/css\/layout.css/\/$skin\_test\/css\/layout.css/" "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/xml/common/css_common.xml - if [ "$skin" == "lul" ] - then - sed -i -e 's/var googleBooksLink = true/var googleBooksLink = false/' "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/js/result_common.js - fi + sed -i -e 's/var googleBooksLink = true/var googleBooksLink = false/' "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/js/result_common.js # Make global config default to grouping metarecords and formats sed -i -e 's/var SHOW_MR_DEFAULT = false/var SHOW_MR_DEFAULT = true/' "$INSTALL_DIR"/var/web/opac/common/js/config.js @@ -102,10 +99,11 @@ copy_opac_skins() # We need the Canuck patch in place. Save us, Canuck patch! copy_xul() { - cp -r "$LOCAL_EXPORT_DIR"/trunk/xul/server/patron/ue_config.js "$INSTALL_DIR"/var/web/xul/server/patron/ue_config.js + cp "$LOCAL_EXPORT_DIR"/trunk/xul/server/cat/* "$INSTALL_DIR"/var/web/xul/server/cat/. + cp "$LOCAL_EXPORT_DIR"/trunk/xul/server/patron/* "$INSTALL_DIR"/var/web/xul/server/patron/. } -# We'll need to restart Perl services after an update of circ rules +# Update our circ rules copy_circ_rules() { for circ_rule in `ls -1 "$LOCAL_EXPORT_DIR"/trunk/circ/*` @@ -115,7 +113,6 @@ copy_circ_rules() then echo -n else cp --backup=numbered "$circ_rule" "$INSTALL_DIR"/var/circ/. - osrf_ctl.sh -a restart_perl > /dev/null fi done } diff --git a/web/opac/skin/default/js/rdetail.js b/web/opac/skin/default/js/rdetail.js index 7aa9db6147..c0638a12c3 100644 --- a/web/opac/skin/default/js/rdetail.js +++ b/web/opac/skin/default/js/rdetail.js @@ -197,8 +197,8 @@ function OpenMarcEditWindow(pcrud, rec) { dojo.require('openils.PermaCrud'); win.xulG = { - "record" : {"marc" : rec.marc()}, - "save" : { + "record": {"marc": rec.marc()}, + "save": { "label": opac_strings.SAVE_MFHD_LABEL, "func": function(xmlString) { rec.marc(xmlString); @@ -229,14 +229,15 @@ function _holdingsDraw(h) { } function _holdingsDrawMFHD(holdings, entryNum) { - var here = findOrgUnit(getLocation()); - if (getDepth() > 0 || getDepth === 0 ) { - while (getDepth() < findOrgDepth(here)) - here = findOrgUnit( here.parent_ou() ); + var here = findOrgUnit(getLocation()); + if (getDepth() > 0 || getDepth === 0 ) { + while (getDepth() < findOrgDepth(here)) + here = findOrgUnit( here.parent_ou() ); if (!orgIsMine(findOrgUnit(here), findOrgUnit(holdings.owning_lib()))) { return null; } - } + } + var hh = holdings.holdings(); var hch = holdings.current_holdings(); var hs = holdings.supplements(); @@ -246,16 +247,17 @@ function _holdingsDrawMFHD(holdings, entryNum) { var ho = holdings.online(); var hm = holdings.missing(); var hinc = holdings.incomplete(); + var hloc = holdings.location() || 'MFHD'; if ( hh.length == 0 && hch.length == 0 && hs.length == 0 && hcs.length == 0 && hi.length == 0 && hci.length == 0 && - ho.length == 0 && hm.length == 0 && hinc.length == 0 + ho.length == 0 && hm.length == 0 && hinc.length == 0 && !isXUL() ) { return null; } dojo.place("
" + - dojo.string.substitute(opac_strings.HOLDINGS_TABLE_CAPTION, [holdings.location()]) + + dojo.string.substitute(opac_strings.HOLDINGS_TABLE_CAPTION, [hloc]) + "
", "rdetail_details_table", "after" ); @@ -686,7 +688,7 @@ function _rdetailRows(node) { if( rdetailShowLocal && getLocation() != globalOrgTree.id() ) { var loc = findOrgUnit(getLocation()); if( node ) { - if( !orgIsMine(node, loc) && !orgIsMine(loc, node) ) return; + if( !orgIsMine(node, loc) && !orgIsMine(loc,node) ) return; } else { for( var i = 0; i < globalOrgTree.children().length; i++ ) { var org = findOrgUnit(globalOrgTree.children()[i]); diff --git a/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/web/opac/skin/default/xml/rdetail/rdetail_summary.xml new file mode 100644 index 0000000000..f835882964 --- /dev/null +++ b/web/opac/skin/default/xml/rdetail/rdetail_summary.xml @@ -0,0 +1,158 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+
&opac.image_provided;
+ +
+ 		&common.title;
&common.author; + +
&common.isbn;
&common.edition;
&common.pubdate;
&common.publisher;
&common.physical;
&common.format; + + +
&rdetail.detailMain.abstract;
Subjects + +
&rdetail.summary.online; + + + + + +
+ + + + + + + + +
+ diff --git a/xul/server/patron/util.js b/xul/server/patron/util.js index 3738fdc13d..c6ec82bddb 100644 --- a/xul/server/patron/util.js +++ b/xul/server/patron/util.js @@ -6,7 +6,7 @@ patron.util = {}; patron.util.EXPORT_OK = [ 'columns', 'mbts_columns', 'mb_columns', 'mp_columns', /*'std_map_row_to_column',*/ 'std_map_row_to_columns', 'retrieve_au_via_id', 'retrieve_fleshed_au_via_id', 'retrieve_fleshed_au_via_barcode', 'set_penalty_css', 'retrieve_name_via_id', - 'merge' + 'merge', 'ausp_columns' ]; patron.util.EXPORT_TAGS = { ':all' : patron.util.EXPORT_OK };