From bd92d2e92d58dc1f90f9a099d542f5f8227fbbfb Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 11 Dec 2010 23:47:47 +0100 Subject: [PATCH] Bug 3381 - Add an IntranetUserCSS system preference Content-Type: text/plain; charset="utf-8" Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet. --- C4/Auth.pm | 1 + installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + installer/data/mysql/it-IT/necessari/sysprefs.sql | 398 ++++++++++---------- installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 1 + installer/data/mysql/updatedatabase.pl | 8 + .../prog/en/includes/doc-head-close.inc | 1 + .../en/modules/admin/preferences/staff-client.pref | 7 +- kohaversion.pl | 2 +- 12 files changed, 223 insertions(+), 200 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 7404f96..2f13b86 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -362,6 +362,7 @@ sub get_template_and_user { intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), intranetreadinghistory => C4::Context->preference("intranetreadinghistory"), intranetstylesheet => C4::Context->preference("intranetstylesheet"), + IntranetUserCSS => C4::Context->preference("IntranetUserCSS"), intranetuserjs => C4::Context->preference("intranetuserjs"), intranetbookbag => C4::Context->preference("intranetbookbag"), suggestion => C4::Context->preference("suggestion"), diff --git a/installer/data/mysql/de-DE/mandatory/sysprefs.sql b/installer/data/mysql/de-DE/mandatory/sysprefs.sql index 96ded44..a792720 100644 --- a/installer/data/mysql/de-DE/mandatory/sysprefs.sql +++ b/installer/data/mysql/de-DE/mandatory/sysprefs.sql @@ -40,6 +40,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetNav','','Use HTML tabs to add navigational links to the top-hand navigational bar in the Staff Client','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetreadinghistory',1,'If ON, Reading History is enabled for all patrons','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('intranetstylesheet','','Enter a complete URL to use an alternate layout stylesheet in Intranet','50','free'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetUserCSS','','Add CSS to be included in the intranet in an embedded diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref index 324f8af..ab546f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref @@ -16,6 +16,11 @@ Staff Client: class: url - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with http://.) - + - "Include the following CSS on all pages in the staff client:" + - pref: IntranetUserCSS + type: textarea + class: code + - - Include the stylesheet /css/ - pref: intranetcolorstylesheet class: file @@ -36,7 +41,7 @@ Staff Client: type: textarea class: code - - - "Include the following JavaScript on all pages in the staff interface:" + - "Include the following JavaScript on all pages in the staff clien:" - pref: intranetuserjs type: textarea class: code diff --git a/kohaversion.pl b/kohaversion.pl index 53c1724..eebfdbf 100644 --- a/kohaversion.pl +++ b/kohaversion.pl @@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : use strict; sub kohaversion { - our $VERSION = '3.03.00.004'; + our $VERSION = '3.XX.XX.XXX'; # version needs to be set this way # so that it can be picked up by Makefile.PL # during install -- 1.7.1