Commit graph

147 commits

Author SHA1 Message Date
Roman Amor
9e74700b5b Bug 11363: make units in label printer profile form translatable
Changed the unit names form an import to a switch case so that it is in
the .tt so that it can be translated

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>
2014-01-17 15:09:55 +00:00
e8f5ee9eef Bug 11505: fix untranslatable table headers in Label batch manager
The label batch manager script hard-codes the table header cell labels
in order to pass them to an HTML-building function. This obviously isn't
the best solution for internationalization, but picking the whole scheme
apart would be very complicated.

Instead this patch uses a SWITCH statement to check for each possible
case and outputs the correct translatable string for each.

To test, apply the patch and run "perl translate update" for any
translation. Check the revised po file and confirm that the new strings
are present. View the label batch edit page and confirm that the table
headings look correct: Tools -> Labels -> Manage batches -> Edit batch.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes all tests.
Similar fixes are probably needed for other pages of the labels
modules.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-01-13 21:03:49 +00:00
5fe524cf3a Bug 10850 - give quick spine label template page its own ID
Out of three conditional cases for display of the <body> tag one lacked
a unique ID. This patch copies the unique ID from the other cases to the
one lacking.

This patch also corrects the case of an "onload" attribute which should
follow XHTML style rules.

To test, the patch for Bug 9618 must be applied. Set the
SpineLabelAutoPrint system preference to "[don't] automatically pop up a
print dialog." Submit a barcode on the quick spine label creator and
view source. The <body> tag should have an ID attribute.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-10-18 04:51:14 +00:00
Jonathan Druart
94868f61c4 Bug 9618: (follow-up) include link to jQuery only if needed
The jQuery lib is useful only if js code is filled into the
intranetuserjs pref.

Signed-off-by: Campbell Reid-Tait <campbellreidtait@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test:
- Use Quick spine label creator
- Make sure you have Javascript in your intranetuserjs system
  preference
- Validate Javascript effect on screen or check source code
  to make sure your code is visible there.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-16 16:05:51 +00:00
cb59e37e56 Bug 9618: Add support for intranetuserjs to labels/spinelabel-print.pl
The template for printing a single spine label is a stripped-down
version of a standard Koha template, but it should include
intranetuserjs and IntranetUserCSS so that libraries can make local
customizations.

This patch updates the page's DOCTYPE to HTML5 and adds the missing
markup for including those preferences. Also added is jQuery, since
there's a good chance local customizations are using jQuery.

To test, make sure there is something in your intranetuserjs and
IntranetUserCSS system preferences. Visit
/cgi-bin/koha/labels/spinelabel-home.pl and submit a barcode. View
source on the spine label output page and confirm that your custom js
and css were included correctly.

Signed-off-by: Campbell Reid-Tait <campbellreidtait@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change, works nicely.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-09-16 16:05:02 +00:00
32fa69ee36 Bug 2774 - Path to theme is hard-coded in many places
This patch corrects serveral more places in the templates where the path
to the prog theme is hard-coded. To test, apply the patch and view the
following cases:

- When a database update is triggered the login page loads login.css.
  This path should be correct. (Reference to wizard.css is removed as
  per Bug 10422).
- The course reserves home page should load datatables-related assets
  correctly.
- Help pages for the Quick spine label creator and the staff client home
  page should show the correct paths where they reference the Koha file
  system.
- The web installer pages should correctly load the Koha logo.
- The label creator "manage" pages (layouts, templates, etc.) should
  correctly load datatables-related assets.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Checked all 5 - look good.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-07 09:04:15 -07:00
Karam Qubsi
6fd6c024a4 Bug 8061: Follow up - RTL CSS overrides (staff client)
I think this patch is good for th rtl langs.
and based on what D.Ruth send before, I added some edits
as a right to left reader.

Tested on master with Arabic
I used the updated po files for v. 3.8 (because the 3.12 )
need some revision ...

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-07 12:51:54 -04: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
3780bca779 Bug 8943 - Add table sorting to labels
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off by: Nora Blake <nblake@masslibsystem.org>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-31 08:33:42 -04:00
fd680afc6f Bug 9635 - Replace YUI buttons on label batches pages with Bootstrap
This patch converts the toolbar used by label batches pages to
Bootstrap, replacing YUI button and menu code with Bootstrap markup.

This patch also consolidates the include file and main template. The
include file was used in only one template.

To test, create a label batch and test all functions related to that
batch: adding and removing items, de-duplicating the batch, exporting
individual items, exporting the batch, and deleting the batch. Buttons
should look correct and work correctly.

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

Comment: Work as described, no errors.
Tested all functions (add, del, de-duplicate, export item, export batch)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-18 08:55:55 -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
Marc Veron
510a7d7347 Bug 8796 - patron cards not starting on designated card
Better wording for the meaning of 'Position' to prevent mistakes on behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-05 17:16:01 +02:00
2b74492d7d Bug 8181 [REVISED] Replace DynArch calendar widget with jQueryUI version
All instances of the old DynArch calendar have been replaced with
jQueryUI versions and the old library files have been removed.

calendar.inc has been modified to include jQueryUI localization
strings and global configuration options. Just add a "datepicker"
class to an input field to trigger a datepicker prompt.

If you would like two fields in one from to limit each other (one
is date from, one is date to), add these classes to each:
"datepickerfrom" and "datepickerto." This will prevent an invalid
entry, e.g. a date in the latter which falls before the former.

jQueryUI is now upgraded to the latest verision, 1.8.21.

