Commit graph

40 commits

Author SHA1 Message Date
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>
2014-04-27 21:24:04 +00:00
1e69481103 Bug 12107 - Move checkboxes jQuery plugin outside of language-specific directory
This patch moves the checkboxes 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 select all/clear all controls
continue to work on the following pages:

- Acquisitions -> Late orders
- Acquisitions -> Add to order from an external source (search targets)
- Acquisitions -> Suggestions
- Administration -> Funds -> Planning (show/hide all columns)
  * Some unused code has been removed
- Administration -> Library transfer limits
- Staff client cart
- Authorities -> New from Z39.50 (search targets)
- Cataloging -> New from Z39.50 (search targets)
- Circulation -> Check out to a patron (renew/check in selections)
- Circulation -> Offline circulation -> Pending operations
- Patrons -> Patron detail (renew/check in selections)
- Patrons -> Fines -> Pay fines
- Serials -> Subscription -> Serial collection
- Tools -> Label creator -> Batches -> Search results
- Tools -> Patron card creator -> Batches -> Search results
- Tools -> Tags moderation
- Tools -> Batch item deletion
- Tools -> Batch item modification
- Tools -> Inventory -> Submit a batch of barcodes
- Lists -> List contents view

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works as described! I don't think I've ever checked so many boxes
before...

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-04-25 15:12:20 +00:00
b78596311b Bug 12018 - add table sorting to patron card batches
When viewing batches of patrons in the patron card creator module the
table is not sortable. This patch adds table sorting.

The patch also makes some corrections of invalid markup and moves
informational/error messages to the top of the page rather than in a
sidebar. This change lets the table and sorting controls expand into a
wider space.

This patch also corrects a translation issue with table headers
identical to that addressed by Bug 11505.

To test, go to Tools -> Patron card creator -> Manage batches.
View an existing batch or create a new batch and populate it with
patrons. Table sorting controls should work correctly. Batch management
operations should work correctly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-04-03 14:59:30 +00:00
3d8f462cce Bug 9924 - Simplify and rename patron card creator error message include
The patron card creator error message include uses a non-standard method
for displaying error messages, and is poorly-named.

