From a49b91ff2afbffe4dc09dfd2df02893c4733d8ca Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Thu, 23 Jan 2014 11:41:52 -0500
Subject: [PATCH] Begin enabling KPAC-branded library info page

This needs work and is going to get squashed like a bug when we're through.

Yeesh.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Ben Shum <bshum@biblio.org>
---
 .../src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm   |  1 +
 Open-ILS/src/templates/kpac/library.tt2            |  6 +++
 Open-ILS/src/templates/opac/library.tt2            | 53 +---------------------
 .../src/templates/opac/parts/library/core_info.tt2 | 50 ++++++++++++++++++++
 4 files changed, 59 insertions(+), 51 deletions(-)
 create mode 100644 Open-ILS/src/templates/kpac/library.tt2
 create mode 100644 Open-ILS/src/templates/opac/parts/library/core_info.tt2

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
index 77a7eae6a1..30fbca261d 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
@@ -29,6 +29,7 @@ sub load {
     return $self->load_simple("category") if $path =~ m|kpac/category|;
     return $self->load_kpac_rresults if $path =~ m|kpac/results|;
     return $self->load_record(no_search => 1) if $path =~ m|kpac/record|; 
+    return $self->load_library if $path =~ m|kpac/library|;
 
     # ----------------------------------------------------------------
     #  Everything below here requires SSL
diff --git a/Open-ILS/src/templates/kpac/library.tt2 b/Open-ILS/src/templates/kpac/library.tt2
new file mode 100644
index 0000000000..2c1dc650b3
--- /dev/null
+++ b/Open-ILS/src/templates/kpac/library.tt2
@@ -0,0 +1,6 @@
+[%- PROCESS "opac/parts/header.tt2";
+    WRAPPER "kpac/parts/subpage.tt2";
+    ctx.page_title = l("Library details: [_1]", ctx.library.name);
+-%]
+    [%- INCLUDE "opac/parts/library/core_info.tt2"; %]
+[%- END; %]
diff --git a/Open-ILS/src/templates/opac/library.tt2 b/Open-ILS/src/templates/opac/library.tt2
index 24a4f7a91c..f733ca0b0c 100644
--- a/Open-ILS/src/templates/opac/library.tt2
+++ b/Open-ILS/src/templates/opac/library.tt2
@@ -4,54 +4,5 @@
     ctx.page_title = l("Library details: [_1]", ctx.library.name);
 -%]
     [%- INCLUDE "opac/parts/searchbar.tt2" %]