Edit: Now with proper translatability, date formatting, first day
of the week handling, and RTL support.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA Comment:  rebased on current master; minor merge conflicts with other patches pushed

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-06-25 18:26:26 +02:00
Katrin Fischer
189c0875c1 [SIGNED-OFF]Bug 2780: Capitalize strings consistently
Fixes some more strings.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-10 10:13:20 +02:00
643c80663d Bug 2780 - Capitalize strings consistently (Labels templates)
Correcting capitalization in Labels templates

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-04-10 10:03:53 +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
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
Srdjan Jankovic
d43aa87d35 bug_6318: Always give predefined fields drop downs on label layout edit
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-16 11:23:59 +12:00
ecfa1ddd49 Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in spine
label print template.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-14 10:05:10 +12:00
77e1a62efa Fix for Bug 6753, Markup corrections and improvements for label export window
The most visible change in this patch is the conversion of image-only
links to text links combined with icons. Other changes include
markup corrections and standardization and language corrections.

To test, go to Labels > Manage Batches. Select a batch and click
'Export' to see the revised interface.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-21 19:44:47 +12:00
dd208da05a Fix for Bug 6635, Can't page through results in label batch
- Fixing T:T scope issue
- Correcting footer include for pop-up windows.
- Markup correction for validity.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-02 09:00:11 +12:00
Katrin Fischer
f515052d6e Bug 6343: TT issues in label creator
- Manage Batch had no branch set
- New Batch had no branch set
- Add link on item result list was broken, missing the batchid

To test:
Create a new batch and add items one by one. Look at 'Manage batches'.
Check that the branch in the top right corner is always correctly shown and set.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-05-26 09:16:41 +12:00
Christopher Hall
1d3273595c comma fix 2011-04-13 08:34:15 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +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
2dde876798 Fix for Bug 5818, Date picker broken on label batches
Calendar picker JS can't come before main JS includes

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-05 20:35:57 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13: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
3169100d51 Bug 5227 [3.4] Enhance the label batch edit interface
This patch adds the ability to enter items into label batches via
barcode scanning

Work sponsored by Tamil - http://www.tamil.fr

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 09:03:54 -04:00
Colin Campbell
9e5366734b Bug 5315: Remove references to obsolete variable nbstatements
Trying to see the wood from the trees

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-26 08:39:18 -04:00
0dd6cdd774 Correcting URL typo in link back to labels home page
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-07-19 10:17:34 -04:00
188725952f Fix for Bug 4296, label search printing titles between buttons
- Reformating display for readability
- Converting select/clear all buttons to links to match existing patterns
- Fixing "Results x of x" display which was broken for single-page sets

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-03-16 21:05:21 -04:00
Colin Campbell
b5dafcf198 Bug 4140 label edit template links to non-existent script
changed link to point at labels script

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 13:46:15 -05:00
dae8244a03 Fix for Bug 4136, Invalid XHTML in spinelabel-print view
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-08 10:39:08 -05:00
2ce51846a0 More fixes for Bug 2600, HTML tags in titles not escaped in many places
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 16:52:31 -05:00
cd921163c0 Fixes for Bug 3089, Date entry fields should indicate required date format
- Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
- Hint shows expected date format based on system preference
- Removing calendar.inc include from templates which don't use it

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 15:12:18 -05:00
Henri-Damien LAURENT
d339abf0bf Merge branch 'patroncards-wip' of git://git.foundations.edu/koha into community
Conflicts solved:
	Makefile.PL
	installer/data/mysql/en/mandatory/sysprefs.sql
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/updatedatabase.pl
	kohaversion.pl
2010-01-20 23:16:34 +01:00
Chris Nighswonger
ed7009df42 [30/30] Removing depricated files 2010-01-11 18:21:43 -05:00
Chris Nighswonger
4a675bcaad [5/30] A rework of Label Creator code
This rework removes code held in common with the Patron Card Creator
and move is to the new C4::Creators module.
2010-01-11 18:16:52 -05:00
20355a7084 Minor markup corrections for quick spine label creator, adding tools menu 2009-12-20 14:27:13 +01:00
Chris Nighswonger
3bab38c3fc Bug 3706 Label templates/layouts do not save properly
Two issues here:

1. No radio box was selected by default in the format section of the layout editor. This actually needs some additional attention to allow the user
to establish a default method of entering the format string. As noted in comments in the code, this would probably be best implimented by adding yet
another syspref. However, I don't have time atm.

2. On saving a new template, if no profile was assigned to the new template, the script threw an error and died.

Both issues are addressed in this patch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-10-14 10:17:10 -04:00
Chris Nighswonger
cc68004005 Bugfix Corrects a bug in the labels printer profile module which caused the printer name and tray to be updated incorrectly when saving changes.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-10-07 05:59:37 -04:00
c7061022c9 Minor interface tweaks and markup corrections.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:21:13 -04:00
099a9f127c Interface tweaks and markup corrections.
Includes JavaScript to automatically change field labels based on which unit of measurement has been chosen.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:21:08 -04:00
7f84cc4cf0 Interface tweaks and markup corrections.
Includes JavaScript to automatically change field labels based on which unit of measurement has been chosen.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:21:05 -04:00
e91f0bdebb Minor markup and interface tweaks fo "Edit Label Layout"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:21:02 -04:00
c5fa9f5b79 Markup corrections and other minor changes.
- Clarifying error message
- Hiding batch action buttons when batch is empty

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:21:00 -04:00
2dd1b5be90 Markup tweaks and corrections for label search window.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-29 19:20:58 -04:00
Chris Nighswonger
b04f3c9bb8 Moving css to correct location
See comments in commit b1197477d4

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-14 21:16:05 -04:00