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

Commit Graph

Author	SHA1	Message	Date
Owen Leonard	a3e722c705	Bug 21449: Update two-column templates with Bootstrap grid: Circulation part 2 This patch modifies several circulation 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. For each page, test with the CircSidebar preference both on and off. - Catalog -> Search -> Details -> Items -> View item's checkout history - Circulation -> Overdues with fines - Circulation -> Transfer - Circulation -> Patron -> Batch checkout - Circulation -> Built-in offline circulation interface - Synchronize - Pending offline circulation actions - Check out - Check in Signed-off-by: Maryse Simard <maryse.simard@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	5d49ea039c	Bug 22007: Remove html filters when KohaDates called with a parameter Bug 13618 took care of the KohaDates output but not if it is called with a parameter (eg. [% var \| $KohaDates with_hours => 1 %]). We could avoid unnecessary processing by removing the extra html filter. Patch generated with the following command: % perl -p -i -e 's/KohaDates([^%\\|])\s?\\|\s?html\s?/KohaDates $1/g' /.inc */.tt Signed-off-by: Owen Leonard <oleonard@myacpl.org> 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
Jonathan Druart	ff21352a4a	Bug 20661: Shortcut circ scripts if a blocking error appeared Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> No test plan found ;) But tested bookcount and request-article. Signed-off-by: Nick Clemens <nick@bywatersolutions.com>	6 years ago
Owen Leonard	44e7d5e84b	Bug 19700: Move template JavaScript to the footer: Some circulation pages This patch modifies some staff client circulation 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 the modified templates: All button controls, DataTables functionality, tabs, etc. - Article requests (enable ArticleRequests system preference, have at least one outstanding article request) - Request article (Bibliographic detail page -> Request article). - Item circulation statistics (Bibliographic detail page -> Items -> View item's checkout history). - On-site checkouts (enable OnSiteCheckouts system preference; Check out some items as on-site checkouts; Go to Circulation -> Pending on-site checkouts - Overdues report (Circulation -> Overdues). - Holds to pull (Circulation -> Holds to pull). - Renew - Holds ratios (Circulation -> Holds ratios). - Check in - Transfers to receive (Circulation -> Transfers to receive). - Holds queue (Circulation -> Holds queue). - Holds awaiting pickup (Circulation -> Holds awaiting pickup). 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
Jonathan Druart	df97814f30	Bug 15758: Koha::Libraries - Remove GetBranches Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Jonathan Druart	9b9803b69c	Bug 15758: Koha::Libraries - Remove GetBranchesLoop Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Owen Leonard	255c0af989	Bug 15927 - Remove use of <tr class="highlight"> for alternating row colors The "highlight" class on table rows is unnecessary since we have a CSS rule which defines colors for alternating row colors. This patch removes use of the "highlight" class from templates and removes the definition from staff-global.css To test, view the affected pages and confirm that the change has not broken anything. Acquisitions -> Vendor -> View basket Acquisitions -> Late orders Acquisitions -> Ordered Acquisitions -> Vendor -> Receive shipment Acquisitions -> Spent Acquisitions -> Vendor details -> Contracts table Administration -> MARC frameworks (comment removed only) Administration -> Class sources Authorities -> Authority search results Catalog -> Bibliographic detail page -> Items -> View item's checkout history Catalog -> subject.tt (is this template used?) Cataloging -> Cataloging search results Patrons -> Patron account Reports -> Patrons who haven't checked out Reports -> Statistics wizards -> Patrons Reports -> Top lists -> Most-circulated items Reports -> Inactive -> Items with no checkouts Reports -> Reports dictionary Reports -> Statistics wizards -> Circulation Reports -> Statistics wizards -> Holds Holds -> Place a hold -> Existing holds table Serials -> New subscription -> Search for a vendor -> Search results Serials -> Check expiration Serials -> Subscription -> Serial collection Serials -> Subscription -> Serial collection -> Edit serials Suggestions Tags -> View tags -> View titles with a tag Tools -> Manage staged MARC records -> Batch (I think the affected section of this template is obsolete) Tools -> Log viewer -> Log result Lists -> View lists (May be broken by Bug 15916) Note that if you search the templates for instances of a <tr> with a "highlight" class you'll find two instances in slip templates which refer to a class defined in printreceiptinvoice.css. Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Looks good. Haven't seen any regression. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Brendan A Gallagher <brendan@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
Jonathan Druart	56ede58a86	Bug 14890: Simplify processing to display a date with hours The KohaDates plugin does that, it's not necessary to split the output. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Marc Véron	790ef7052b	Bug 14890: Remove C4::Dates from circ/bookcount.pl This patch removes deprecated C4::Dates from circ/bookcount.pl To test: - Search for biblio with an item that has been checked out several times and that has been transferred - In left navigation click on 'Items' - In list of items click on 'View item's checkout history' - Verify that dates in 'Date arrived at current library' and in column 'Last seen' display properly. Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> Works as advertised Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>	9 years ago
Jonathan Druart	166720982e	Bug 11616: remove jQuery tablesorter plugin DataTables has replaced the tablesorter plugin for client-side sorting of tables in Koha. There is no table using this plugin, so this patch removes it and remaining references to it. REVISED TEST PLAN ----------------- 1) Apply the patch 2) Home -> Koha administration -> Authorized values 3) Change the 'Show category:' drop down value, and play with the sorting of columns. -- should sort as expected. 4) Search the catalogue -> look for a biblio with high circulation 5) Click one of the name links. 6) Click the Items tab on the left. 7) Scroll down and click the (View item's checkout history) link in the History area. -- There was no sorting prior to the patch, so afterwards it should display the same. 8) git grep -i tablesorter -- Only a reference in staff-global.css and release texts. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	533c9bc657	Bug 9140 - Untranslatable strings in item circulation history This patch removes the text of a message from the script to the template. The lastmove sub now returns either the date or 0, and the template displays the "no transfers" message if the date doesn't exist. To test, view the circulation history for items which do and do not have a transfer history. A date should be displayed for items which have a transfer history. A messages should be displayed for those which do not. This patch also adds a <span> around the text "Never" which was not getting picked up by the translation script. To test this change, run "perl translate update <lang>" from misc/translator, then check if the string shows up in the po file. (Thanks kf!) Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	12 years ago
Owen Leonard	00a13c5725	Bug 2780 - Capitalize strings consistently (Circulation) Correcting capitalization in Circulation templates Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>	12 years ago
Katrin Fischer	9ab692693e	Bug 7760 - Add ids and classes to every staff page to help with customizaton (circulation) New id: circ_<filename> New class: circ Signed-off-by: Owen Leonard <oleonard@myacpl.org>	12 years ago
Ian Walls	8996faae15	Bug 6512: time missing from item circulation history Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but the value was never actually called into the template. This patch also moves the time to the right side of the date, and removes the ??:?? default, because otherwise, it's just silly Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>	13 years ago
Ian Walls	fbfb68a444	Bug 6512: time missing from item circulation history Re-enables the display of the seentime in circ/bookcount.tt; a DEFAULT was set, but the value was never actually called into the template. This patch also moves the time to the right side of the date, and removes the ??:?? default, because otherwise, it's just silly Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>	13 years ago
Chris Cormack	5884fb1000	Bug 5917 : Swapping templates over	13 years ago
Chris Cormack	77b6409802	Bug 5917 : Converted templates	13 years ago

18 Commits (3b273de5777ac7dd5bebac629dc8c88e6bdc962a)