[open-ils-commits] [GIT] Evergreen ILS branch master updated. 11868e97844a47d57489062197ac6809d9473366
Evergreen Git
git at git.evergreen-ils.org
Wed Oct 23 12:04:22 EDT 2019
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 11868e97844a47d57489062197ac6809d9473366 (commit)
via 485624d4a7bc8d44843857060b72a813e47573ab (commit)
from d6a9ed418a3737e7d5f40a37bef9c6ea3fadcf5e (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 11868e97844a47d57489062197ac6809d9473366
Author: Jason Boyer <jboyer at equinoxinitiative.org>
Date: Wed Oct 23 12:01:15 2019 -0400
Stamp upgrade script for LP 1849152
Signed-off-by: Jason Boyer <jboyer at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 68ceac645e..5cb05b6074 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1195', :eg_version); -- dbwells/khuckins/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1196', :eg_version); -- rhamby/gcollum/jboyer
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.opac_custom_css.sql b/Open-ILS/src/sql/Pg/upgrade/1196.data.opac_custom_css.sql
similarity index 86%
rename from Open-ILS/src/sql/Pg/upgrade/xxxx.data.opac_custom_css.sql
rename to Open-ILS/src/sql/Pg/upgrade/1196.data.opac_custom_css.sql
index 9715d1d276..da51d9b61f 100644
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.opac_custom_css.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1196.data.opac_custom_css.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1196', :eg_version);
INSERT into config.org_unit_setting_type
( name, grp, label, description, datatype, fm_class ) VALUES
commit 485624d4a7bc8d44843857060b72a813e47573ab
Author: Rogan Hamby <rogan.hamby at gmail.com>
Date: Mon Oct 21 12:02:24 2019 -0400
loading custom css from library setting
Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
Signed-off-by: Garry Collum <gcollum at gmail.com>
Signed-off-by: Jason Boyer <jboyer at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index 04ca260c36..32dcd0fffa 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -4408,6 +4408,15 @@ INSERT into config.org_unit_setting_type
'coust', 'description'),
'integer', null)
+,( 'opac.patron.custom_css', 'opac',
+ oils_i18n_gettext('opac.patron.custom_css',
+ 'Custom CSS for the OPAC',
+ 'coust', 'label'),
+ oils_i18n_gettext('opac.patron.custom_css',
+ 'Custom CSS for the OPAC',
+ 'coust', 'description'),
+ 'string', NULL)
+
,( 'opac.payment_history_age_limit', 'opac',
oils_i18n_gettext('opac.payment_history_age_limit',
'Payment History Age Limit',
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.opac_custom_css.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.opac_custom_css.sql
new file mode 100644
index 0000000000..9715d1d276
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.opac_custom_css.sql
@@ -0,0 +1,16 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, grp, label, description, datatype, fm_class ) VALUES
+( 'opac.patron.custom_css', 'opac',
+ oils_i18n_gettext('opac.patron.custom_css',
+ 'Custom CSS for the OPAC',
+ 'coust', 'label'),
+ oils_i18n_gettext('opac.patron.custom_css',
+ 'Custom CSS for the OPAC',
+ 'coust', 'description'),
+ 'string', NULL);
+
+COMMIT;
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index b28f45ceb8..b6c2876a8a 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -16,7 +16,12 @@
[% IF ctx.get_i18n_l(ctx.eg_locale).rtl == 't' %]
<link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto-rtl.css[% ctx.cache_key %]" />
[% END %]
-
+
+ [% IF ctx.get_org_setting(ctx.search_ou, 'opac.patron.custom_css') %]
+ [% custom_css = ctx.get_org_setting(ctx.search_ou, 'opac.patron.custom_css') %]
+ [% '<style>'; custom_css ; '</style>' %]
+ [% END %]
+
[%- libname = ctx.get_aou(ctx.search_ou).name;
libname = libname | html;
libsname = ctx.get_aou(ctx.search_ou).shortname; %]
diff --git a/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc b/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
new file mode 100644
index 0000000000..ab0f2abb1e
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
@@ -0,0 +1,6 @@
+Custom CSS in OPAC
+^^^^^^^^^^^^^^^^^^
+
+There is now a library setting called opac.patron.custom_css. This can be populated with CSS that will load in the OPAC after the stylesheets and allow for custom CSS without editing server side templates.
+
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 9 +++++++++
.../src/sql/Pg/upgrade/1196.data.opac_custom_css.sql | 16 ++++++++++++++++
Open-ILS/src/templates/opac/parts/base.tt2 | 7 ++++++-
docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc | 6 ++++++
5 files changed, 38 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1196.data.opac_custom_css.sql
create mode 100644 docs/RELEASE_NOTES_NEXT/OPAC/custom_css_in_opac.adoc
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list