This patch converts the method of displaying error messages for various
patron card creator options to the standard one ('<div class="dialog
alert">') and renames the include file to make it clear that it relates
only to patron card creator operations.

To test, perform various operations:

- Go to 'manage images' and try to upload a file which exceeds the
  500KBfile size limit
- Go to the edit batch page and manually append an error code to the
  URL:  /cgi-bin/koha/patroncards/edit-batch.pl?op=new&error=403
- Go to one of the manage pages and manually append an error code to the
  URL:
  /cgi-bin/koha/patroncards/manage.pl?card_element=profile&error=201

Correct display of an error message indicates that the include file is
being found.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes test plan, test suite and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-08 19:19:23 +00:00
76a1a00977 Bug 9603 - Fix layout of Patron Card Creator Layout screen for display in IE
Currently, the layout for the Edit/Add Layout screen of the Patron
Card Creator is in complete disarray, when viewed in Internet Explorer
(of any version).

The nav bar is pushed to the bottom of the page, every fieldset is
empty (as their contents have been pushed out into different parts
of the page), and the checkboxes don't work.

The cause appears to be some extraneous mark-up (a few extra fieldset
and li elements)and some missing mark-up (ol elements to wrap the list
elements, especially when nesting lists within each other and within
div elements).

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I didn't test this in IE, but changes are fixing general
problems with HTML validity.

Checking the page with the W3C validator:
Before: 27 Errors, 7 warning(s)
After:  6 Errors, 7 warning(s)

All tests and QA script pass, page looks alright.
Would be nice to see the remaining problems fixed in
a follow-up.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-04 18:15:51 +00:00
1b3b942409 Bug 2835 - Inconsistent use of colon at the end of sentences
Labels which precede a text input or select typically have a colon
before them:

Name: [____]

This patch cleans up templates where labels in this context lack a
colon. Exceptions to this rule include radio buttons, checkboxes, and
labels inside tables.

To test, view the affected pages and confirm that labels look
consistent.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds more consistency.
Work for translators could be made easier using CSS instead
of whitespace after colon.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-02 09:03:42 -04:00
Katrin Fischer
732dbc8755 Bug 9697: Follow-up - making QA script and tests happy
- 2x single quotes for translated string in edit-batch.tt

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:22:44 -04:00
1ba126efaf Bug 9697 - Replace YUI buttons on the patron cards batch edit page with Bootstrap
The patron card creator's batch edit page uses an include file to
display buttons styled by YUI. Bootstrap should be used instead.

This patch moves the contents of the include file into the main
template, this being the only page which requires it. YUI markup and
code has been removed and Bootstrap markup is added. The include file is
deleted.

To test, edit a batch of patrons in the patron card creator. Each
toolbar button should look correct and work correctly:

- Add item(s)
- Remove item(s)
- Delete batch
- Remove duplicates (Keeping Bug 9535 in mind)
- Export item(s)
- Export batch

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: all buttons works and look well. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Will fix some smaller things in a QA follow up.
Works as expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-30 17:22:29 -04:00
d3663a1c38 Bug 9695 - Use alphabet system preference on page used to browse patrons for patron card batches
When adding patrons to a batch for creating patron cards, the template
shows alphabet links for browsing all patrons. This patch converts the
hard-coded alphabet links to use the new alphabet system preference.

To test, go to the patron card creator and create a new batch. Click
"Add items" to pop up the window for browsing for patrons to add to the
batch. You should see a working array of alphabet letters which link to
patron search results.

Signed-off-by: David Cook <dcook@prosentient.com.au>

The patch adds consistency to the interface and works as described.
Signed-off-by: Jonathan Druarth <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-13 08:43:25 -04:00
Chris Cormack
82337d9624 Bug 9555: Another template contains single quotes in a js string
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-11 07:40:42 -04:00
4334cd195a Bug 9693 - Remove YUI styling from buttons on the patron card creator's image manage page
Buttons on the patron card creator's image manage page are styled using
YUI. They can be classified as submit buttons rather than toolbar
buttons, so they should have default submit button styles.

This patch removes YUI styling and related JavaScript. Other minor
changes: Markup corrections for validity.

To test, view the patron card creator's image manage page. "Upload" and
"Delete" buttons should look correct and work correctly. Upload and
delete operations should function normally.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No errors.
Questions answered in comments.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely and is more consistent.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 10:03:25 -05:00
fc26ee3bae Bug 9694 - Remove YUI styling from buttons on the patron card creator manage pages
Buttons on the patron card creator's manage pages (manage templates,
manage profiles, etc) are styled using YUI. They can be classified as
submit buttons rather than toolbar buttons, so they should have default
submit button styles.

This patch removes YUI styling and related JavaScript. Other minor
changes: Escaping strings in JavaScript for translation.

To test, view the patron card creator's manage page for layouts,
templates, profiles, and batches. "Edit," "Delete," and "Export" buttons
should look correct and work correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. On errors.
Tested all manage pages, edit, delete, and export buttons.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, improves consistency.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:57:35 -05:00
2c01d28c40 Bug 9696 - Remove YUI styling from buttons on patron card creator edit pages
Submit and cancel buttons on patron card creator edit pages should not
be styled differently than other submit and cancel controls.

This patch removes YUI styling of these controls and makes them
consistent with controls on other Koha pages. The "Cancel" button has
been removed altogether from the batch edit page since there is not a
corresponding submit button.

To test, got to the patron card creator and edit a batch, a layout, a
profile, and a template. Submit and cancel controls should look correct
and work correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. Works and looks well. No errors.

Note: It's true that edit batch has not a submit button, but
on the other managed pages (layout, profile, template) cancel
aborts editing and takes you to a list of objects (layout, etc.)
Now if we selected the wrong batch, we need to click on left menu o
back button (yay). Are we loosing a consistent interface?
Just thinking.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, more consistent with Koha's general interface
patterns.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-07 09:55:21 -05:00
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>
2013-01-31 11:00:24 -05:00
d1e3773e3b Bug 5184 - Upgrade jQuery to the latest version (staff client)
Upgrade jQuery in the staff client. Besides the change
to the jQuery file syntax has been changed wherever this
syntax was written:

$(foo).attr("checked","");

The new correct way to un-check a checkbox:

$(foo).removeAttr("checked");

I also removed some JavaScript altogether from
branch-transfer-limits.tt which used the old syntax but
which wasn't used on the page at all anymore.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:05:19 +02:00
Katrin Fischer
892d64aa6c Bug 2780 - Capitalize strings consistently (patron cards)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-04-10 10:04:12 +02:00
Katrin Fischer
f8626343e2 Bug 7760 - Add ids and classes to every staff page to help with customization (patroncard, labels)
After talking to Owen we decided to use 2 classes for those modules. I decided on:

