[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.03-30-g14a4abe
Git repo owner
gitmaster at git.koha-community.org
Thu Aug 15 20:30:57 CEST 2013
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, 3.12.x has been updated
via 14a4abebed9df1acc67a08685be368e060a2d310 (commit)
via 1d7490b6e50d0cdfd08124f5ca46eca4547d5ca6 (commit)
via 257bd313b3cd1f5db55b79753b720ca08fac8954 (commit)
via ccd824532156eff6a97135a4e8cc766f3d7df894 (commit)
via 21454708cb4212dd6615d15a82c134c1f2fa43f4 (commit)
via b08e95bd5071876731951c51f1194887895cde8d (commit)
from d7e697b711eb04f7d13007be161d3ae64d31c7eb (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 14a4abebed9df1acc67a08685be368e060a2d310
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Jul 21 11:50:09 2013 +0200
Bug 10516 - Follow up - Fixing capitalization
Fix capitalization on submit buttons when deleting
a Z39.50 server.
- Delete this Server
- Do Not Delete
I think the "Do not delete" should maybe even be a cancel
link to be more consistent with how Koha displays this
kind of dialog in other places.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
fixes capitalisation, tool stil works
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit c5cc04ef3d5e50c376e37a1493926181389efa6a)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 1d7490b6e50d0cdfd08124f5ca46eca4547d5ca6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jun 28 15:10:14 2013 -0400
Bug 10516 - Improve titles, breadcrumbs, and confirmation messages for Z39.50 server adds and updates
The template for adding/editing Z39.50 servers shows the same title,
breadcrumbs, etc. for add and edit operations. This patch creates
separate text for each case.
To test, try both adding and editing a Z39.50 server. The page title,
breadcrumb, and heading should correctly reflect the operation you
perform.
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely and all strings are translatable.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5c60ae40f97d9c22504c2942a00a93777984c7a5)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 257bd313b3cd1f5db55b79753b720ca08fac8954
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Thu Jul 11 19:07:09 2013 +0200
Bug 10578: fix results sorting in staff interface
To test (in librarian's interface):
1. Have some biblio records to get a list when searching.
2. Make an advanced search with 'as phrase' modifier (title -- ti,phr:
or author -- au,phr: , etc.)
3. Having the result list try to change the sort order.
4. You should get no results with a message like: "No results match your
search for 'au%2Cphr: " etc.
5. Apply the patch
6. Repeat steps 2. & 3.
7. You should get the list sorted according to your choice.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely, passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0b05d1acb9e5402a85fc39987577a8686c07d27c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ccd824532156eff6a97135a4e8cc766f3d7df894
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jul 11 10:53:06 2013 -0400
Bug 10576: make strings in additem.js accessible to translation
There are a couple of untranslatable strings in additem.js. This patch
moves the strings out of the script and into the include file which has
been created for this purpose.
To test, apply the patch and test the process for adding an item to an
existing or new basket (with AcqCreateItem set to "when placing an
order."
The add item form should be correctly labeled "Add item." After adding
an item, click to edit it again. The form should now be labeled "Update
item."
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely and passes all tests.
Made sure strings can be translated testing with German templates.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit b7305e4876e6d961e8325155d679b1312975e74d)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 21454708cb4212dd6615d15a82c134c1f2fa43f4
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 8 11:22:38 2013 -0400
Bug 10552: make several sysprefs available to the OPAC login page
Several system preference variables are unavailable to the OPAC login
template because they are not explicitly enabled for that page. Instead
of adding them to Auth.pm using the old method this patch uses the new
system preference check syntax using the Koha TT plugin.
The following preferences are now checked using this syntax in
masthead.inc:
OpacAddMastheadLibraryPulldown
UseCourseReserves
reviewson
OpacShowRecentComments
In order for the call in masthead.inc to the new plugin to work on all
OPAC pages "[% USE Koha %]" must be added to any template which
includes it (most of them).
Also in this patch: A change to Auth.pm to enable correct display of the
LibraryName in the title of the OPAC login page.
To test, turn on the above system preferences and confirm that the
relevant links appear under the OPAC's main search bar on all pages
including the login page.
Confirm that the text specified in the LibraryName system preference is
shown as the title of the login page.
Confirm that course reserves and comments are displayed correctly on the
biblio detail page.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
I checked both prog and ccsr - all seems well and the links are appearing and disappearing in accordance with the appropriate sysprefs.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 04dd98fa846d4f28edc5811cb90e8a5ba4b6289b)
Conflicts:
koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt
koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b08e95bd5071876731951c51f1194887895cde8d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon May 6 14:25:23 2013 -0400
Bug 10206 - Add Koha TT Plugin - Koha.Preference
This plugin is meant to be a place to put general purpose TT functions
directly related to Koha. If a plugin is not a filter, and does not
have more than one subroutine, that subroutine most likely belongs
in this TT plugin.
This first and only function the plugin currently has is Preference,
which allows a template to get the value of a system preference without,
it needing to be passed in from a perl script.
For example, to use, first include the line '[% USE Koha %]' at the top
of the template to enable the plugin, then do something like this
to check the value of a system prefence in the template:
[% IF Koha.Preference( 'MyPreference ) == 'SettingA' %] ...
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7e10f6fb78ae7fa2dfc4f52a3791ac35082237ac)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 11 ++++--
.../Plugin/{KohaAuthorisedValues.pm => Koha.pm} | 31 +++++++++-----------
admin/z3950servers.pl | 3 +-
catalogue/search.pl | 10 +++---
.../intranet-tmpl/prog/en/includes/additem.js.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 5 +--
.../prog/en/modules/admin/z3950servers.tt | 18 +++++++++--
koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 10 +++---
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 6 ++--
.../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-account.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-advsearch.tt | 1 +
.../prog/en/modules/opac-alert-subscribe.tt | 1 +
.../prog/en/modules/opac-auth-MARCdetail.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-auth-detail.tt | 1 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt | 1 +
.../prog/en/modules/opac-authorities-home.tt | 1 +
.../en/modules/opac-authoritiessearchresultlist.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-browser.tt | 1 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 5 ++-
.../opac-tmpl/prog/en/modules/opac-downloadcart.tt | 1 +
.../prog/en/modules/opac-downloadshelf.tt | 1 +
.../prog/en/modules/opac-full-serial-issues.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-imageviewer.tt | 1 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt | 1 +
.../modules/opac-memberentry-update-submitted.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-memberentry.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-messaging.tt | 1 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-privacy.tt | 1 +
.../prog/en/modules/opac-readingrecord.tt | 2 +-
.../en/modules/opac-registration-confirmation.tt | 1 +
.../en/modules/opac-registration-email-sent.tt | 1 +
.../prog/en/modules/opac-registration-invalid.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 1 +
.../prog/en/modules/opac-results-grouped.tt | 1 +
.../prog/en/modules/opac-search-history.tt | 1 +
.../prog/en/modules/opac-serial-issues.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-showreviews.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-tags_subject.tt | 1 +
.../opac-tmpl/prog/en/modules/opac-topissues.tt | 1 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 2 +-
46 files changed, 94 insertions(+), 49 deletions(-)
copy Koha/Template/Plugin/{KohaAuthorisedValues.pm => Koha.pm} (50%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list