Koha-community/Koha - Koha - Koha: The world's first free and open source library system

Commit Graph

Author	SHA1	Message	Date
Owen Leonard	58bec27564	Bug 25282: Correct Bootstrap dropdown button markup Incorrect markup surrounding Bootstrap dropdown buttons causes display problems with the buttons are in a DataTable. Dropdown wrapper <div>s must have a "btn-group" class. To reproduce the problem, look at the MARC bibliographic frameworks page. The "Actions" menu when triggered will not line up with the button. In almost all cases, dropdown buttons inside tables should also have the "dropup" class on their wrapper so that the menu appears above the button. This prevents the menu from disappearing off the bottom of the window when the button is positioned low in the viewport. To test, apply the patch and test the button menus in tables on the following pages: - Acquisitions -> Invoices - Acquisitions -> Add to order -> From external source -> Results - Acquisitions -> Suggestions - Administration -> Budgets - Administration -> Funds - Administration -> Authority types - Administration -> Authority types -> MARC structure - Administration -> MARC bibliographic frameworks - Administration -> MARC bibliographic frameworks -> MARC structure - Administration -> OAI sets configuration - Administration -> Z39.50/SRU servers - Authorities -> Authority search results - Authorities -> New from Z39.50/SRU -> Search results - Cataloging -> Edit items - Cataloging -> New from Z39.50/SRU -> Search results - Circulation -> Article requests - Reports -> Saved reports - Tools -> Patron lists - Tools -> Rotating collections - Serials -> Serials search results Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	4 years ago
Katrin Fischer	d610ac8743	Bug 11297: (QA follow-up) Make table headings match other pages The patch set adds a table hading for the Actions column on the summary page. If you compare with other pages, this should be labelled 'Actions' instead of 'Options'. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	4 years ago
Katrin Fischer	4174d44218	Bug 11297: (follow-up) Add html filter to new input field Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	6 years ago
Charles Farmer	bd141a442e	Bug 11297: Add support for custom PQF attributes for Z39.50 server searches. Adds the "Attributes" field to z3950 servers. The feature here is not quite de same. In the old patches, the attributes were applied to individual query parts if the part already contains "@attr" and the additionnal attribute is not already in the query part. Here, the content of the new field is prepended to all PQF queries sent to the server. This new way of doing is simpler and works for the sponsor. Test plan: I) Apply the patch II) Run updatedatabase.pl 1) Add a new z3950 server with the following parameters: Hostname : catalogue.banq.qc.ca Port : 210 Database : IRIS Syntax : Marc21 2) Perform a z3950 search on that server. Keyword (Any) : egypt 2.1) Nothing Found. 3) Add attributes on the server administration page @attr 4=1 4) Perform the same z3950 search 4.1) A lot of results Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	6 years ago
Owen Leonard	247dca3064	Bug 23013: Upgrade DataTables in the staff client This patch upgrades DataTables and makes some style changes to the default DataTables toolbar style. DataTables assets are now combined and minified using their download customizer, bundling together these elements: - JSZip 2.5.0 - pdfmake 0.1.36 - DataTables 1.10.18 - Buttons 1.5.6 - Column visibility 1.5.6 - HTML5 export 1.5.6 - Print view 1.5.6 - FixedHeader 3.1.4 DataTables assets have been moved from lib/jquery/plugins to lib/datatables. The global header and footer include files are updated correspondingly. This patch removes the custom "four_button" pagination configuration and updates pages which used it to use the built-in "full" type instead. This is done for the sake of consistency and upgradability. This change touches a lot of files. Table-specific CSS has been moved from staff-global.scss to a new include, _tables.scss. A second common include, _mixins.scss has some variable definitions used in both files. Many images have been made obsolete by this change and have been removed. To test, apply the patch and regenerate the staff client CSS. View various pages in the staff client with tables: - Not formatted by DataTables: - Reports -> Most circulated items - Catalog -> Search results - Formatted by DataTables without column configuration - Acquisitions -> Vendor search - Lists - Formatted by DataTables with column configuration - Administration -> Libraries - Administration -> Item types - Reports -> Saved SQL reports - Non-standard DataTables configurations: - Circulation -> Checkouts - Administration -> System preferences - Reports -> Lost items Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>	5 years ago
Owen Leonard	a344b8cf8c	Bug 22023: Further improve responsive layout handling of staff client menu bar This patch makes a number of changes in order to improve the way the staff client's header menu adjusts at narrower browser widths: - Updated version of Bootstrap 3.3.7 which includes the "collapse" JavaScript plugin. - Modified default Bootstrap CSS using Bootstrap's customization tool. These changes facilitate the removal of some custom CSS (overriding Bootstrap) from staff-global.scss. - Added Bootstrap config file for loading customizations at https://getbootstrap.com/docs/3.3/customize/ - Revised button classes for buttons in Bootstrap-styled toolbars. The modified default CSS resets the base font size in Bootstrap to better match our global CSS. A side-effect of this is that toolbar buttons ended up looking smaller than they should. Changing the button class solves this. - Restructure the header menu in order to allow different rules to govern the appearance of the navigational part of the menu (Circulation, Search, etc) and the user menu (Set library, My account, Log out). - Modify the cart JS to so that the popup works well at narrow widths. To test, apply the patch, regenerate the staff client CSS, and clear your browser cache. - Log in to the staff client and observe the layout of the header menu as you adjust the browser to various widths. - Confirm that sections of the menu "collapse" as the window gets narrower. - Confirm that dropdown menus behave correctly and that links work. - Confirm that the Cart link works as expected when the cart empty and when it has items. - Install and enable multiple translations, including at least one set of sub-languages (e.g. fr-FR and fr-CA). - Test the appearance of the language menus in the footer at various browser widths. - View pages with button toolbars and confirm that they appear unchanged (e.g. biblio detail page, patron detail page). NOTE: While this patch is intended to make improvements to staff client responsiveness, it does so within a limited scope. There are still many pages which do not work well at narrower browser widths. Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	5 years ago
Owen Leonard	6c7c97f67c	Bug 22015: Move DataTables CSS to global include DataTables are used on enough pages in the staff client that it doesn't make sense to put inclusion of the CSS into each template where it is needed. This patch moves includes of datatables.css from individual templates into the global header file. To test, apply the patch and view various pages which have DataTables. View various styles of DataTables, e.g. - Full pagination, like item search results - Four-button, like Saved SQL reports Everything should look the same as it was. Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos@inLibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	5 years ago
Jonathan Druart	5825026448	Bug 21526: uri escape TT variables when used in 'a href' This patch has been generated with the script provided on bug 21576. It only affects variable used in the href attribute of a link when href it the first attribute of the node (grep "a href") Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Owen Leonard	b8c1198a79	Bug 20742: Update two-column templates with Bootstrap grid: Administration part 6 This patch modifies several administration templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from <script> tags and "text/css" attributes from <style> tags in the modified templates. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Administration -> MARC frameworks -> MARC structure -> Subfields - View and edit subfields - Administration -> Record matching rules - View and edit record matching rules - Administration -> OAI sets configuration - View and edit OAI sets - Define mappings for an OAI set - Administration -> Patron attribute types - View and edit patron attribute types - Administration -> System preferences - Administration -> Z39.50/SRU servers - View and edit servers Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Jonathan Druart	dcd1f5d48c	Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	9 years ago
Katrin Fischer	039d10044c	Bug 21151: Fix SRU search fields mapping pop-up The SRU search fields mapping pop-up comes up as a blank white page. To test: - Go to Administration > Z39.50/SRU servers - Modify or create an SRU server - Click on the 'Modify' button to change mappings - Verify the new window that opens is blank - Apply patch - Verify the pop-up now is no longer blank but works correctly. Bonus: Spottd some HTML errors while looking for the problem. Also fixed in the patch. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Matthias Meusburger	7baa452a6a	Bug 19436: Add SRU support for authorities Test plan: - Apply the patch - Add an SRU authority server in admininistration -> Z39.50/SRU servers You can try with the French national library, configured as such: Hostname: catalogue.bnf.fr Port: 80 Database: api/SRU Syntax: Unimarc Record type: authority Additional SRU options: version=1.2,sru=get SRU Search fields mapping example: Keyword (any): aut.anywhere Name (any): aut.anywhere Author (any): (aut.type any "pep org") and aut.accesspoint Author (personal): aut.type=pep and aut.accesspoint Author (corporate): aut.type=org and aut.accesspoint Author (meeting/conference): aut.type=org and aut.accesspoint Subject heading: (aut.type any "geo ram_nc ram_ge ram_pe ram_co") and aut.accesspoint Subject sub-division: aut.type=ram_pe and aut.accesspoint Title (any): (aut.type any "tic tut tum ram_tp ram_tu") and aut.accesspoint Title (uniform):(aut.type any "tut tum ram_tu") and aut.accesspoint - Try a search from Authorities -> New from Z39.50/SRU - Check that the authority is correctly displayed in "Show Marc" - Check that the authority is correclty added to koha in "Import" - prove t/db_dependent/Breeding.t Signed-off-by: François Pichenot <fpichenot@ville-roubaix.fr> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Julian Maurice	ed7543287b	Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere Having to write [% KOHA_VERSION %] for each url is bad because: - It's easily forgettable when adding new <script> or <link> - It prevents grep'ing for the full filename - It violates the DRY principle - If at some point we want to change the "force js and css reload" mechanism, it will be tedious This patch: - adds a Template::Toolkit plugin that generates <script> and <link> tags for JS and CSS files, and inserts automatically the Koha version in the filename - use the new plugin to remove all occurences of [% KOHA_VERSION %] - remove the code that was adding KOHA_VERSION as a template variable Test plan: 1. Apply patch 2. Go to several different pages in Koha (opac and intranet) while checking your browser's dev tools (there should be no 404 for JS and CSS files, and the Koha version should appear in filenames) and the server logs (there should be no "File not found") 3. `git grep KOHA_VERSION` should return nothing 4. prove t/db_dependent/Koha/Template/Plugin/Asset.t Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Jonathan Druart	0ad922011c	Bug 12904: Force browser to load new javascript files after upgrade This patch has been automatically generated using: perl kv.pl */.tt */.inc Signed-off-by: Josef Moravec <josef.moravec@gmail.com>	6 years ago
Grace Smyth	10c3dc1a25	Bug 19986: 'Server name' doesn't appear as required Test plan: [1.] Go to Admin -> z39.50/SRU servers [2.] Make a new z39.50 server [3.] Fill in the required field (hostname, port, database) [4.] Save the server [5.] Notice that the form does not submit, tells you that Sever name is required [6.] Repeat steps 2 - 5 but this time make a new SRU server [6.] Upload the patch and repeat steps 1 - 3 (make a new z39.50 server and a new SRRU server) [7.] See that now 'Server name:' is red and on the right side of the box there is a required note [8.] Save both servers and it should have created a new z39.50 server and a new SRU server Signed-off-by: Roch D'Amour <roch.damour@inlibro.com> Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	6 years ago
Owen Leonard	1e40274411	Bug 19601: Move admin templates JavaScript to the footer: Additional parameters This patch modifies the staff client "additional parameters" administration templates so that JavaScript is included in the footer instead of the header. To test, apply the patch and test the JavaScript-driven features of each page: All button controls, DataTables functionality, tabs, etc. Signed-off-by: Simon Pouchol <simon.pouchol@biblibre.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Amit Gupta	46b0b0a75b	Bug 19034: XSS Flaws in Z39.50/SRU servers administration 1. Hit /cgi-bin/koha/admin/z3950servers.pl 2. Enter <IFRAME SRC="javascript:alert('XSS');"></IFRAME> search Z39.50/SRU servers box. 3. Notice the iframe is executed. 4. Apply patch. 5. Reload page, and enter iframe again on search Z39.50/SRU servers box. 6. Notice it is no longer executed. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Josef Moravec	804677265e	Bug 16239: Update templates Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Owen Leonard	ed449a5b5b	Bug 16005 - Standardize use of icons for delete and cancel operations This patch makes changes to Font Awesome icons in order to make icon choice consistent for common actions. <i class="fa fa-trash"></i> where something is deleted, removed, or emptied. <i class="fa fa-remove"></i> where an operation is cancelled (also where selections are cancelled, as in checkboxes). <i class="fa fa-times-circle"></i> for "close," as in baskets and windows. To test, apply the patch and view the following pages to confirm that the correct icon is used: - Acquisitions -> Vendor -> Vendor delete button. - Acquisitions -> Vendor -> Edit -> Delete contact button. - Acquisitions -> Invoices -> Delete menu item. - Cataloging -> Edit record -> Authority search pop-up (triggered from the tag editor for a tag linked to an authority) -> Clear field button - Authorities -> Authority detail -> Delete button. - Tools -> Quotes editor -> Quotes delete button. - Reports -> View saved report -> Delete button. - Reports -> Saved reports -> Delete menu item. - Serials -> Subscription details -> Subscription close button. - Administration -> Budgets -> Delete menu item. - Administration -> Item search fields -> Delete button. - Administration -> Z39.50/SRU servers -> Delete menu item. - Catalog -> Advanced search -> Clear fields link. - Cataloging -> Advanced editor -> Macros -> Delete macro button. - Circulation -> Checkout -> Check out an item which is on hold for another patron. "Cancel checkout and place hold" button now uses the icon used elsewhere for holds. - Course reserves -> Course -> Delete course button. - Patrons -> Patron lists -> Add patrons -> Remove selected button. - Acquisitions -> Suggestions -> Suggestion details -> Delete button. - Lists -> List contents -> Remove selected button. Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>	8 years ago
Owen Leonard	10694092dd	Bug 16308 - Remove the use of "onclick" from Z39.50/SRU servers template This patch removes the use of event attributes in the markup in favor of attaching events in JavaScript. This patch also revises the SRU search fields mapping template considerably while correcting multiple HTML validation issues: - Corrected label/id pairs. - Corrected incorrect capitalization. - Removed redundant <legend> - Restructured form so that it displays in two columns. Also changed in the z3950 servers template: Replaced empty [% script_name %] variable with actual path. To test, apply the patch and go to Administration -> Z39.50/SRU servers/ - In the list of servers, select Actions -> Delete. You should be prompted to confirm your choice. Test both confirming and cancelling. - Create or edit an SRU server. - After entering text in the server name field, moving to the next field should trigger transformation of that text to upper case. - On the SRU Search fields mapping line, clicking the "Modify" button should trigger a popup. - In the "Modify SRU search fields mapping" popup: - The fields should display in two columns. - All labels should be correctly associated with corresponding inputs. Followed test plan, works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Owen Leonard	6381d1853d	Bug 16241 - Move staff client CSS out of language directory The staff client CSS is not language-specific, so it can be moved out of the en/ directory and thus not be duplicated for every translation. In order to be able to have a generic path to the YUI CSS files, the YUI directory is moved by this patch to the staff client's lib/ directory. To test, apply the patch and visit various pages in the staff client. Look in particular at pages which include more than the standard CSS. For example: - The staff client login page. - The staff client home page. - Patron -> Set permissions. - The advanced cataloging editor. - Acquisitions -> Vendor -> Basket groups. - Tools -> News -> Edit news. - Administration -> System preferences. Revised: I intended for this to be built on top of Bug 15883. Now it is. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> On top of 15883 Works as described, all pages on test plan No Errors Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Kyle Hall	a8942c2884	Revert bug 13618 - "Prevent XSS in the Staff Client and the OPAC" due to performance issues Revert "DBRev to make notes of the XSS patches and the new important dependency." This reverts commit `e140603a59`. Revert "Bug 13618: Specific for branches.opac_info" This reverts commit `06e4a50f00`. Revert "Bug 13618: (follow-up) Specific for other prefs" This reverts commit `d6475a111f`. Revert "Bug 13618: Fix for debarredcomment and patron messages" This reverts commit `dd98c9df92`. Revert "Bug 13618: Do not display html tags in patron's notices" This reverts commit `a065b243fe`. Revert "Bug 13618: Do not display   and html tags in item fields content" This reverts commit `baeeaffbf8`. Revert "Bug 13618: Fix for system preference description" This reverts commit `a967a09261`. Revert "Bug 13618: Remove html filters for newly pushed code" This reverts commit `0e98662b10`. Revert "Bug 13618: (follow-up) add missing lines for opac-shelves" This reverts commit `fc2fb605e5`. Revert "Bug 13618: (follow-up) Specific for ColumnsSettings" This reverts commit `bc308fdd9c`. Revert "Bug 13618: Fix for edit biblios and items" This reverts commit `811c4e8402`. Revert "Bug 13618: followup to remove tabs" This reverts commit `ca8e8c397c`. Revert "Bug 13618: Fix last occurrences recently introduced to master" This reverts commit `bb417b256b`. Revert "Bug 13618: Fix for news" This reverts commit `ae5b98020a`. Revert "Bug 13618: Fix escape on sending baskets or shelves by email" This reverts commit `a7731ffe25`. Revert "Bug 13618: Specific for XSLTBloc" This reverts commit `11fa38dc29`. Revert "Bug 13618: Specific for Salutation on editing a patron" This reverts commit `36c07ad6d3`. Revert "Bug 13618: Specific for other prefs" This reverts commit `e6ea281a3b`. Revert "Bug 13618 - memberentrygen.tt errors Not a GLOB reference" This reverts commit `7824874557`. Revert "Bug 13618: Specific for ColumnsSettings" This reverts commit `1834da3da3`. Revert "Bug 13618: Specific for IntranetUser* and OPACUser* prefs" This reverts commit `21ae62b253`. Revert "Bug 13618: Fix error 'Not a GLOB reference'" This reverts commit `602bdbab4c`. Revert "Bug 13618: Specific for the ISBD view" This reverts commit `d254362435`. Revert "Bug 13618: Specific for pagination_bar" This reverts commit `8837a8ae68`. Revert "Bug 13618: Specific places where we don't need to escape variables - intra" This reverts commit `00eff140b3`. Revert "Bug 13618: Remove html filters at the intranet" This reverts commit `7db851ff03`. Revert "Bug 13618: Specific places where we don't need to escape variables" This reverts commit `49a3738b8d`. Revert "Bug 13618: Remove html filters at the OPAC" This reverts commit `cedaa0e23e`. Revert "Bug 13618: Use Template::Stash::AutoEscaping to use the html filter" This reverts commit `01b38d3b13`. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Jonathan Druart	7db851ff03	Bug 13618: Remove html filters at the intranet Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com> Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	9 years ago
Kyle Hall	f98225c7c2	Bug 15298 [QA Followup] - Fix whitespace issues Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Chloe	142c47fcf4	Bug 15298 - z39.50 admin setup, options column suggested changes To Test- 1-first look at the orginal Z39.50/SRU servers administration page (/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=6) 2-apply patch 3-now see the new styling of the "action" drop down tab like the one on the saved reports page 4-check that each link works (for delete i reccommend copying one then deleting the copy) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Kyle Hall	0cab6f2ef3	Bug 14915: Use Font Awesome instead of Glyphicons for the staff intranet We should be using Font Awesome for our icons instead of Glyphicons, for the reasons discussed on bug 13696. Test Plan: 1) Apply this patch 2) Note all Glyphicons have been replaced with FA icons in the staff intranet 3) git grep "icon-" ./koha-tmpl/intranet-tmpl/prog/en/modules/ should give no results 4) git grep "icon-" ./koha-tmpl/intranet-tmpl/prog/en/includes/ should give no results Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> We need a follow-up to cover the files changes since this patch was written. Especially to cover the changes in the label creator modules. Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Marcel de Rooy	ba25273108	Bug 12823: Alert about defining the SRU search field mappings This is a follow-up for report 6536 (SRU search targets). It will alert a user that saves a SRU server without field mappings. Test plan: Add a Z39.50 server. No confirm message. Add a SRU server without field mappings. Cancel the confirm. Add one field mapping. No confirm message. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Marcel de Rooy	104fc792f5	Bug 12823: Add some hints for Host and Database When adding or editing a SRU server, this patch adds a hint, positioned under the Hostname field. It also moves similar information for SRU options and XSLT into hints. Test plan: Add/Edit SRU server. Look at Hostname, SRU options and XSLT. Add/Edit Z39.50 server. No hints for Hostname and SRU options. Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Tomás Cohen Arazi	ae4e7e2800	Bug 6681: (qa followup) document the existence of the sample files As requestedby people testing the patch, I add references to the new xslt files on the Z39.50/SRU servers help. Example usages are also provided. Test: - Apply the patch - Go to the help page on the 'Z39.50/SRU Servers' page => SUCCESS: Notice there's a section documenting XSLT file(s) usage and provides some examples that cover the introduced files. - Sign off Thanks Tomas Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Frederic Demians <f.demians@tamil.fr> Help page does shed some light to the XSLT usage. Enough to my taste. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Owen Leonard	a46b3b4de0	Bug 2889 - templates should use [% IF ( loop.odd ) %] - Administration Some scripts pass a template variable to facilitate an alternate table row class for styling. Other use the 'IF (loop.odd)' construction. I think we're at the point where the CSS3 :nth-child() selector is widely-supported enough that we can do without template-based solutions: http://caniuse.com/#feat=css-sel3 This patch adds such a selector to the staff client CSS and removes the corresponding template markup from Administration pages. The last in this series of patches will remove the redundant CSS. Also in this patch: a few minor markup corrections. To test, apply the patch and clear your browser cache if necessary. View the following pages and confirm that alternate table row highlighting works as before: - Administration -> Budgets - Acquisitions -> Vendor -> Contracts - Administration -> Budgets -> Budget -> Planning - Administration -> Authority types - Administration -> Authority types -> MARC structure - Administration -> Authority types -> MARC structure -> subfields - Administration -> MARC bibliographic framework - Administration -> MARC bibliographic framework -> MARC structure - Administration -> MARC bibliographic framework -> MARC structure -> Subfields - Administration -> Libraries and groups - Administration -> Cities and towns - Administration -> Classification sources - Administration -> Circulation and fines rules - Administration -> Currencies and exchange rates - Administration -> Item types - Administration -> Koha to MARC mapping - Administration -> System preferences -> Local use - Administration -> Z39.50 client targets Signed-off-by: Nick Clemens <nick@quecheelibrary.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Marc Véron	3996fa7b47	Bug 12882 - Translations: Resolve ambiguity for word "checked" in Z39.50 server administration This patch resolves the ambiguity of the word "Checked" for Z39.50 server administration. To test: Apply patch In staff client, go to Home:Administration:Z39.50/SRU servers Result: Column heading of 6th column should show "Preselected" (instead of "Checked") Edit or create new server for Z39.50 and SRU Result: Checkbox underneath "Password" should have label "Preselected (searched by default):" Click "Help" at top right of screen Result: Wording changed for selecting targets as default. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Marcel de Rooy	91d5a83849	Bug 6536: QA Follow-up for string changes referring to Z39.50 Z39.50 search now includes SRU targets. This patch only touches strings referring to it. No changes in behavior. It replaces Z39.50 with Z39.50/SRU or external. Deletes obsolete template z3950/searchresult.tt: not in use for some time. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Marcel de Rooy	7748facfa5	Bug 6536: SRU servers administration This patch makes adjustments in admin/z3950servers in order to insert, edit and delete SRU server records. Test plan: Add, edit, copy and delete SRU server. Check if adding, editing, copying and deleting Z3950 servers still works. Signed-off-by: Giuseppe Angilella <giuseppe.angilella@ct.infn.it> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Bernardo Gonzalez Kriegel	d070c54966	Bug 12621: Z39.50-targets - Record type is untranslatable This patch makes displayed record types translatable To test: 1) Go to Administration > Z39.50 servers 2) On column Record type the value is 'biblio' or 'authority' 3) Apply the patch 4) Reload the page, now record type must show 'Bibliographic' or 'Authority' 5) Update translation file for a language, verify new entries Strings are already on translation file, only a reference for new entry on the file. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works nicely, no problems found. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Owen Leonard	e86387eee2	Bug 12639 - Z39.50 administration page should use "message" dialog for adds and updates This patch changes the style of a couple of message boxes to use the "message" style instead of the "alert" style. This better reflects the type and priority of the messages being displayed. To test, got to Administration -> Z39.50 client targets and edit an existing server. The confirmation message should be the blue "message" type. Test again by adding a new server. The confirmation message for this operation should be of the same blue "message" type. Signed-off-by: Petter Goksoyr Asen <boutrosboutrosboutros@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Small template change, tested ok. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Marcel de Rooy	0bd14c7e8e	Bug 12265: [QA Follow-up] Replace DBIx search by find This patch replaces DBIx search by find at two places in z3950servers.pl. Furthermore, it adds testing on the results of the find method, passing a not-found-message to the template whenever needed. The function ServerSearch is adjusted to use HashRefInflator instead of manually mapping the columns of result objects. An additional defined-test in _form_data_hashref prevents shifting of names and values in the result hash. Test plan: List all servers. Edit, copy and delete a server. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Marcel de Rooy	afb6d14f25	Bug 12265: Improve Z39.50 servers administration This patch makes a few tiny improvements on the form, does some housekeeping/tidying up, and replaces SQL code by DBIC statements. In detail: - Adds an id parameter (more precise than searchfield). - With the move from searchfield to id, you can rename a server now. - A Copy button is added to clone a server. - Confirming a delete is moved to javascript. No additional form anymore. - A message about an insert, update or delete is shown in a div dialog alert above the table instead of a separate form. - Remove offset parameter, Next/Prev button and associated logic. - All SQL statements are replaced by DBIC. - Function StringSearch is renamed to DBICified ServerSearch. - Remove tabs from script and template. Adjust some indentation. Test plan: - Test adding, editing and deleting Z3950 servers. - Test searching for a server with the top search box (not table). - Add a server with quotes in the name. Search for it. Edit or delete. Followed tet plan. Patch behaves as expected. Signed-off-by: Marc Veron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>	10 years ago
Isaac Brodsky	09fa6f0958	Bug 1047: Punctuation in site names no longer breaks Edit/Delete z39.50 server administration The template used to show the Z39.50 server administration page had a bug that caused it to not correctly escape generated query strings. Because the Z39.50 server name is used to lookup the server in order to edit or delete it, when the server name is not passed correctly in the query string, it is impossible to bring up the edit or delete forms (without manually entering the escaped string.) This patch corrects which template is filter used to escape those query strings. To test: (1) Login to intranet, go to Administration -> Z39.50 servers (2) Select "New Z3.50 Server". Enter a server name that contains an ampersand (&), e.g.: "FOO & BAR". Enter other details and submit. Click OK to confirmation message. (3) In the server list, click on the server name, the "Edit" or "Delete" buttons for the server. The correct and full server details should be brought up. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Jonathan Druart	bb96da8ff8	Bug 11605: fallback to default DataTables settings where possible The default entry is 20 and can be apply to all tables. Bug 11555 apply the menu entries to all tables, redefining it is uesless and can be removed. Test plan: Test pages impacted by this patch and verify there is no regression on the tables. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	19bf1e9a40	Bug 11795 - Use validation plugin when creating new Z39.50 server The page for adding a new Z39.50 server includes some custom form validation JavaScript which can be removed in favor of HTML5 validation attributes and Koha's built-in validation plugin. This patch does so. To test, apply the patch and go to Administration -> Z39.50 client targets -> New Z39.50 server. Try submitting the form with any of the following error conditions: - Missing Z39.50 server name - Missing hostname - Missing port - Non-numeric port - Missing database - Non-numeric rank - Non-numeric timeout These errors should trigger a validation warning. Submission of the form with valid data should work correctly. Editing an existing Z39.50 server should also work correctly. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Amended patch: replace tabs with spaces Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	1aeb1d7e0b	Bug 11765 - Remove unused function isDate from templates Several administration templates declare but do not use the JavaScript function isDate(). This patch removes the declarations. To test, apply the patch and search for instances of "isDate" in Koha templates, includes, and JavaScript files. There should be no results. Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> I'm not sure this function has ever been used. This patch removes the toUC in tools/letter.tt too. Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	3c7edd1cbe	Bug 11764 - Move repeatedly redefined function toUC() into staff-global.js toUC() is repeatedly declared on many administration templates. This function, used to transform user input to uppercase, can be added to staff-global.js to prevent repetition. To test, confirm that transformation to uppercase is working on the following Administration pages when text is entered in a form field and focus is moved to the next field: - Authority types -> New: Test the "Authority type" field. - MARC bibliographic framework -> New framework: Test the "Framework code" field. - Patron types and categories -> New category: Test the "Category code" field. - Currencies and exchange rates -> New currency: Test the "Currency" field. - Item types -> New item type: Test the "Item type" field. - Z39.50 client targets -> New Z39.50 server: Test the "Z39.50 server" field. The following pages do not call the toUC function despite the fact that they included it: auth_tag_structure.tt printers.tt roadtype.tt stopwords.tt systempreferences.tt Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> tools/letter.tt declares this js function and don't use it. Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
David Cook	1e0b890b0c	Bug 10096 - Add a Z39.50 interface for authority searching This patch introduces a new Z39.50 interface for searching Z39.50 compliant databases for MARC authority records. These databases aren't as common as their bibliographic equivalents, but they're out there and very useful. I have included info at the bottom of this messsage for sample authority databases you can try. To test this patch: 1) Set up Z39.50 client targets for authority databases. (I've included information at the bottom of this message for LibrariesAustralia's test server for authorities as well as instructions on how to use your Koha's z39.50 authority server as well. The Library of Congress also has authority databases available (unsure if these are test or prod), and you might have access to others through OCLC or RLIN. OCLC provides login credentials for their test databases. 2) Go to the Authorities module 3) Click on the new "Z39.50 search button" 4) Select your authority search targets from the list. 5) Do a search for an authority you would like using either the "Raw" input box or the more specific input boxes for names, subjects, subject sub divisions, or titles. (I like searching Name (personal): Eric on the LibrariesAustralia test DB.) 6) You should see a table listing the server, heading, authority type, and two other columns (MARC and a nameless column). "Authority type" is the type of authority it will become when imported in to Koha. In the Eric example, "PERSO_NAME". 7) Click on "MARC" next to the results of interest to review the MARC authority record. 8) When you're satisfied with a record, click on "Import". 9) The pop-up window will close and your original Koha window will change to the "Adding authority Personal Name" screen (in the Eric example). 10) All the relevant fields should be filled out for the record. Review them and make any changes as necessary. (N.B. The 001 will be cleared when saved, so if you have a use for the imported control number, move it to the 010, 016, or 035 as appropriate. If you have a default value for the 003, this will also likely be overwritten. Move it if necessary. The 005 will also be updated when saved, so do not worry about that.) 11) When you're satisfied, click save. 12) Presto! You've imported your first authority record via Z39.50! -- Here is the info for the LibrariesAustralia test Z39.50 authority database: Z39.50 server: LibrariesAustralia Authorities Hostname: z3950-test.librariesaustralia.nla.gov.au Port: 210 Database: AuthTraining Userid: ANLEZ Password: z39.50 Syntax: MARC21/USMARC Encoding: utf8 - The U.S.A. Library of Congress also provides Z39.50 access to its Name and Subject Authorities (http://www.loc.gov/z3950/lcserver.html). Name Authority: Z39.50 server: Library of Congress Name Authority File Hostname: lx2.loc.gov Port: 210 Database: NAF Syntax: MARC21/USMARC Encoding: utf8 Subject Authority: Z39.50 server: Library of Congress Subject Authority File Hostname: lx2.loc.gov Port: 210 Database: SAF Syntax: MARC21/USMARC Encoding: utf8 (N.B. Both of these databases also include title authorities.) - For testing purposes, you can also set up a Z39.50 client target, which points at your own Koha instance's Z39.50 authority server. To find the hostname, go to /etc/koha-conf.xml and find the value for the <listen id="authorityserver"> element. Depending on your configuration, this could be something like the following: unix:/zebra/koha/var/run/zebradb/authoritysocket (N.B. You might be using a different scheme than unix sockets...) To find the database, scroll down to the bottom of koha-conf.xml until you reach the <config> element. Within this, look for the value of the element <authorityserver>. It should probably be "authorities". To set up this Z39.50 client target in Koha... Z39.50 server: my koha authorities Hostname: unix:/zebra/koha/var/run/zebradb/authoritysocket Port: Database: authorities Userid: Password: Syntax: MARC21/USMARC (or whichever flavour you need) Encoding: utf8 Signed-off-by: Mason James <mtj@kohaaloha.com> Bug 10096 [FOLLOW-UP] - Add a z39.50 interface for authority searching This patch adds the "recordtype" column to the "z3950servers" table. The value in this column (biblio or authority) then controls whether the z3950 server shows up in a bibliographic search (through the Acq and Cataloguing modules) or in an authority search (through the Authorities module). I also edited the z3950 management console to show this value and allow users to edit it. The default value is "biblio", since the vast majority of z3950 targets will be bibliographic. However, there is an option to add/edit a z3950 target as a source of authority records. Test Plan: 1) Apply both patches 2) Run updatedatabase.pl (after setting your KOHA_CONF and PERL5 environmental variables) 3) Use the test plan from the 1st patch N.B. Make sure that your Z39.50 client target has a Record Type of Authority, otherwise it won't display when you're doing a Z3950 search for authorities. Signed-off-by: Mason James <mtj@kohaaloha.com> Bug 10096 [FOLLOW-UP] - fix tabs/whitespace errors to pass QA Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Owen Leonard	bef919d60d	Bug 10651 - Use new DataTables include in administration templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to all administration-related pages which use DataTables. To test, view the following pages and confirm that table sorting is still working correctly: - Administration -> Budgets - Administration -> Authority types -> MARC structure - Administration -> Authorized values - Administration -> Library transfer limits - Administration -> Libraries and groups - Administration -> Patron types and categories - Administration -> Cities and towns - Administration -> Item types - Administration -> MARC bibliographic framework -> MARC structure - Administration -> System preferences - Administration -> System preferences -> Local use - Administration -> Z39.50 client targets Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: Sorting works. No koha-qa errors Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Katrin Fischer	c5cc04ef3d	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@gmail.com> fixes capitalisation, tool stil works Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Owen Leonard	5c60ae40f9	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@gmail.com> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works nicely and all strings are translatable. Signed-off-by: Galen Charlton <gmc@esilibrary.com>	11 years ago
Owen Leonard	379547340c	Bug 9446 [Revised] Use DataTables on Z39.50 servers administration page Replace the tablesorter plugin with the DataTables plugin on the Z39.50 servers administration page. Structural changes were made to deal with a DataTables bug which prevents it from properly parsing a <th> with a colspan. This patch also moves embedding of the toolbar and table-sorting JS from within the body of the page to the <head> for sake of consistency. To test, open the Z39.50 servers administration page (Administration -> Z39.50 client targets). Confirm that table sorting works correctly. Revision corrects template path to datatables assets. Further revision fixes conflict with Bug 9647. Signed-off-by: Frederic Durand <frederic.durand@unilim.fr> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago
Jared Camins-Esakov	301a07d243	Revert "Merge branch 'bug_9446' into 3.12-master" This reverts commit `5b8f7e43fd`, reversing changes made to `af7f49d198`.	11 years ago
Owen Leonard	0e114e7bbc	Bug 9446 [Revised] Use DataTables on Z39.50 servers administration page Replace the tablesorter plugin with the DataTables plugin on the Z39.50 servers administration page. Structural changes were made to deal with a DataTables bug which prevents it from properly parsing a <th> with a colspan. This patch also moves embedding of the toolbar and table-sorting JS from within the body of the page to the <head> for sake of consistency. To test, open the Z39.50 servers administration page (Administration -> Z39.50 client targets). Confirm that table sorting works correctly. Revision corrects template path to datatables assets. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: Table sorting works. No errors. Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Amended patch: Add the aLengthMenu key for DataTables Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago
Owen Leonard	0c8a760a83	Bug 9647 - Replace YUI buttons on Z39.50 servers administration page with Bootstrap This patch converts the toolbar on the Z39.50 administration page to to Bootstrap, replacing YUI button code with Bootstrap markup. To test, view the Z39.50 administration page and confirm that the "New Z39.50 server" button looks correct and works correctly. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: Works and looks very well. No errors. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works nicely, no problems found. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago

1 2

54 Commits (fd8aee927005f27fb10ed8944afbbd318e610dfb)