[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 95b4cd65d03c3752dca07d32e7aa6496e827dd2f

Evergreen Git git at git.evergreen-ils.org
Thu Nov 13 13:54:48 EST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  95b4cd65d03c3752dca07d32e7aa6496e827dd2f (commit)
       via  4da80696287db40c5bcf215865c56538ef7aefed (commit)
       via  c1b9fa359307d2880c5a6c5c7052e321e12090f3 (commit)
       via  93c850b93689b935ffa2a4691858cd21c7f9f821 (commit)
      from  a10f88172c407dfcab8d9783ca095a9385adb464 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 95b4cd65d03c3752dca07d32e7aa6496e827dd2f
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Nov 13 10:45:14 2014 -0800

    LP#1083639: use "cp -r" instead of "cp -R"
    
    This change is purely for the sake of consistency; there's
    no functional difference.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/docs/TechRef/KidsOPAC.txt b/docs/TechRef/KidsOPAC.txt
index 9952306..70b0a57 100644
--- a/docs/TechRef/KidsOPAC.txt
+++ b/docs/TechRef/KidsOPAC.txt
@@ -95,7 +95,7 @@ files to that directory instead, and then skip any Apache config changes.
 % cp -r Open-ILS/examples/web/images/kpac/* /openils/var/web/images/kpac/ #does not clobber
 % mkdir /openils/var/templates_kpac2
 % cp -r Open-ILS/examples/web/templates/kpac /openils/var/templates_kpac2/
-% cp -R /openils/var/web/css/skin/default/kpac/fonts /openils/var/web/css/skin/kpac2/kpac
+% cp -r /openils/var/web/css/skin/default/kpac/fonts /openils/var/web/css/skin/kpac2/kpac
 -------------------------------------------------------------------------------
 
 Then set up 443/80 vhosts for serving the alternate skin in eg.conf, something

commit 4da80696287db40c5bcf215865c56538ef7aefed
Author: Josh Stompro <stomproj at larl.org>
Date:   Thu Oct 23 14:30:05 2014 -0500

    LP#1083639 - Added command to copy fonts into the KPAC2 / Alternate monster skin dir
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/docs/TechRef/KidsOPAC.txt b/docs/TechRef/KidsOPAC.txt
index 169c4ff..9952306 100644
--- a/docs/TechRef/KidsOPAC.txt
+++ b/docs/TechRef/KidsOPAC.txt
@@ -95,6 +95,7 @@ files to that directory instead, and then skip any Apache config changes.
 % cp -r Open-ILS/examples/web/images/kpac/* /openils/var/web/images/kpac/ #does not clobber
 % mkdir /openils/var/templates_kpac2
 % cp -r Open-ILS/examples/web/templates/kpac /openils/var/templates_kpac2/
+% cp -R /openils/var/web/css/skin/default/kpac/fonts /openils/var/web/css/skin/kpac2/kpac
 -------------------------------------------------------------------------------
 
 Then set up 443/80 vhosts for serving the alternate skin in eg.conf, something

commit c1b9fa359307d2880c5a6c5c7052e321e12090f3
Author: Josh Stompro <stomproj at larl.org>
Date:   Thu Oct 23 13:21:16 2014 -0500

    LP#1116387 - adding kpac setup notes.
    
    Revised instructions based on my testing.  Swapped around the Monster
    and Default skin discriptions since the listed Alternate Skin is the default skin.
    
    Signed-off-by: Josh Stompro <stomproj at larl.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/docs/TechRef/KidsOPAC.txt b/docs/TechRef/KidsOPAC.txt
index 856adb7..169c4ff 100644
--- a/docs/TechRef/KidsOPAC.txt
+++ b/docs/TechRef/KidsOPAC.txt
@@ -7,7 +7,10 @@ Configuration
 Apache
 ~~~~~~
 
-[source, bash]
+The KPAC is already included and ready to be used with new Evergreen installs.  So you only need to change the apache config
+if you need to change template locations or if you want to use a different *kpac.xml* config file.  The defaults for the KPAC are set
+in */etc/apache2/eg_vhosts.conf*.
+
 ------------------------------------------------------------------------------
 <Location /eg/kpac>
     PerlSetVar OILSWebContextLoader "OpenILS::WWW::EGKPacLoader"
@@ -77,14 +80,19 @@ XML Configuration File
 Skin Configuration
 ~~~~~~~~~~~~~~~~~~
 
-The following example enables you to configure the alternate skin for the Kids
+The following example enables you to configure the alternate skin (Monster Skin, kpac2) for the Kids
 Catalog.
 
-[source, xml]
+You should be familiar with how the <<_how_to_override_templates|Evergreen TPAC handles template folders>> 
+before you make these changes.
+
+If you already have a custom template directory setup you can copy the *Open-ILS/examples/web/templates/kpac* 
+files to that directory instead, and then skip any Apache config changes. 
+
+[source, bash]
 ------------------------------------------------------------------------------
 % cp -r Open-ILS/examples/web/css/skin/kpac2 /openils/var/web/css/skin/
-% cp -r Open-ILS/examples/web/images/kpac/* /openils/var/web/images/kpac/ #
-does not clobber
+% cp -r Open-ILS/examples/web/images/kpac/* /openils/var/web/images/kpac/ #does not clobber
 % mkdir /openils/var/templates_kpac2
 % cp -r Open-ILS/examples/web/templates/kpac /openils/var/templates_kpac2/
 -------------------------------------------------------------------------------
@@ -92,7 +100,6 @@ does not clobber
 Then set up 443/80 vhosts for serving the alternate skin in eg.conf, something
 along the lines of:
 
-[source, xml]
 ------------------------------------------------------------------------------
 <VirtualHost *:80>
     ServerName xyz.dev198.esilibrary.com:80
@@ -100,9 +107,8 @@ along the lines of:
     DirectoryIndex index.xml index.html index.xhtml
     Include eg_vhost.conf
     <Location /eg/kpac>
-        PerlSetVar OILSWebContextLoader "OpenILS::WWW::EGKPacLoader"
-        PerlSetVar KPacConfigFile "/openils/conf/kpac.xml.example"
-        PerlAddVar OILSWebTemplatePath "/openils/var/templates"
+	#Point to a different kpac.xml config file if needed
+        #PerlSetVar KPacConfigFile "/openils/conf/kpac.xml.example"
         PerlAddVar OILSWebTemplatePath "/openils/var/templates_kpac2"
     </Location>
 </VirtualHost>
diff --git a/docs/opac/kids_opac.txt b/docs/opac/kids_opac.txt
index cc6d089..126a28c 100644
--- a/docs/opac/kids_opac.txt
+++ b/docs/opac/kids_opac.txt
@@ -17,19 +17,7 @@ Two skins, or design interfaces, have been created for the KPAC.  The KPAC was
 designed to run multiple skins on a single web server.  A consortium, then, could 
 allow each library system to choose a skin for their patrons.
 
-
-*Monster Skin:*
-
-
-In this skin, the search bar shares the top panel with a playful monster.  The 
-search grid appears beneath the search bar.  Help and Login links appear in bold 
-colors at the top right of the interface although you can customize these with CSS.  
-After you login, the Login button disappears.
-
-image::media/Kids_OPAC2.jpg[Kids_OPAC2]
-
-
-*Alternate Skin:*
+*Default Skin:*
 
 In this skin, the search bar is the focal point of the top panel and is centered 
 on the screen.  The search grid appears beneath the search bar.  Help and Login 
@@ -39,6 +27,15 @@ in the top right corner, and the Login link becomes an option to Logout.
 
 image::media/Kids_OPAC1.jpg[Kids_OPAC1]
 
+*Alternate Monster Skin:*
+
+In this skin, the search bar shares the top panel with a playful monster.  The
+search grid appears beneath the search bar.  Help and Login links appear in bold
+colors at the top right of the interface although you can customize these with CSS.
+After you login, the Login button disappears.
+
+image::media/Kids_OPAC2.jpg[Kids_OPAC2]
+
 
 Search the Catalog
 ~~~~~~~~~~~~~~~~~~

commit 93c850b93689b935ffa2a4691858cd21c7f9f821
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Tue Feb 5 10:24:17 2013 -0500

    Add KPAC configuration info to the community docs
    
    Adds the KPAC TechRef docs to root.txt so that this information can be
    available via the community docs. Also adds a section to the docs on
    configuring the alternate skin and removes a reference to configuration
    from the end-user KPAC docs.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/docs/TechRef/KidsOPAC.txt b/docs/TechRef/KidsOPAC.txt
index 83d7875..856adb7 100644
--- a/docs/TechRef/KidsOPAC.txt
+++ b/docs/TechRef/KidsOPAC.txt
@@ -1,5 +1,5 @@
-Kid's OPAC
-==========
+Kid's OPAC Configuration
+========================
 
 Configuration
 -------------
@@ -74,6 +74,40 @@ XML Configuration File
 ------------------------------------------------------------------------------
 
 
+Skin Configuration
+~~~~~~~~~~~~~~~~~~
+
+The following example enables you to configure the alternate skin for the Kids
+Catalog.
+
+[source, xml]
+------------------------------------------------------------------------------
+% cp -r Open-ILS/examples/web/css/skin/kpac2 /openils/var/web/css/skin/
+% cp -r Open-ILS/examples/web/images/kpac/* /openils/var/web/images/kpac/ #
+does not clobber
+% mkdir /openils/var/templates_kpac2
+% cp -r Open-ILS/examples/web/templates/kpac /openils/var/templates_kpac2/
+-------------------------------------------------------------------------------
+
+Then set up 443/80 vhosts for serving the alternate skin in eg.conf, something
+along the lines of:
+
+[source, xml]
+------------------------------------------------------------------------------
+<VirtualHost *:80>
+    ServerName xyz.dev198.esilibrary.com:80
+    DocumentRoot /openils/var/web/
+    DirectoryIndex index.xml index.html index.xhtml
+    Include eg_vhost.conf
+    <Location /eg/kpac>
+        PerlSetVar OILSWebContextLoader "OpenILS::WWW::EGKPacLoader"
+        PerlSetVar KPacConfigFile "/openils/conf/kpac.xml.example"
+        PerlAddVar OILSWebTemplatePath "/openils/var/templates"
+        PerlAddVar OILSWebTemplatePath "/openils/var/templates_kpac2"
+    </Location>
+</VirtualHost>
+-------------------------------------------------------------------------------
+
 Considerations for Community Adoption
 -------------------------------------
 
diff --git a/docs/opac/kids_opac.txt b/docs/opac/kids_opac.txt
index 5e3f0f9..cc6d089 100644
--- a/docs/opac/kids_opac.txt
+++ b/docs/opac/kids_opac.txt
@@ -198,4 +198,3 @@ Configuration files allow you to define labels for canned searches in the icon
 grid, determine how icons lead users to new pages, and define whether those icons 
 are canned searches or links to external resources.  Documentation describing how 
 to use the configuration files is available in the Evergreen repository.
-
diff --git a/docs/root.txt b/docs/root.txt
index 653e266..c15589a 100644
--- a/docs/root.txt
+++ b/docs/root.txt
@@ -135,6 +135,14 @@ include::admin/auto_suggest_search.txt[]
 
 include::admin/authentication_proxy.txt[]
 
+// Push titles down one level.
+:leveloffset: 1
+
+include::TechRef/KidsOPAC.txt[]
+
+// Return to normal title levels.
+:leveloffset: 0
+
 include::admin/customize_staff_client.txt[]
 
 // Push titles down one level.
@@ -147,7 +155,6 @@ include::admin/phonelist.txt[]
 
 include::admin/sip_server.txt[]
 
-
 Using the Staff Client
 ======================
 

-----------------------------------------------------------------------

Summary of changes:
 docs/TechRef/KidsOPAC.txt |   47 ++++++++++++++++++++++++++++++++++++++++++--
 docs/opac/kids_opac.txt   |   24 +++++++++-------------
 docs/root.txt             |    9 +++++++-
 3 files changed, 62 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list