@@ -, +, @@ --- .../bootstrap/en/includes/account-table.inc | 112 +++++++++++ .../bootstrap/en/includes/holds-table.inc | 222 +++++++++++++++++++++ .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 114 +---------- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 206 +------------------ 4 files changed, 337 insertions(+), 317 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -0,0 +1,112 @@ +
Title | + [% IF ( showpriority ) %] +Placed on | + [% ELSE %] +Placed on | + [% END %] +Expires on | + [% UNLESS( singleBranchMode) %] +Pick up location | + [% END %] + [% IF ( showpriority ) %] +Priority | + [% END %] +Status | + [% IF SuspendHoldsOpac and ! onlyinfo %] +Suspend | + [% END %] + [% IF ! onlyinfo %] +Modify | + [% END %] +
---|---|---|---|---|---|---|---|---|
+ [% IF ! onlyinfo %] + + [% HOLD.biblio.title | html %] + [% FOREACH s IN HOLD.biblio.subtitles %] + [% s | html %] + [% END %] + [% HOLD.item.enumchron | html %] + + [% ELSE %] + + [% HOLD.biblio.title | html %] + [% FOREACH s IN HOLD.biblio.subtitles %] + [% s | html %] + [% END %] + [% HOLD.item.enumchron | html %] + + [% END %] + [% HOLD.biblio.author | html %] + | ++ + Hold date: + [% HOLD.reservedate | $KohaDates %] + + | ++ [% IF ! HOLD.found %] + [% IF ( HOLD.expirationdate ) %] + + Expiration: + [% HOLD.expirationdate | $KohaDates %] + + [% ELSE %] + + Expiration: + Never expires + + [% END %] + [% ELSE %] + - + [% END %] + | + [% UNLESS( singleBranchMode) %] ++ Pick up location: + [% HOLD.branch.branchname | html %] + | + [% END %] + [% IF ( showpriority ) %] ++ Priority: + [% HOLD.priority | html %] + | + [% END %] ++ Status: + [% IF ( HOLD.is_waiting ) %] + [% IF ( HOLD.is_at_destination ) %] + [% IF ( HOLD.found ) %] + Item waiting at [% HOLD.branch.branchname | html %] + [% IF ( HOLD.waitingdate ) %] + since [% HOLD.waitingdate | $KohaDates %] + [% IF HOLD.expirationdate %] + until [% HOLD.expirationdate | $KohaDates %] + [% END %] + [% END %] + + [% ELSE %] + Item waiting to be pulled from [% Branches.GetName( HOLD.branchcode ) | html %] + [% END %] + [% ELSE %] + Item in transit to [% Branches.GetName( HOLD.branchcode ) | html %] + [% END %] + [% ELSE %] + [% IF ( HOLD.is_in_transit ) %] + [% SET transfer = HOLD.item.get_transfer %] + Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since + [% transfer.datesent | $KohaDates %] + [% ELSIF ( HOLD.suspend ) %] + Suspended [% IF ( HOLD.suspend_until ) %] until [% HOLD.suspend_until | html %] [% END %] + [% ELSE %] + [% IF HOLD.itemtype %] + Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]' + [% ELSE %] + Pending + [% END %] + [% END %] + [% END %] + | + [% IF SuspendHoldsOpac and ! onlyinfo %] ++ [% IF ( HOLD.is_cancelable_from_opac ) %] + [% IF HOLD.suspend %] + + [% ELSE %] + [% IF AutoResumeSuspendedHolds %] + Suspend + [% # hold suspend modal form %] + + [% ELSE %] + + [% END # / IF AutoResumeSuspendedHolds %] + [% END # / IF HOLD.suspend %] + [% END # / IF ( HOLD.is_cancelable_from_opac )%] + | + [% END # / IF SuspendHoldsOpac %] + [% IF ! onlyinfo %] ++ [% IF ( HOLD.is_cancelable_from_opac ) %] + + [% END %] + | + [% END # / IF onlyinfo %] +
Title | - [% IF ( showpriority ) %] -Placed on | - [% ELSE %] -Placed on | - [% END %] -Expires on | - [% UNLESS( singleBranchMode) %] -Pick up location | - [% END %] - [% IF ( showpriority ) %] -Priority | - [% END %] -Status | - [% IF SuspendHoldsOpac %] -Suspend | - [% END %] -Modify | -
---|---|---|---|---|---|---|---|---|
- - [% RESERVE.biblio.title | html %] - [% FOREACH s IN RESERVE.biblio.subtitles %] - [% s | html %] - [% END %] - [% RESERVE.item.enumchron | html %] - - [% RESERVE.biblio.author | html %] - | -- - Hold date: - [% RESERVE.reservedate | $KohaDates %] - - | -- [% IF ! RESERVE.found %] - [% IF ( RESERVE.expirationdate ) %] - - Expiration: - [% RESERVE.expirationdate | $KohaDates %] - - [% ELSE %] - - Expiration: - Never expires - - [% END %] - [% ELSE %] - - - [% END %] - | - [% UNLESS( singleBranchMode) %] -- Pick up location: - [% RESERVE.branch.branchname | html %] - | - [% END %] - [% IF ( showpriority ) %] -- Priority: - [% RESERVE.priority | html %] - | - [% END %] -- Status: - [% IF ( RESERVE.is_waiting ) %] - [% IF ( RESERVE.is_at_destination ) %] - [% IF ( RESERVE.found ) %] - Item waiting at [% RESERVE.branch.branchname | html %] - [% IF ( RESERVE.waitingdate ) %] - since [% RESERVE.waitingdate | $KohaDates %] - [% IF RESERVE.expirationdate %] - until [% RESERVE.expirationdate | $KohaDates %] - [% END %] - [% END %] - - [% ELSE %] - Item waiting to be pulled from [% Branches.GetName( RESERVE.branchcode ) | html %] - [% END %] - [% ELSE %] - Item in transit to [% Branches.GetName( RESERVE.branchcode ) | html %] - [% END %] - [% ELSE %] - [% IF ( RESERVE.is_in_transit ) %] - [% SET transfer = RESERVE.item.get_transfer %] - Item in transit from [% Branches.GetName( transfer.frombranch ) | html %] since - [% transfer.datesent | $KohaDates %] - [% ELSIF ( RESERVE.suspend ) %] - Suspended [% IF ( RESERVE.suspend_until ) %] until [% RESERVE.suspend_until | html %] [% END %] - [% ELSE %] - [% IF RESERVE.itemtype %] - Pending for next available item of item type '[% ItemTypes.GetDescription( RESERVE.itemtype ) | html %]' - [% ELSE %] - Pending - [% END %] - [% END %] - [% END %] - | - [% IF SuspendHoldsOpac %] -- [% IF ( RESERVE.is_cancelable_from_opac ) %] - [% IF RESERVE.suspend %] - - [% ELSE %] - [% IF AutoResumeSuspendedHolds %] - Suspend - [% # hold suspend modal form %] - - [% ELSE %] - - [% END # / IF AutoResumeSuspendedHolds %] - [% END # / IF RESERVE.suspend %] - [% END # / IF ( RESERVE.is_cancelable_from_opac )%] - | - [% END # / IF SuspendHoldsOpac %] -- [% IF ( RESERVE.is_cancelable_from_opac ) %] - - [% END %] - | -