From f784f0dd9757db005fc7aefce61ca18f46b1c98e Mon Sep 17 00:00:00 2001 From: dbs Date: Mon, 16 Mar 2009 01:59:01 +0000 Subject: [PATCH] Backport preview, TOC, performer notes to rel_1_4 git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@186 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- tools/patch_conifer.sh | 14 ++++++++++++-- web/opac/skin/lul/xml/index.xml | 22 ---------------------- 2 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 web/opac/skin/lul/xml/index.xml diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh index 168fbcfb43..20b3727c2c 100644 --- a/tools/patch_conifer.sh +++ b/tools/patch_conifer.sh @@ -53,12 +53,22 @@ copy_opac_skins() LINKS=`cd "$INSTALL_DIR"/var/web/opac/skin/default/; find xml -type l -print` # For skins, create a _test variation of each - # Copy the default skin in place first, then copy our custom files over top + # 1. Copy the default skin in place first + # 2. Copy our custom default files over top, creating default_test + # 3. Copy the default_test skin into place as "$skin"_test + # 4. Copy the custom skin files over top "$skin"_test + # We probably need to munge the links to point to default_test for rdetail.js (possibly others?) for skin in $SKINS do rm -fr "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test - cp -r "$CANONICAL_EXPORT_DIR"/Open-ILS/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test + if [ $skin -eq 'default' ] + then + cp -r "$CANONICAL_EXPORT_DIR"/Open-ILS/web/opac/skin/default "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test + else + cp -r "$INSTALL_DIR"/var/web/opac/skin/default_test "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test + fi + cp -r "$LOCAL_EXPORT_DIR"/trunk/web/opac/skin/"$skin"/* "$INSTALL_DIR"/var/web/opac/skin/"$skin"_test/. for xml_link in $LINKS diff --git a/web/opac/skin/lul/xml/index.xml b/web/opac/skin/lul/xml/index.xml deleted file mode 100644 index 81db882cab..0000000000 --- a/web/opac/skin/lul/xml/index.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -]> - - - - - - - - - - - -- 2.11.0