Owen Leonard
374f59f3cd
This patch updates the TinyMCE editor to the latest version (5.0.16) and adds a translatable include file which will allow the TinyMCE interface to show the same translation as Koha. The configuration of the editor has been updated according to the new version's requirements, keeping all the tools available we had before and adding emoji support. To test, apply the patch and enable the UseWYSIWYGinSystemPreferences system preference. TESTING THE UPGRADED EDITOR - Go to Administration -> System preferences -> OPAC. - Multiple instances of the TinyMCE editor should appear on the page: opaccredits, OpacCustomSearch, OpacLoginInstructions, etc. - Test adding and editing content to one or more of these editors. Confirm that the various editor tools work correctly. - Verify that changing the contents of any editor (including via paste) enables the corresponding "Save all X preferences" button. - Test the news editor under Tools -> News. - Test the library "OPAC info" editor in libraries administration: Administration -> Libraries -> Edit library -> OPAC info. TESTING TRANSLATABILITY - Update a translation: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for the staff client, e.g. misc/translator/po/fr-FR-staff-prog.po - Locate strings pulled from includes/str/tinymce_i18n.inc for translation, e.g.: #. SCRIPT #: intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc:1 #, fuzzy msgid "File" msgstr "Fichier :" - Edit the "msgstr" string however you want (it's just for testing) and remove the "fuzzy" line. - Install the updated translation: > perl translate install fr-FR - Go to Administration -> System preferences -> OPAC. - In each instance of the TinyMCE editor, the first menu item should have as its label the translation "msgstr" string you edited. - Check that the "About" page shows updated information about the TinyMCE version, 5.0.16. Signed-off-by: Michal Denar <black23@gmail.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
305 lines
17 KiB
Text
305 lines
17 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% SET footerjs = 1 %]
|
|
[% USE ColumnsSettings %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Administration › Libraries
|
|
[% IF op == 'add_form' %]
|
|
›[% IF library %]Modify library[% ELSE %]New library [% library.branchcode | html %][% END %]
|
|
[% ELSIF op == 'delete_confirm' %]
|
|
› Confirm deletion of library '[% library.branchcode | html %]'
|
|
[% END %]
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="admin_branches" class="admin">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'prefs-admin-search.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
› <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
|
|
› <a href="/cgi-bin/koha/admin/branches.pl">Libraries</a>
|
|
[% IF op == 'add_form' %]
|
|
› [% IF library %]Modify library[% ELSE %]New library [% library.branchcode | html %][% END %]
|
|
[% ELSIF op == 'delete_confirm' %]
|
|
› Confirm deletion of library '[% library.branchcode | html %]'
|
|
[% END %]
|
|
</div>
|
|
|
|
<div class="main container-fluid">
|
|
<div class="row">
|
|
<div class="col-sm-10 col-sm-push-2">
|
|
<main>
|
|
|
|
[% FOREACH m IN messages %]
|
|
<div class="dialog [% m.type | html %]">
|
|
[% SWITCH m.code %]
|
|
[% CASE 'error_on_update' %]
|
|
An error occurred when updating this library. Perhaps it already exists.
|
|
[% CASE 'error_on_insert' %]
|
|
An error occurred when adding this library. The branchcode might already exist.
|
|
[% CASE 'error_on_delete' %]
|
|
An error occurred when deleting this library. Check the logs.
|
|
[% CASE 'success_on_update' %]
|
|
Library updated successfully.
|
|
[% CASE 'success_on_insert' %]
|
|
Library added successfully.
|
|
[% CASE 'success_on_delete' %]
|
|
Library deleted successfully.
|
|
[% CASE 'cannot_delete_library' %]
|
|
This library cannot be deleted. Patrons or items are still using it
|
|
[% IF m.data.patrons_count and m.data.items_count %]
|
|
([% m.data.patrons_count | html %] patrons and [% m.data.items_count | html %] items).
|
|
[% ELSIF m.data.patrons_count %]
|
|
([% m.data.patrons_count | html %] patrons).
|
|
[% ELSIF m.data.items_count %]
|
|
([% m.data.items_count | html %] items).
|
|
[% END %]
|
|
[% CASE 'error_on_update_category' %]
|
|
An error occurred when updating this library category. Perhaps it already exists.
|
|
[% CASE 'error_on_insert_category' %]
|
|
An error occurred when adding this library category. The categorycode might already exist.
|
|
[% CASE 'error_on_delete_category' %]
|
|
An error occurred when deleting this library category. Check the logs.
|
|
[% CASE 'success_on_update_category' %]
|
|
Library category updated successfully.
|
|
[% CASE 'success_on_insert_category' %]
|
|
Library category added successfully.
|
|
[% CASE 'success_on_delete_category' %]
|
|
Library category deleted successfully.
|
|
[% CASE 'cannot_delete_category' %]
|
|
This library category cannot be deleted. [% m.data.libraries_count | html %] libraries are still using it.
|
|
[% CASE %]
|
|
[% m.code | html %]
|
|
[% END %]
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF op == 'list' %]
|
|
<div id="toolbar" class="btn-toolbar">
|
|
<a class="btn btn-default" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add_form"><i class="fa fa-plus"></i> New library</a>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF op == 'add_form' %]
|
|
<h3>[% IF library %]Modify library[% ELSE %]New library[% END %]</h3>
|
|
<form action="/cgi-bin/koha/admin/branches.pl" id="Aform" name="Aform" class="validated" method="post">
|
|
<fieldset class="rows">
|
|
<input type="hidden" name="op" value="add_validate" />
|
|
[% IF library %]
|
|
<input type="hidden" name="is_a_modif" value="1" />
|
|
[% END %]
|
|
<ol>
|
|
<li>
|
|
[% IF library %]
|
|
<span class="label">Library code: </span>
|
|
<input type="hidden" name="branchcode" value="[% library.branchcode | html %]" />
|
|
[% library.branchcode | html %]
|
|
[% ELSE %]
|
|
<label for="branchcode" class="required">Library code: </label>
|
|
<input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode | html %]" class="required" required="required" />
|
|
<span class="required">Required</span>
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="branchname" class="required">Name: </label>
|
|
<input type="text" name="branchname" id="branchname" size="80" value="[% library.branchname | html %]" class="required" required="required" />
|
|
<span class="required">Required</span>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
[% IF categories %]
|
|
<fieldset class="rows"><legend>Group(s):</legend>
|
|
<ol>
|
|
[% FOREACH category IN categories %]
|
|
<li>
|
|
<label for="[% category.categorycode | html %]">[% category.categoryname | html %]: </label>
|
|
[% IF category and selected_categorycodes.grep(category.categorycode).size %]
|
|
<input type="checkbox" id="[% category.categorycode | html %]" name="selected_categorycode_[% category.categorycode | html %]" checked="checked" />
|
|
[% ELSE %]
|
|
<input type="checkbox" id="[% category.categorycode | html %]" name="selected_categorycode_[% category.categorycode | html %]" />
|
|
[% END %]
|
|
<span class="hint">[% category.codedescription | html %]</span>
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</fieldset>
|
|
[% END %]
|
|
<fieldset class="rows">
|
|
<ol>
|
|
<li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% library.branchaddress1 | html %]" /></li>
|
|
<li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% library.branchaddress2 | html %]" /></li>
|
|
<li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% library.branchaddress3 | html %]" /></li>
|
|
<li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% library.branchcity | html %]" /></li>
|
|
<li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% library.branchstate | html %]" /></li>
|
|
<li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip" size="25" maxlength="25" value="[% library.branchzip | html %]" /></li>
|
|
<li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% library.branchcountry | html %]" /></li>
|
|
<li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% library.branchphone | html %]" /></li>
|
|
<li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% library.branchfax | html %]" /></li>
|
|
<li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email" size="80" value="[% library.branchemail | html %]" /></li>
|
|
<li><label for="branchreplyto">Reply-To: </label> <input type="text" name="branchreplyto" id="branchreplyto" class="email" size="80" value="[% library.branchreplyto | html %]" /><br /><span class="hint">Default: ReplyToDefault system preference</span></li>
|
|
<li><label for="branchreturnpath">Return-Path: </label> <input type="text" name="branchreturnpath" id="branchreturnpath" class="email" size="80" value="[% library.branchreturnpath | html %]" /><br /><span class="hint">Default: ReturnpathDefault system preference</span></li>
|
|
<li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" size="80" value="[% library.branchurl | html %]" class="url" /></li>
|
|
<li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% library.opac_info | $raw %]</textarea></li>
|
|
<li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip" size="15" maxlength="15" value="[% library.branchip | html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
|
|
<li><label for="marcorgccode">MARC organization code</label> <input type="text" name="marcorgcode" id="marcorgcode" size="16" value="[% library.marcorgcode | html %]" /> <span class="hint">If not filled in defaults to system preference MARCOrgCode. You can obtain your code from <a href="http://www.loc.gov/marc/organizations/orgshome.html" target="_blank">Library of Congress</a>.</span>
|
|
<li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% library.branchnotes | html %]" /></li>
|
|
<li><label for="pickup_location">Pickup location: </label>
|
|
<select name="pickup_location" id="pickup_location">
|
|
[% IF !library || library.pickup_location == 1 %]
|
|
<option value="1" selected="selected">Yes</option>
|
|
<option value="0">No</option>
|
|
[% ELSE %]
|
|
<option value="1">Yes</option>
|
|
<option value="0" selected="selected">No</option>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="submit" value="Submit" />
|
|
<a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
|
|
[% IF op == 'delete_confirm' and not ( items_count or patrons_count )%]
|
|
<div class="dialog alert">
|
|
<form action="/cgi-bin/koha/admin/branches.pl" method="post">
|
|
<h3>Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?</h3>
|
|
<input type="hidden" name="op" value="delete_confirmed" />
|
|
<input type="hidden" name="branchcode" value="[% library.branchcode | html %]" />
|
|
<input type="hidden" name="branchname" value="[% library.branchname | html %]">
|
|
<button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
|
|
</form>
|
|
<form action="/cgi-bin/koha/admin/branches.pl" method="get">
|
|
<button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
|
|
</form>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF op == 'list' %]
|
|
<h3>Libraries</h3>
|
|
[% IF libraries.count %]
|
|
<table id="libraries">
|
|
<thead>
|
|
<tr>
|
|
<th>Name</th>
|
|
<th>Code</th>
|
|
<th>Address</th>
|
|
<th>MARC organization code</th>
|
|
<th>IP</th>
|
|
<th>Pickup location</th>
|
|
<th>Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH library IN libraries %]
|
|
<tr>
|
|
<td>[% library.branchname | html %]</td>
|
|
<td>[% library.branchcode | html %]</td>
|
|
<td>
|
|
[% IF library.branchaddress1 %]
|
|
[% library.branchaddress1 | html %][% END %]
|
|
[% IF library.branchaddress2 %]
|
|
<br />[% library.branchaddress2 | html %][% END %]
|
|
[% IF library.branchaddress3 %]
|
|
<br />[% library.branchaddress3 | html %][% END %]
|
|
[% IF library.branchcity %]
|
|
<br />[% library.branchcity | html %][% END %][% IF ( library.branchstate ) %],
|
|
[% library.branchstate | html %][% END %]
|
|
[% IF library.branchzip %]
|
|
[% library.branchzip | html %][% END %]
|
|
[% IF library.branchcountry %]
|
|
<br />[% library.branchcountry | html %][% END %]
|
|
[% IF library.branchphone %]
|
|
<br />Ph: [% library.branchphone | html %][% END %]
|
|
[% IF library.branchfax %]
|
|
<br />Fax: [% library.branchfax | html %][% END %]
|
|
[% IF library.branchemail %]
|
|
<br /><a href="mailto:[% library.branchemail | uri %]">[% library.branchemail | html %]</a>[% END %]
|
|
[% IF library.branchurl %]
|
|
<br /><a href="[% library.branchurl | url %]">[% library.branchurl | html %]</a>[% END %]
|
|
[% IF library.opac_info %]
|
|
<br />OPAC Info: <div>[% library.opac_info | $raw %]</div>[% END %]
|
|
[% IF library.branchnotes %]
|
|
<br />Notes: [% library.branchnotes | html %][% END %]
|
|
</td>
|
|
<td>[% library.marcorgcode | html %]</td>
|
|
<td>[% library.branchip | html %]</td>
|
|
<td>[% IF library.pickup_location %]Yes[% ELSE %]No[% END %]</td>
|
|
<td class="actions">
|
|
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/branches.pl?op=add_form&branchcode=[% library.branchcode |uri %]"><i class="fa fa-pencil"></i> Edit</a>
|
|
<form action="/cgi-bin/koha/admin/branches.pl" method="post">
|
|
<input type="hidden" name="branchcode" value="[% library.branchcode | html %]" />
|
|
<input type="hidden" name="op" value="delete_confirm" />
|
|
<button type="submit" id="delete_library_[% library.branchcode | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button>
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% ELSE %]
|
|
<div class="dialog message">There are no libraries defined. <a href="/cgi-bin/koha/admin/branches.pl?op=add_form">Start defining libraries</a>.</div>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
</main>
|
|
</div> <!-- /.col-sm-10.col-sm-push-2 -->
|
|
|
|
<div class="col-sm-2 col-sm-pull-10">
|
|
<aside>
|
|
[% INCLUDE 'admin-menu.inc' %]
|
|
</aside>
|
|
</div> <!-- /.col-sm-2.col-sm-pull-10 -->
|
|
</div> <!-- /.row -->
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/admin-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% INCLUDE 'columns_settings.inc' %]
|
|
[% Asset.js("lib/tiny_mce/tinymce.min.js") | $raw %]
|
|
[% INCLUDE 'str/tinymce_i18n.inc' %]
|
|
<script>
|
|
var columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'libraries', 'libraries', 'json' ) | $raw %];
|
|
$(document).ready(function() {
|
|
KohaTable("libraries", {
|
|
"aoColumnDefs": [
|
|
{ "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
|
|
],
|
|
"sPaginationType": "full",
|
|
"exportColumns": [0,1,2,3,4,5]
|
|
}, columns_settings);
|
|
|
|
[% UNLESS library %]
|
|
$("#Aform").on("submit", function( event ) {
|
|
if ( $("#branchcode").val().match(/\s/) ) {
|
|
event.preventDefault();
|
|
alert(_("The library code entered contains whitespace characters. Please remove any whitespace characters from the library code"));
|
|
return false;
|
|
} else {
|
|
return true;
|
|
}
|
|
});
|
|
[% END %]
|
|
});
|
|
|
|
tinyMCE.init({
|
|
branding : false,
|
|
content_css : "[% interface | html %]/[% theme | html %]/css/tinymce.css",
|
|
menubar : "file edit view insert format tools table",
|
|
mode : "specific_textareas",
|
|
plugins : "autoresize table hr link image charmap lists code emoticons",
|
|
toolbar : [
|
|
"formatselect | bold italic | cut copy paste | alignleft aligncenter alignright | outdent indent | image link unlink anchor cleanup hr",
|
|
"table | bullist numlist | undo redo | removeformat | emoticons charmap | forecolor backcolor | code visualaid help"
|
|
],
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|