patroncard: tools, pcard
labels: tools, labels
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-03-22 18:12:33 +01:00
Gaetan Boisson
d500929cfd Bug 7731 - Library should be used instead of branch and site
standardized the use of the term "library" instead of "Branch" accross the interface and opac

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-20 15:17:08 +01:00
Garry Collum
cef7c1b40b Bug 7318: Fixes category display in patroncards Patron Search results.
Category description and type were not being sent to the template.  This patch fixes that issue, which also fixes the display.  The display was showing 'Category Description (category type)'.  It now displays 'Category Description (category code) to be consistent with the search label.

This patch also assigns an empty string to $member to get rid of some 'uninitialized' errors in the logs.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm this patch fixes the display issue.
Passes prove xt

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-27 18:01:00 +01:00
Garry Collum
6a60642a9d Bug 7203: Fixes typo - 'Mange' to 'Manage' in several files.
Found 3 instances of the typo while looking for the typo reference in Bug 7203.
Fixed labels/label-edit-batch.tt, labels/label-edit-layout.tt, and patroncards/edit-layout.tt.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-02-17 10:16:12 +01:00
63d300191e Follow-up fix for Bug 6753, Markup corrections and improvements for label export window
Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
2011-08-26 15:10:19 +12:00
Katrin Fischer
8a3160c870 Bug 6415: Can't make patron card batch
TT corrections from bug 6343 for label creator were also needed for patron card creator.

- Manage Batch and New Batch were missing the branch info
- Add link on patron search was missing batch id parameter

To test:
- Check branch is correctly shown on pages 'Manage Batch' and 'New Batch'
- Check you can create a new batch and add names to it by using the 'Add'
right to the patron's name

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 16:00:57 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
db6ab6a6fd Fix for bug 5498, Standardize markup and style of pagination menus
Signed-off-by: fdurand <frederic.durand@univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-09 19:25:36 +12:00
33c7b21cde Bug 6084: Missing translation markers in javascript alert messages
I ommited commented lines and "if $debug" lines too.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-07 21:46:45 +12:00
Katrin Fischer
35cf30ef15 Bug 5370: Fix references to koha.org and other old websites
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-07 19:50:52 +13:00
Chris Nighswonger
d91ebf445f Bugfix: Enabling guide box configuration parameter
This patch enables turning the guide boxes on/off in the patron
cards layout editor.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 20:54:44 -05:00
Chris Nighswonger
822c2d21e1 Bugfix: Fixing a broken link in the patron card layout editor
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-05 06:37:10 -05:00
Nicole Engard
710a7f0086 bug 4101 patroncards changed to patron card creator
There are references to patroncards in label text through out the patron card creator - I have changed it to 'patron card creator'

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:10:05 -05:00
Chris Nighswonger
ba36655755 Enhancement: Some JS to remove dialog after 5 sec
If JS is disabled, dialog still shows.
2010-01-12 09:31:58 -05:00
Chris Nighswonger
cd4fa27fc6 [21/30] Patron Card Creator image management interface and code 2010-01-11 18:21:15 -05:00
Chris Nighswonger
49148589f7 [17/30] Patron Card Creator member search interface and code 2010-01-11 18:21:14 -05:00
Chris Nighswonger
7a6a1acff2 [16/30] Patron Card Creator print interface and code 2010-01-11 18:21:13 -05:00
Chris Nighswonger
8a0db421bd [15/30] Patron Card Creator profile editor interface and code 2010-01-11 18:21:13 -05:00
Chris Nighswonger
a4b1bf3e64 [14/30] Patron Card Creator card printing interface and code
More cut and paste
2010-01-11 18:21:13 -05:00
Chris Nighswonger
3065b92ddc [13/30] Patron Card Creator management interface and code 2010-01-11 18:21:12 -05:00
Chris Nighswonger
7edf6810e6 [12/30] Patron Card Creator layout editor interface and code 2010-01-11 18:21:12 -05:00
Chris Nighswonger
666c70d9cf [11/30] Patron Card Creator batch editor interface and code 2010-01-11 18:21:11 -05:00
Chris Nighswonger
09a2744672 [9/30] Patron Card Creator home page 2010-01-11 18:18:36 -05:00
Chris Nighswonger
fdd149d406 [8/30] Patron Card Creator template editor interface and code 2010-01-11 18:17:05 -05:00