@@ -, +, @@ --- .../prog/en/includes/doc-head-close.inc | 51 +++++++++++++++----- .../prog/en/includes/intranet-bottom.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 17 +++++++ .../prog/en/modules/circ/circulation.tt | 15 ++---- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 41 +++------------- 5 files changed, 68 insertions(+), 57 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -1,13 +1,13 @@ + [% INCLUDE intranetstylesheet.inc %] -[% IF ( bidi ) %] - -[% END %] +[% IF ( bidi ) %][% END %] [% IF ( IntranetUserCSS ) %][% END %] + @@ -22,14 +22,17 @@ + [% INCLUDE 'validator-strings.inc' %] + [% IF ( intranetuserjs ) %] [% END %] + [% IF ( virtualshelves || intranetbookbag ) %] - + + [% END %] + [% IF LocalCoverImages %] - - + + +[% END %] + +[% IF soundon %] + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -65,5 +65,6 @@ [% END %] [% END %] + --- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js @@ -120,3 +120,20 @@ function toUC(f) { function confirmDelete(message) { return (confirm(message) ? true : false); } + +function playSound( sound ) { + sound = TMPL_SOUND_PATH + sound; + document.getElementById("audio-alert").innerHTML = ""; +} + +function playSoundWarning() { + playSound( 'critical.ogg' ); +} + +function playSoundAction() { + playSound( 'opening.ogg' ); +} + +function playSoundSuccess() { + playSound( 'beep.ogg' ); +} --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -172,7 +172,7 @@ $(document).ready(function() { [% IF ( NEEDSCONFIRMATION ) %]
-
+
[% IF CAN_user_circulate_force_checkout %]

Please confirm checkout

[% ELSE %] @@ -345,12 +345,8 @@ $(document).ready(function() { [% IF ( IMPOSSIBLE ) %] -[% IF ( soundon ) %] - -[% END %] -
-
+
    [% IF ( STATS ) %] @@ -462,15 +458,12 @@ $(document).ready(function() {
[% ELSE %] -[% IF ( soundon ) %] - -[% END %] - [% IF (forceallow) %]
Restriction overridden temporarily
[% END %] +[% END %] - [% END %] + [% IF ( issued ) %]

Item checked out

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -89,6 +89,7 @@ $(document).ready(function () { + [% INCLUDE 'header.inc' %] [% INCLUDE 'checkin-search.inc' %] @@ -174,11 +175,7 @@ $(document).ready(function () { [% IF ( waiting ) %] -[% IF ( soundon ) %] - -[% END %] - -
+

Hold found (item is already waiting): [% title |html %]

[% IF ( reservenotes ) %]

Notes: [% reservenotes %]

[% END %]

Hold for:

@@ -220,10 +217,7 @@ $(document).ready(function () { [% IF ( diffbranch ) %] - [% IF ( soundon ) %] - - [% END %] -
+

Hold needing transfer found: [% title |html %]

Hold for:

    @@ -263,20 +257,14 @@ $(document).ready(function () { [% IF ( transfer ) %] -
    +

    Please return [% title or "item" |html %] to [% homebranchname %]
    ( Print slip )

    - [% IF ( soundon ) %] - - [% END %] [% END %] [% IF ( needstransfer ) %] - [% IF ( soundon ) %] - - [% END %] -

    This item needs to be transferred to [% homebranchname %]

    +

    This item needs to be transferred to [% homebranchname %]

    Transfer now?
    [% IF itemnumber %] @@ -301,10 +289,7 @@ $(document).ready(function () { [% IF ( diffbranch ) %] - [% IF ( soundon ) %] - - [% END %] -

    Item consigned:

    +

    Item consigned:

    @@ -333,11 +318,7 @@ $(document).ready(function () { [% IF ( reserved ) %] - [% IF ( soundon ) %] - - [% END %] - -
    +

    Hold found: [% title |html %]

    [% IF ( reservenotes ) %]

    Notes: [% reservenotes %]

    [% END %]
    Hold for:
    @@ -385,7 +366,7 @@ $(document).ready(function () { [% END %] [% IF ( errmsgloop ) %] -
    +

    Check in message

    [% FOREACH errmsgloo IN errmsgloop %] [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] @@ -444,13 +425,7 @@ $(document).ready(function () { [% END %] [% END %] -[% IF ( soundon ) %] - -[% END %] [% ELSE %] -[% IF ( soundon ) %] - -[% END %] [% END %]
    --
    [% title |html %]