[koha-commits] main Koha release repository branch MM-OPAC/theme_dep updated. v3.16.00-643-g9ea9ab3
Git repo owner
gitmaster at git.koha-community.org
Thu Oct 9 18:57:30 CEST 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 "main Koha release repository".
The branch, MM-OPAC/theme_dep has been updated
discards 1ba6863ac4883fac8fe84f136a282ef20e662254 (commit)
discards e4d400d34b0dfc950349c950973952b9121c9752 (commit)
discards c304159fe80c2f3333ce6cb17fec8bd2fb4b241f (commit)
discards ae1b048a9c1f77a54a4099da63b717eae60b9099 (commit)
discards 9ccbe7af97cc53e5cf9d38a44a226b6ef7e17cec (commit)
discards 2c7c74ded8234e46372a2f44449cc96e34731ed3 (commit)
via 9ea9ab359e6f20f27cfb9f17d3384056982de777 (commit)
via f5be88e0b6116d23c3b181c735f1c0e5832c7881 (commit)
via e3fdf528613db6d3b981aa52677e642da7fad362 (commit)
via 3c743c27cdd8955bd22aabb343e9933ee57844f7 (commit)
via 009bdd316eb90c1f63955f14c371eda3485924df (commit)
via 56420eaa1c3ae1e1355e85052024d744fe2719c1 (commit)
via 477187548ea57084feb5f0ce11b56d6f579e41cb (commit)
via 755655a42a2621c86fe3d171564401fd929c28cd (commit)
via 1b5c0966bbb600b6927fa04edcb1691a794f38f6 (commit)
via 171b4e24b30ddceb04e45fb51c4adb6f921217a2 (commit)
via 9daef6fb5323c9a899da5241cfc0bf62ba4cb212 (commit)
via e9eef04b95e7cb0dadda862f07c0d34a31f5eb6a (commit)
via 6a98db50fc56be0d611170507c2ced445b894970 (commit)
via 6246f2c70049baf86bc942c2473793c83057a64f (commit)
via b2839a7c9c8554097bd36de0ad439967e2035c5c (commit)
via 3f2dda2f3380b341bd9575d5626cdb9ac8889191 (commit)
via b04f5ba8a0071609f756e96c50b0cad19780f3e2 (commit)
via 04857ed68eff319f4b7b42508aeee8a240bde995 (commit)
via 2bd151fab5c673a35ce06e511ae1f4b97513539f (commit)
via 70c0b8280bdaf9901eadb93133a52c891fbbd0d7 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (1ba6863ac4883fac8fe84f136a282ef20e662254)
\
N -- N -- N (9ea9ab359e6f20f27cfb9f17d3384056982de777)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 9ea9ab359e6f20f27cfb9f17d3384056982de777
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 12 10:09:57 2014 -0400
Bug 12655 [Revised] PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in XSLT
Two XSL files in the bootstrap theme contain hard-coded paths to the
prog theme directory. This patch adds a query of the opacthemes system
preference and builds the path based on the returned value.
To test in a MARC21 system:
Create or locate a record which contains a subject which is linked to an
authority record. View the detail page for that record in the bootstrap
OPAC and confirm that there is a magnifying class icon next to the link
for that subject heading. Inspect or right-click the image and "View
image" [FF. "Open image in new tab" in Chrome] to verify that the image
being shown is from the bootstrap theme directory.
Also modified: The NORMARC XSL for the detail page which has been
changed in the same way. I did not test it in a NORMARC catalog.
Edit: Fixed copy-and-paste error causing duplicate image.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit f5be88e0b6116d23c3b181c735f1c0e5832c7881
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Fri Jul 25 16:09:49 2014 +1200
Bug 12657 - remove references to prog and ccsr from the packages
To test:
* Build a package and install it, and verify that there are no errors.
* Play around with koha-translate, listing, adding, and removing
languages.
Note: one reference to prog and ccsr remains in koha-translate. This is
to allow it to remove any pre-existing translations on an upgrade.
Note 2: prog translations are still being installed, I think this is due
to the underlying translation system doing it.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit e3fdf528613db6d3b981aa52677e642da7fad362
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sun Aug 3 09:41:37 2014 -0300
Bug 12539: Follow up to fix fallback theme
The is a problem in the logic, fallback must be:
1. Requested (theme, lang, tmpl)
a. return (theme, lang, tmpl), if not
b. return (fallback, lang, tmpl), if not
c. return (theme, 'en', tmpl), if not as last resort
d. return (fallback, 'en', tmpl)
Previous patch missed option 'c', worked for CCSR
but not bootstrap, sorry.
Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 3c743c27cdd8955bd22aabb343e9933ee57844f7
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon Jul 7 15:30:02 2014 -0300
Bug 12539: PROG/CCSR deprecation: Remove hardcoded theme from C4/Templates.pm
This patch removes hardcoded 'prog' from themelanguage on C4/Templates.pm
It adds a new syspref OPACFallback to hold the prefferred fallback
theme for new themes with minimal changes.
This does not brake CCSR if new syspref value is 'prog',
using 'bootstrap' works somehow, but with strange results.
To test:
1) Apply the patch
2) Run updatedatbase.pl
3) CCSR, prog & bootstrap must work as usual
4) Need to test theme/language fallback
a) translate for your preferred language (xx-YY)
b) enable language on opac
c) go to opac, select that language
d) login on opac, go to personal details
e) remove koha-tmpl/opac-tmpl/bootstrap/xx-YY/modules/opac-memberentry.tt
d) reload page, must load in English
f) click other member options, must load on translated language
(can use other pages, ccsr, prog or bootstrap)
5) Do a similar test but for a staff page, enable lang, switch to it,
rm koha-tmpl/intranet-tmpl/prog/xx-YY/modules/admin/admin-home.tt,
any page must be translated except for admin home.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 009bdd316eb90c1f63955f14c371eda3485924df
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jul 1 11:42:30 2014 -0400
Bug 12245 - PROG/CCSR deprecation: Remove OPACMobileUserCSS system preference
With CCSR now deprecated there is no longer a need for the
OPACMobileUserCSS system preference. This patch removes it.
To test, apply the patch and run updatedatabase. Check that the
preference can no longer be found in system preferences.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Preference removed, no koha-qa errors.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 56420eaa1c3ae1e1355e85052024d744fe2719c1
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jul 1 11:56:28 2014 -0400
Bug 12246 - PROG/CCSR deprecation: Remove OpacMainUserBlockMobile system preference
With CCSR having been deprecated there is no longer a use for the
OpacMainUserBlockMobile system preference. This patch removes it.
To test, apply the patch and run updatedatabase. Check that the
preference can no longer be found in system preferences.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Preference removed, no koha-qa errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 477187548ea57084feb5f0ce11b56d6f579e41cb
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jul 1 12:18:12 2014 -0400
Bug 12513 - PROG/CCSR deprecation: Remove OpacShowLibrariesPulldownMobile system preference
With CCSR having been deprecated there is no longer a use for the
OpacShowLibrariesPulldownMobile system preference. This patch removes
it.
To test, apply the patch and run updatedatabase. Check that the
preference can no longer be found in system preferences.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Preference removed, no koha-qa errors.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Reports/Guided.pm | 6 +-
C4/Reserves.pm | 25 ++++
C4/SIP/ILS/Patron.pm | 18 +--
C4/SIP/ILS/Transaction/Checkout.pm | 4 +-
C4/XSLT.pm | 2 +-
installer/data/mysql/updatedatabase.pl | 43 ++++---
.../prog/en/modules/reports/dictionary.tt | 129 +++++++++++---------
.../en/modules/reports/guided_reports_start.tt | 25 +++-
.../prog/en/modules/suggestion/suggestion.tt | 26 +++-
.../opac-tmpl/bootstrap/en/includes/bodytag.inc | 15 +++
.../bootstrap/en/modules/opac-ISBDdetail.tt | 4 +-
.../bootstrap/en/modules/opac-MARCdetail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-account.tt | 1 +
.../bootstrap/en/modules/opac-addbybiblionumber.tt | 4 +-
.../bootstrap/en/modules/opac-advsearch.tt | 2 +-
.../bootstrap/en/modules/opac-alert-subscribe.tt | 4 +-
.../bootstrap/en/modules/opac-auth-MARCdetail.tt | 4 +-
.../bootstrap/en/modules/opac-auth-detail.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +-
.../bootstrap/en/modules/opac-authorities-home.tt | 4 +-
.../en/modules/opac-authoritiessearchresultlist.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-blocked.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 4 +-
.../bootstrap/en/modules/opac-course-details.tt | 4 +-
.../bootstrap/en/modules/opac-course-reserves.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../bootstrap/en/modules/opac-downloadcart.tt | 2 +-
.../bootstrap/en/modules/opac-downloadshelf.tt | 4 +-
.../en/modules/opac-full-serial-issues.tt | 4 +-
.../bootstrap/en/modules/opac-imageviewer.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +-
.../modules/opac-memberentry-update-submitted.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 2 +-
.../bootstrap/en/modules/opac-messaging.tt | 2 +-
.../bootstrap/en/modules/opac-overdrive-search.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 2 +-
.../en/modules/opac-registration-confirmation.tt | 4 +-
.../en/modules/opac-registration-email-sent.tt | 4 +-
.../en/modules/opac-registration-invalid.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../bootstrap/en/modules/opac-results-grouped.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +-
.../bootstrap/en/modules/opac-search-history.tt | 2 +-
.../bootstrap/en/modules/opac-sendbasketform.tt | 2 +-
.../bootstrap/en/modules/opac-sendshelfform.tt | 2 +-
.../bootstrap/en/modules/opac-serial-issues.tt | 2 +-
.../bootstrap/en/modules/opac-shareshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
.../bootstrap/en/modules/opac-showmarc.tt | 2 +-
.../bootstrap/en/modules/opac-showreviews.tt | 4 +-
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 2 +-
.../bootstrap/en/modules/opac-tags_subject.tt | 2 +-
.../bootstrap/en/modules/opac-topissues.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 15 ++-
.../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 29 ++++-
opac/opac-modrequest-suspend.pl | 2 +-
opac/opac-modrequest.pl | 2 +-
reports/dictionary.pl | 17 +--
reports/guided_reports.pl | 7 +-
t/db_dependent/Reports_Guided.t | 32 +++--
t/db_dependent/Reserves.t | 67 +++++++++-
67 files changed, 403 insertions(+), 190 deletions(-)
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list