Owen Leonard
679fdaebb1
This patch makes many changes to templates and JavaScript related to the
integration of Mana with serials reports:
- Many incorrect uses of the raw filter with html
- Corrections to Bootstrap modal markup
- Untranslatable strings moved out of JavaScript
- Removed markup and JavaScript related to reports comments, a feature
which doesn't exist in this version.
New include file: mana/mana-comment-status.inc
This file contains hidden-by-default messages which are shown during
the process of submitting a comment on a subscription.
New include file: mana/mana-share-report.inc
This file contains the "Share report" modal markup formerly in
guided_reports_start.tt
New JavaScript file: mana.js
Previously mana.inc, an include file containing only JavaScript which
didn't include any template processing.
Changed: mana/mana-report-search-result.inc
This include file is now a full template so that jQuery's load()
function can be used to pull its contents into the reports search
modal.
Changed: svc/mana/search
This script was returning json-encoded HTML. Now it returns regular
HTML.
To test you must have Mana configured and enabled. Apply the patch and
go to Reports -> Saved reports.
- Choose New report -> New SQL from Mana. A "Mana search" modal should
appear.
- Perform a search which will return results, e.g. "circulation."
- A "Loading" indicator should appear while the results are being
retrieved. It should disappear when results appear.
- Results should appear in the DataTable with sorting, paging, and
search options.
- In the "Notes" column, notes longer than 200 characters should be
truncated with a "Show more" link. Clicking it should expand the
comment and reveal a "Show less" link in its place.
- Click the "Import" button (previously "Use"). The button icon
should change to a loading indicator.
- When the import is complete you should be redirected to a view of
your new report.
Go to Serials and click the "Search on Mana" link in the sidebar.
- Perform a search for a serial
- Results should appear in a DataTable with sorting, paging, and search
options.
- Sorting by title should ignore articles "a," "an," and "the."
Create a new subscription or edit an existing subscription which will
match a record in Mana.
- On the second step of adding/editing the subscription a message
should appear at the top of the form, "Searching for subscription in
Mana Knowledge Base," with a loading icon.
- When searching has completed a "Show Mana results" link should
appear.
- Clicking the link should trigger a modal showing search results which
match your subscription, displayed in a DataTable with sorting,
paging, and search options.
- The last column of the table should contain "Import" and "Report"
buttons.
- Clicking the "Report" button should trigger a menu. Any existing
comments will be listed as well as a "New comment" item.
- Clicking an existing comment should cause the menu to close and a
"Submitting comment" message to appear. It should be shortly
replaced with a "Your comment has been submitted" message.
- Clicking "New comment" should reveal a comment form.
- It should not be possible to submit an empty comment.
- Clicking the "cancel" link should redisplay the search results.
- Submitting a new comment should trigger a "Submitting comment"
message followed by a "Your comment has been submitted"
message.
- In the table of search results, click the "Import" button
(previously "Use"). The button icon should change to a loading
indicator.
- The modal should close and the data from Mana should be loaded
into the subscription entry form.
View the detail page of a subscription which has saved with Mana data.
- There should be a "Report mistake" button in the toolbar. Clicking
it should reveal a menu of comments like the one you saw previously.
- Clicking an existing comment should cause the menu to close and a
"Submitting comment" message to appear. It should be shortly
replaced with a "Your comment has been submitted" message.
- Clicking "New comment" should reveal a comment form modal.
- It should not be possible to submit an empty comment.
- Clicking the "cancel" link should hide the modal.
- Submitting a new comment should trigger a "Submitting comment"
message followed by a "Your comment has been submitted"
message.
Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
218 lines
15 KiB
HTML
218 lines
15 KiB
HTML
[% INCLUDE 'blocking_errors.inc' %]
|
|
[% IF subscriptionid and ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_receive_serials ) %]
|
|
|
|
<div id="toolbar" class="btn-toolbar">
|
|
[% IF CAN_user_serials_create_subscription %]
|
|
[% IF biblionumber_for_new_subscription %]
|
|
<div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription</a></div>
|
|
[% ELSE %]
|
|
<div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF ( CAN_user_serials_edit_subscription || CAN_user_serials_create_subscription || CAN_user_serials_delete_subscription ) %]
|
|
[% UNLESS ( cannotedit ) %]
|
|
<div class="btn-group">
|
|
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button>
|
|
<ul class="dropdown-menu">
|
|
[% IF ( CAN_user_serials_edit_subscription ) %]
|
|
<li>
|
|
<a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid | uri %]">Edit subscription</a>
|
|
</li>
|
|
[% END %]
|
|
|
|
[% IF ( CAN_user_serials_create_subscription ) %]
|
|
<li>
|
|
<a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid | uri %]">Edit as new (duplicate)</a>
|
|
</li>
|
|
[% END %]
|
|
|
|
[% IF CAN_user_editcatalogue_edit_catalogue %]
|
|
<li>
|
|
<a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]">Edit record</a>
|
|
</li>
|
|
[% END %]
|
|
|
|
[% IF serialsadditems && CAN_user_editcatalogue_edit_items %]
|
|
<li>
|
|
<a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Edit items</a>
|
|
</li>
|
|
[% END %]
|
|
|
|
[% IF ( CAN_user_serials_delete_subscription ) %]
|
|
<li>
|
|
<a href="#" id="deletesub">Delete subscription</a>
|
|
</li>
|
|
[% END %]
|
|
</ul>
|
|
</div>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF not cannotedit or CAN_user_serials_receive_serials %]
|
|
[% IF CAN_user_serials_renew_subscription and not closed %]
|
|
<div class="btn-group"><a id="renew" class="btn btn-default" href="#"><i class="fa fa-refresh"></i> Renew</a></div>
|
|
[% END %]
|
|
[% IF CAN_user_serials_receive_serials and not closed %]
|
|
<div class="btn-group"><a id="receive" class="btn btn-default" href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscriptionid | html %]&serstatus=1,3"><i class="fa fa-inbox"></i> Receive</a></div>
|
|
[% END %]
|
|
[% UNLESS cannotedit %]
|
|
[% IF closed %]
|
|
<div class="btn-group"><a id="reopen" class="btn btn-default" href="#"><i class="fa fa-repeat"></i> Reopen</a></div>
|
|
[% ELSE %]
|
|
<div class="btn-group"><a id="close" class="btn btn-default" href="#"><i class="fa fa-times-circle"></i> Close</a></div>
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF Koha.Preference('Mana') == 1 and Koha.Preference('AutoShareWithMana').grep('subscription').size == 0 %]
|
|
[% IF one_language_enabled==0 or mana_id %]
|
|
<div class="btn-group"><a data-toggle="modal" data-toggle="tooltip" title="Share the subscription with other librairies. Your email address will be associated to your sharing." data-target="#mana_share_modal" class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div>
|
|
[% ELSE %]
|
|
<div class="btn-group" id="mana-subscription-share" data-toggle="tooltip" title="Share the subscription with other libraries. Your email address will be associated to your sharing."><a class="btn btn-default"><i class="fa fa-share-alt"></i> Share</a></div>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF ( mana_id && Koha.Preference('Mana') == 1 ) %]
|
|
<div class="btn-group">
|
|
<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"> Report mistake <span class="caret"></span></button>
|
|
<ul class="dropdown-menu mana-actions">
|
|
[% IF ( mana_comments ) %]
|
|
[% FOREACH c IN mana_comments %]
|
|
<li>
|
|
<a data-commentid="[% c.id | html %]" data-resourceid="[% mana_id | html %]" href="#">[% c.message | html %] ([% c.nb | html %])</a>
|
|
</li>
|
|
[% END %]
|
|
<li role="separator" class="divider"></li>
|
|
[% END %]
|
|
<li><a data-commentid="other" data-resourceid="[% mana_id | html %]" href="#">New comment</a></li>
|
|
</ul>
|
|
</div>
|
|
[% END %]
|
|
</div>
|
|
[% ELSIF CAN_user_serials_create_subscription %]
|
|
<div id="toolbar" class="btn-toolbar">
|
|
[% IF ( biblionumber_for_new_subscription ) %]
|
|
<div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription | html %]"><i class="fa fa-plus"></i> New subscription</a></div>
|
|
[% ELSE %]
|
|
<div class="btn-group"><a id="newsubscription" class="btn btn-default" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div>
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
|
|
<div class="modal" id="mana-comment-box" tabindex="-1" role="dialog" aria-labelledby="mana_submit_comment">
|
|
<div class="modal-dialog" role="document">
|
|
<div class="modal-content">
|
|
<form id="mana_comment_form" action="/cgi-bin/koha/serials/subscription-detail.pl" method="get">
|
|
<div class="modal-header">
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
|
<h4 class="modal-title" id="mana_submit_comment">Please enter a new comment (max 35 characters)</h4>
|
|
</div>
|
|
<div class="modal-body">
|
|
<input type="hidden" id="mana-resource" value="subscription" />
|
|
<input type="hidden" id="mana-resource-id" value="[% mana_id | html %]" />
|
|
<input type="text" maxlength="35" size="35" id="mana-comment" required="required" />
|
|
<button id="mana-send-comment">Submit</button>
|
|
<a href="#" class="cancel" id="mana-comment-close">Cancel</a>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
|
|
</div>
|
|
</form>
|
|
</div> <!-- /.modal-content -->
|
|
</div> <!-- /.modal-dialog -->
|
|
</div> <!-- /#mana-comment-box -->
|
|
|
|
<div id="mana_share_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="mana_share_modal_label">
|
|
<div class="modal-dialog" role="document">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
|
<h4 id="mana_share_modal_label">Share [% bibliotitle | html %] to Mana</h4>
|
|
</div>
|
|
<div class="modal-body">
|
|
[% IF (mana_id) %]
|
|
<div class="alert">
|
|
<p>Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.</p>
|
|
</div>
|
|
[% END %]
|
|
[% IF ( languages_loop ) %]
|
|
[% UNLESS ( one_language_enabled ) %]
|
|
<div class="rows">
|
|
<ol>
|
|
<li><span class="label">Frequency: </span>
|
|
[% frequency.description | html %]
|
|
</li>
|
|
<li><span class="label">Number pattern: </span>
|
|
[% numberpattern.label | html %]
|
|
</li>
|
|
</ol>
|
|
</div>
|
|
<div class="rows">
|
|
<form method="get" id="mana_share_form" action="/cgi-bin/koha/serials/subscription-detail.pl" class="validated" >
|
|
<fieldset>
|
|
<label for="mana_language">Language:</label>
|
|
<select id="mana_language" name="mana_language">
|
|
[% FOREACH languages_loo IN languages_loop %]
|
|
[% IF ( languages_loo.group_enabled ) %]
|
|
[% IF ( languages_loo.plural ) %]
|
|
[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
|
|
[% IF ( sublanguages_loo.enabled ) %]
|
|
[% IF ( sublanguages_loo.sublanguage_current ) %]
|
|
<option value="[% languages_loo.rfc4646_subtag | html %]" selected>
|
|
[% sublanguages_loo.native_description | html %]
|
|
[% sublanguages_loo.script_description | html %]
|
|
[% sublanguages_loo.region_description | html %]
|
|
[% sublanguages_loo.variant_description | html %]
|
|
([% sublanguages_loo.rfc4646_subtag | html %])
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="[% languages_loo.rfc4646_subtag | html %]">
|
|
[% sublanguages_loo.native_description | html %]
|
|
[% sublanguages_loo.script_description | html %]
|
|
[% sublanguages_loo.region_description | html %]
|
|
[% sublanguages_loo.variant_description | html %]
|
|
([% sublanguages_loo.rfc4646_subtag | html %])
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( languages_loo.group_enabled ) %]
|
|
[% IF ( languages_loo.current ) %]
|
|
<option value="[% languages_loo.rfc4646_subtag | html %]" selected>
|
|
[% IF ( languages_loo.native_description ) %]
|
|
[% languages_loo.native_description | html %]
|
|
[% ELSE %]
|
|
[% languages_loo.rfc4646_subtag | html %]
|
|
[% END %]
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="[% languages_loo.rfc4646_subtag | html %]">
|
|
[% IF ( languages_loo.native_description ) %]
|
|
[% languages_loo.native_description | html %]
|
|
[% ELSE %]
|
|
[% languages_loo.rfc4646_subtag | html %]
|
|
[% END %]
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
<input type="hidden" id="op" name="op" value="share"/>
|
|
<input type="hidden" id="subscriptionid" name="subscriptionid" value="[% subscriptionid | html %]"/>
|
|
</fieldset>
|
|
</form>
|
|
</div> <!-- /.rows -->
|
|
[% END %]
|
|
[% END %]
|
|
</div> <!-- /.modal-body -->
|
|
<div class="modal-footer">
|
|
<button type="submit" form="mana_share_form" class="btn btn-default">Share</button>
|
|
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Cancel</button>
|
|
</div>
|
|
</div> <!-- /.modal-content -->
|
|
</div> <!-- /.modal-dialog -->
|
|
</div> <!-- /#mana-share-modal -->
|