Bugzilla – Attachment 7538 Details for
Bug 7261
System Preference to select the first day of week (Sunday or Monday) to use in the calendar (OPAC and Intranet)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to apply in current master
0001-Bug-7261-System-Preference-to-select-the-first-day-o.patch (text/plain), 7.84 KB, created by
Juan Romay Sieira
on 2012-02-09 18:15:31 UTC
(
hide
)
Description:
Patch to apply in current master
Filename:
MIME Type:
Creator:
Juan Romay Sieira
Created:
2012-02-09 18:15:31 UTC
Size:
7.84 KB
patch
obsolete
>From d402283ae69a0590805481682a9ddcc91d432eb9 Mon Sep 17 00:00:00 2001 >From: Juan Romay Sieira <juan.sieira@xercode.es> >Date: Thu, 9 Feb 2012 19:12:31 +0100 >Subject: [PATCH] Bug 7261 System Preference to select the first day of week >Content-Type: text/plain; charset="utf-8" > >--- > C4/Auth.pm | 2 ++ > installer/data/mysql/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 8 ++++++++ > .../intranet-tmpl/prog/en/includes/calendar.inc | 2 +- > .../prog/en/lib/calendar/calendar-setup.js | 5 ++++- > .../en/modules/admin/preferences/i18n_l10n.pref | 8 ++++++++ > .../opac-tmpl/prog/en/modules/opac-reserve.tt | 6 ++++-- > 7 files changed, 28 insertions(+), 4 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index e4bd119..15f6130 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -369,6 +369,7 @@ sub get_template_and_user { > AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"), > AutoLocation => C4::Context->preference("AutoLocation"), > "BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1, >+ CalendarFirstDayOfWeek => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Sunday")?0:1, > CircAutocompl => C4::Context->preference("CircAutocompl"), > FRBRizeEditions => C4::Context->preference("FRBRizeEditions"), > IndependantBranches => C4::Context->preference("IndependantBranches"), >@@ -429,6 +430,7 @@ sub get_template_and_user { > AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"), > AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"), > BranchesLoop => GetBranchesLoop($opac_name), >+ CalendarFirstDayOfWeek => (C4::Context->preference("CalendarFirstDayOfWeek") eq "Monday")?1:0, > LibraryName => "" . C4::Context->preference("LibraryName"), > LibraryNameTitle => "" . $LibraryNameTitle, > LoginBranchname => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"", >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 5e3d79d..8987881 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -334,3 +334,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('LocalCoverImages','0','Display local cover images on intranet details pages.','1','YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('AllowMultipleCovers','0','Allow multiple cover images to be attached to each bibliographic record.','1','YesNo'); > INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('BorrowerRenewalPeriodBase', 'now', 'Set whether the borrower renewal date should be counted from the dateexpiry or from the current date ','dateexpiry|now','Choice'); >+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CalendarFirstDayOfWeek','Sunday','Select the first day of week to use in the calendar.','Sunday|Monday','Choice'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 099dfb9..83b2f6c 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -4663,6 +4663,14 @@ ENDOFRENEWAL > print "Upgrade to $DBversion done (Added a system preference to allow renewal of Patron account either from todays date or from existing expiry date in the patrons account.)\n"; > SetVersion($DBversion); > } >+ >+$DBversion = "3.07.00.XXX"; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CalendarFirstDayOfWeek','Sunday','Select the first day of week to use in the calendar.','Sunday|Monday','Choice');"); >+ print "Upgrade to $DBversion done (Add syspref CalendarFirstDayOfWeek used to select the first day of week to use in the calendar. )\n"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 DropAllForeignKeys($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index 43ba022..d70716c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -7,7 +7,7 @@ Calendar._DN = new Array(_("Sunday"),_("Monday"),_("Tuesday"),_("Wednesday"),_(" > Calendar._SDN = new Array(_("Sun"),_("Mon"),_("Tue"),_("Wed"),_("Thu"),_("Fri"),_("Sat"),_("Sun")); > // First day of the week. "0" means display Sunday first, "1" means display > // Monday first, etc. >-Calendar._FD = 1; >+Calendar._FD = [% CalendarFirstDayOfWeek %]; > // full month names > Calendar._MN = new Array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December")); > // short month names >diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js b/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js >index 8b7fcdf..f96d090 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js >+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar-setup.js >@@ -69,7 +69,10 @@ Calendar.setup = function (params) { > param_default("singleClick", true); > param_default("disableFunc", 'dateStatusHandler'); > param_default("dateStatusFunc", params["disableFunc"]); // takes precedence if both are defined >- param_default("firstDay", 0); // defaults to "Sunday" first >+ if (Calendar._FD) >+ param_default("firstDay", Calendar._FD); >+ else >+ param_default("firstDay", 0); // defaults to "Sunday" first > param_default("align", "Br"); > param_default("range", [1900, 2999]); > param_default("weekNumbers", true); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref >index 9d409ba..f84718c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref >@@ -9,6 +9,14 @@ I18N/L10N: > iso: yyyy-mm-dd > - . > - >+ - Use >+ - pref: CalendarFirstDayOfWeek >+ default: Sunday >+ choices: >+ Sunday: Sunday >+ Monday: Monday >+ - as the first day of week in the calendar. >+ - > - "Enable the following languages on the staff interface:" > - pref: language > type: staff-languages >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >index 7e2683a..9de92c9 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt >@@ -338,7 +338,8 @@ > ifFormat : "[% DHTMLcalendar_dateformat %]", > button : "CalendarReserveDate[% bibitemloo.biblionumber %]", > disableFunc : validate[% bibitemloo.biblionumber %], >- dateStatusFunc : validate[% bibitemloo.biblionumber %] >+ dateStatusFunc : validate[% bibitemloo.biblionumber %], >+ firstDay : [% CalendarFirstDayOfWeek %] > } > ); > //]]> >@@ -370,7 +371,8 @@ > ifFormat : "[% DHTMLcalendar_dateformat %]", > button : "CalendarExpirationDate_[% bibitemloo.biblionumber %]", > disableFunc : validate1, >- dateStatusFunc : validate1 >+ dateStatusFunc : validate1, >+ firstDay : [% CalendarFirstDayOfWeek %] > } > ); > //]]> >-- >1.7.1 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=7538">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7261
:
6393
|
6601
|
7538
|
7999
|
8183