-<div id="content-wrapper">
-    <div id="main-content" class="content-wrapper-library-page" vocab="http://schema.org/" typeof="Library">
-    <h1 property="name">[% ctx.library.name | html %]</h1>
-
-    [%-
-        lib_url = ctx.get_org_setting(ctx.library.id, 'lib.info_url');
-        IF lib_url;
-            '<div id="library-url"><a href="'; lib_url | url; '" property="url">'; l('Library web site'); '</a></div>';
-        END;
-    -%]
-
-    [%- IF ctx.hours; %]
-        [%- INCLUDE "opac/parts/library/hours.tt2"; %]
-    [% END; -%]
-
-    [%- IF (ctx.library.email OR ctx.library.phone); %]
-    <h2 id="contact-info">[% l('Contact information') %]</h2>
-    [%- IF ctx.library.email; %]
-        <div>[% l('Email address: ') %]<a href="mailto:[% ctx.library.email | html %]" property="email">[% ctx.library.email | html %]</a></div>
-    [%- END; %]
-    [%- IF ctx.library.phone; %]
-        <div>[% l('Telephone: ') %]<a href="tel:[% ctx.library.phone | html %]" property="telephone">[% ctx.library.phone | html %]</a></div>
-    [% END; %]
-    [% END; %]
-
-    [%- IF ctx.library.mailing_address; %]
-    <div id="addresses">
-        <div id="mailing" property="location address" typeof="PostalAddress">
-            <h3 property="contactType">[% l('Mailing address') %]</h3>
-            <span property="streetAddress">[% ctx.mailing_address.street1 | html %]
-            [%- IF ctx.mailing_address.street2; "<br />"; ctx.mailing_address.street2 | html; END; %]
-            </span><br />
-            <span property="addressLocality">[% ctx.mailing_address.city | html %]</span><br />
-            <span property="addressRegion">[% ctx.mailing_address.state | html %]</span><br />
-            <span property="addressCountry">[% ctx.mailing_address.country | html %]</span><br />
-            <span property="postalCode">[% ctx.mailing_address.post_code | html %]</span><br />
-        </div>
-    </div>
-    [%- END; %]
-
-    [%- IF ctx.library.parent_ou; %]
-    <h2>Branch relationship</h2>
-    <div id="branch-info">[% l('Parent library: ') %]
-        <a property="branchOf" href="[% mkurl(ctx.opac_root _ '/library/' _ ctx.parent.shortname, {}, 1) %]">[% ctx.parent.name | html %]</a>
-    </div>
-    [%  END; -%]
-
-    <div class="common-full-pad"></div>
-    </div>
-[%- END %]
-</div>
+    [%- INCLUDE "opac/parts/library/core_info.tt2"; %]
+[%- END; %]
diff --git a/Open-ILS/src/templates/opac/parts/library/core_info.tt2 b/Open-ILS/src/templates/opac/parts/library/core_info.tt2
new file mode 100644
index 0000000000..b48c0d7428
--- /dev/null
+++ b/Open-ILS/src/templates/opac/parts/library/core_info.tt2
@@ -0,0 +1,50 @@
+<div id="content-wrapper">
+    <div id="main-content" class="content-wrapper-library-page" vocab="http://schema.org/" typeof="Library">
+    <h1 property="name">[% ctx.library.name | html %]</h1>
+
+    [%-
+        lib_url = ctx.get_org_setting(ctx.library.id, 'lib.info_url');
+        IF lib_url;
+            '<div id="library-url"><a href="'; lib_url | url; '" property="url">'; l('Library web site'); '</a></div>';
+        END;
+    -%]
+
+    [%- IF ctx.hours; %]
+        [%- INCLUDE "opac/parts/library/hours.tt2"; %]
+    [% END; -%]
+
+    [%- IF (ctx.library.email OR ctx.library.phone); %]
+    <h2 id="contact-info">[% l('Contact information') %]</h2>
+    [%- IF ctx.library.email; %]
+        <div>[% l('Email address: ') %]<a href="mailto:[% ctx.library.email | html %]" property="email">[% ctx.library.email | html %]</a></div>
+    [%- END; %]
+    [%- IF ctx.library.phone; %]
+        <div>[% l('Telephone: ') %]<a href="tel:[% ctx.library.phone | html %]" property="telephone">[% ctx.library.phone | html %]</a></div>
+    [% END; %]
+    [% END; %]
+
+    [%- IF ctx.library.mailing_address; %]
+    <div id="addresses">
+        <div id="mailing" property="location address" typeof="PostalAddress">
+            <h3 property="contactType">[% l('Mailing address') %]</h3>
+            <span property="streetAddress">[% ctx.mailing_address.street1 | html %]
+            [%- IF ctx.mailing_address.street2; "<br />"; ctx.mailing_address.street2 | html; END; %]
+            </span><br />
+            <span property="addressLocality">[% ctx.mailing_address.city | html %]</span><br />
+            <span property="addressRegion">[% ctx.mailing_address.state | html %]</span><br />
+            <span property="addressCountry">[% ctx.mailing_address.country | html %]</span><br />
+            <span property="postalCode">[% ctx.mailing_address.post_code | html %]</span><br />
+        </div>
+    </div>
+    [%- END; %]
+
+    [%- IF ctx.library.parent_ou; %]
+    <h2>Branch relationship</h2>
+    <div id="branch-info">[% l('Parent library: ') %]
+        <a property="branchOf" href="[% mkurl(ctx.opac_root _ '/library/' _ ctx.parent.shortname, {}, 1) %]">[% ctx.parent.name | html %]</a>
+    </div>
+    [%  END; -%]
+
+    <div class="common-full-pad"></div>
+    </div>
+</div>
-- 
2.11.0