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

Commit Graph

Author	SHA1	Message	Date
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>	6 years ago
Owen Leonard	98d9df517c	Bug 21435: Update two-column templates with Bootstrap grid: Tools part 3 This patch modifies several tools 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: - Tools -> MARC modification templates - View and edit templates - Tools -> Batch patron modification - Test each step of the process - Tools -> Overdue notice/status triggers - Tools -> Upload patron images - Test each step of the upload process - Tools -> Quote editor -> Quote uploader - Import quotes 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
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
Pasi Kallinen	8c12ddd88d	Bug 20330: Allow translating more of quote upload Translate the error messages, and the table headers. Test plan: 1) Go to Home -> Tools -> Quote editor -> Import quotes 2) Upload quotes from a file. Try to trigger the error messages 3) On successful import, check the table header texts 4) Apply patch, update & install a language 5) The error messages and the table header texts should show up in the xx-YY-staff-prog.po 6) Repeat 1,2,3 Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi> Signed-off-by: Mark Tompsett <mtompset@hotmail.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
Owen Leonard	a6abaca8d0	Bug 19653: Move tools templates JavaScript to the footer: Additional tools This patch modifies the staff client "Additional tools" templates so that JavaScript is included in the footer instead of the header: - Calendar - CSV profiles - Log viewer - News - Task scheduler - Edit quotes for QOTD feature - Upload Note that the log viewer template has been modified so that the "interface" variable (passed to the template to provide the correct path to staff client assets) isn't overwritten by an "interface" variable required by the log viewer. To test, apply the patch and test the JavaScript-driven features of each modified template: All button controls, DataTables functionality, form validation, etc. Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>	7 years ago
Owen Leonard	90a1d98e06	Bug 16513 - Improvements and fixes for quote upload process This patch fixes some minor bugs and adds a small enhancement to the quotes editor and quotes upload pages. To test, apply the patch and go to Tools -> Quote editor - In the table of quotes, clicking the "ID" table header should trigger an alert, "Click on the quote's ide to select..." - Go to "Import quotes" and select a file to upload. - On the upload preview page you should see a new "Cancel import" button. Clicking it should return you to the quotes upload page after asking for confirmation. - Test the upload cancel button: - If you have fast reflexes or are uploading a file large enough, you should be able to see a "Cancel upload" button during the upload process. - Clicking this button should cancel the upload and return you to the quote upload page. Tested on top of Bug 16589, 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: Kyle M Hall <kyle@bywatersolutions.com>	8 years ago
Marc Véron	8631ebaf9f	Bug 16589 - Quote of the day: Fix upload with csv files associated to LibreOffice Calc To reproduce: - Install LibreOffice and make sure that csv files are associated to Calc (Note: tested with Firefox 46.0.1 on Windows 8) - Go to Home > Tools > Quote editor > Quote uploader - Try to upload a valid CSV (e.g. Example from Bug 15684) Result: File can not be uploaded (Incorrect filetype: application/vnd.sun.xml.calc) To test: - Apply patch - Try to upload again Expected result: Quotes are imported. Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Can't reproduce on a Mac but get it fails on a Windows Box: fixed with this patch. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Can't recreate on debian but the fix looks safe. 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
Owen Leonard	54214c4016	Bug 16033 - Quotes upload preview broken for 973 days A missing snippet of DataTable configuration means that when you upload a CSV of quotes to the Quotes of the Day feature the table previewing your import is not visible. This patch corrects it. To test, apply the patch and go to Tools -> Quote editor -> Import quotes. - Upload a CSV file containing data in two columns, "source","text" - When your upload completes you should see a DataTable previewing the data from your CSV. - Check that deletion of individual quotes works from the preview. - Check that quotes are correctly imported. - Ponder the long 2.66 years during which this page was broken. Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Quote of the day: Serenity of mind comes with patience. Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>	8 years ago
Marc Véron	59fc325310	Bug 15684: Fix encoding issues with quote upload To verify: - Download attachment 'Goethe with umlaut' from Bug 15684 - Go to Tools > Quote Editor - Click "Import quotes" and select the file - The quotes display in a table. Click 'Sav quotes' - Result: Nothing happens To test: - Apply patch - Repeat steps above - Verify that you get a message '2 quotes saved' and that the quotes are added in to the quotes table - Test with attachment 'sample quotes' as well Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com	8 years ago
Pasi Kallinen	9e9088049c	Bug 12138 - Use placeholders in translatable Javascript strings Currently translating Javascript strings with variables in them is hard, because the strings are created from separate parts. For example: _("Are you sure you want to delete the") + " " + count + " " + _("attached items?") This is translated in two different parts, and the translator cannot affect the place where the count-variable is. Now, if the javascript strings allowed placeholders, similar to how the template strings do, the above could be written as: _("Are you sure you want to delete the %s attached items?").format(count) This would make translation much easier. Attached patch adds a Javascript string formatter, and changes all the concatenated translatable JS strings used in intranet to use that. To test: 1) cd misc/translator 2) perl translate update xx-YY 3) grep ^msgid po/xx-YY-i-staff-t-prog-v-3006000.po \| sort \| uniq > xx-YY-pre 4) apply patch 5) perl translate update xx-YY 6) grep ^msgid po/xx-YY-i-staff-t-prog-v-3006000.po \| sort \| uniq > xx-YY-post 7) compare the files: diff -Nurd xx-YY-pre xx-yy-post \| less should show the javascript strings that changed. 8) Test the UIs where the formatted js strings are used. Signed-off-by: Owen Leonard <oleonard@myacpl.org> I tested most of the changed files. There were some instances where it wasn't clear to me how to trigger the warnings which were modified, especially tags/review.tt, admin/manage-marc-import.tt, and holidays.tt. Everything I was able to test worked correctly. Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works nicely, no regressions found. Thx! Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	1cea3ee584	Bug 12119 - Move jeditable jQuery plugin outside of language-specific directory outside of language-specific directory This patch moves the jeditable jQuery plugin to intranet-tmpl/prog/lib/jquery/plugins so that it will not be duplicated for each set of translated templates. To test, apply the patch and confirm that editing quotes works correctly in the Quote of the Day manager. Works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	7d05394ff2	Bug 11740 - Use new DataTables include in quotes upload template Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to the quotes upload page. To test you need a CSV file of quotes to upload ( "source","text" ). Go to Tools -> Quote editor and click the "Import quotes" button. Upload the CSV file and confirm that the table which previews the import results loads correctly. Sorting is not enabled, but pagination and searching should work. Signed-off-by: Mark Tompsett <mtompset@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> No regression found. Signed-off-by: Galen Charlton <gmc@esilibrary.com>	10 years ago
Owen Leonard	f2da479668	Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap This patch converts the toolbar include file used by the quotes editor to Bootstrap, replacing YUI button and menu code with Bootstrap markup. To test, view any page in the quotes editor. Buttons and menus should look correct and work correctly. Test save, delete, and upload buttons on the summary page, and save and delete buttons on the upload page. Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Comment: All buttons work. Tested add, delete and upload. You are using icon-remove and not icon-remove-circle, which I prefer but is different of Bug 9627. Question: "Import quotes" takes you to "Quotes uploader", would not it be more consistent to use "Upload quotes" or "Quotes importer"? Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works nicely, no problems found. I think the difference to 9627 is, that this really deletes quotes, while the icon-remove-circle is used for closing subscriptions. Closed subscriptions remain in the system, it's just a way to indicate that there will be no new issues. There is a separate option to really delete subscriptions. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	11 years ago
Fridolyn SOMERS	714075d5c1	Bug 8942: Translation process breaks javascript Signed-off-by: Owen Leonard <oleonard@myacpl.org> I tested most scripts affected by this patch and visually verified all changes. Functionality is unaffected. Signed-off-by: Mason James <mtj@kohaaloha.com> Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>	12 years ago
Chris Nighswonger	02a8557a3e	Bug 7977: Improving upload result message display Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mason James <mtj@kohaaloha.com>	12 years ago
Chris Nighswonger	d78641e7c0	Bug 7977: Followup patch addressing items pointed out by Jonathan Druart Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mason James <mtj@kohaaloha.com>	12 years ago
Chris Nighswonger	a459da2c13	Bug 7977: Further UI work on the QOTD editor This patch implements more of oleonard's suggestions as well as other improvments: --Adds instructions for using the QOTD editor --Moves inline css to quotes.css, etc. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mason James <mtj@kohaaloha.com>	12 years ago
Chris Nighswonger	0a9f8f86aa	Bug 7977: Further UI work on the QOTD uploader This patch addresses another of oleonard's points as well as some general cleanup: --Adds instructions to each stage of the uploader --Consolidates quote tool css into quotes.css Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mason James <mtj@kohaaloha.com>	12 years ago
Chris Nighswonger	12cb095bac	Bug 7977: QOTD uploader to enable uploading csv files containing quotes This series will add a DataTable's based upload/editor with which to upload csv files containing quotes to be used by the QOTD feature. The file should be formatted thusly: "source","text-of-quote" "source","text-of-quote" ... Note: This work serves as a good example of potential improvements in all other "editor" and file upload areas of Koha. This patch is a squash of the following work: --Adding code to parse CSV file contents and push it into a DataTable --Adding in jEditable to enable table editing --Adding ajax to post data back to the server to be saved --Fixing edit and adding delete functionality --Adding some missing css as well as server feedback on save --Fixing a bug which limited the number of quotes which could be uploaded --Also fixing a minor bug with fnCSVToArray and doing some style cleanup. --Adding sanity checks to verify file type and size --Implements YUI button widget/toolbar --Improved handling of hiding uploader UI --Adds row selectability --Adds multi-delete capability --Adds YUI button/toolbar widget --Fixing capitalization in quote uploader --Implements improvments suggested by jcamins and oleonard Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Mason James <mtj@kohaaloha.com>	12 years ago

22 Commits (2b1da2aa0ced03f8afe56c4624ec77d49e5000a2)