projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f73cbc5)
Backport preview, TOC, performer notes to rel_1_4
authordbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Mon, 16 Mar 2009 01:59:01 +0000 (01:59 +0000)
committerdbs <dbs@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Mon, 16 Mar 2009 01:59:01 +0000 (01:59 +0000)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/conifer/trunk@186 6d9bc8c9-1ec2-4278-b937-99fde70a366f

tools/patch_conifer.sh patch | blob | history
web/opac/skin/lul/xml/index.xml [deleted file] patch | blob | history

diff --git a/tools/patch_conifer.sh b/tools/patch_conifer.sh
index 168fbcf..20b3727 100644 (file)
--- 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 (file)
index 81db882..0000000
--- a/web/opac/skin/lul/xml/index.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Loads the environment -->
-<!--#include virtual="setenv.xml"-->
-
-<!DOCTYPE html PUBLIC 
-       "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-       <!--#include virtual="/opac/locale/${locale}/opac.dtd"-->
-       <!--#include virtual="/opac/locale/${locale}/opac_conifer.dtd"-->
-]>
-
-
-<html xmlns='http://www.w3.org/1999/xhtml'>
-       <!--#include virtual="header.xml"-->
-       <!--#if expr="$OILS_PAGE='index.xml'"-->
-               <!--#include virtual="home/index_body.xml"-->
-       <!--#else-->
-               <!--#include virtual="body.xml"-->
-       <!--#endif-->
-</html>
-
Evergreen contribs