Commit graph

13 commits

Author SHA1 Message Date
Katrin Fischer
4043df4395 Bug 10409: Follow up - improving strings for easier translation
Fixing this line:
<legend>[% IF course_id %] Edit [% ELSE %] Create [% END %] course</legend>

As grammar works different in different languages, having single
strings like that in a predefined order makes having a nice translation
unnecessarily hard.

This will make it a little easier:
<legend>[% IF course_id %]Edit course[% ELSE %]Create course[% END %]</legend>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-17 14:09:59 +00:00
1ad188f9d6 Bug 10409 - Do not show course entry form if no departments are found
The course reserves entry form should not be shown if there are no
DEPARTMENT authorized values, since this prevents the form from being
submitted. This patch replaces the form with an error message when no
DEPARTMENT authorized values are found.

Also corrected:

- Corrected grid structure for more standard display
- Converted labels with no corresponding inputs to <span class="label">
- Closed unclosed tags
- Corrected incorrect capitalization

This patch contains whitespace changes, so please ignore whitespace when
examining changes.

To test, delete any DEPARTMENT authorized values, if present. Create a
new course in Course Reserves. You should see a warning that no
DEPARTMENT values were found.

If you are logged in with the correct permission, the warning should
contain a link to the correct authorized value page. If you do no, the
warning should refer the problem to an administrator.

After creating one or more DEPARTMENT values, the form should display
and submit correctly.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
After this patch has been applied, I get an error message and no form
if I don't have any DEPARTMENTs defined, which makes sense given that
the form can't be submitted without a DEPARTMENT.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
You now see a useful error message, when no departments have been
defined. Else you are taken to the correct form.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-17 14:09:59 +00:00
5fbf07df7c Bug 10418 - Correct template markup problems on course reserves add item page
This patch corrects several problems with the course reserves add item
pages:

- Non-standard grid markup.
- Extra </div>.
- Incorrect styling of errors and messages.
- Redundant JS for adding focus to a field (use "focus" class).
- Invalid use of <label> with no corresponding input (use <span
  class="label"> instead).
- Incorrect capitalization.

To test, apply the patch and examing both steps of the process of adding
an item to an existing course: The initial "scan barcode" form, and the
form for editing details of a scanned item.

Some cases to check:

- Scan an invalid barcode.
- Scan a barcode which has already been added to a course.
- Scan a barcode wihch has already been added to the course you're
  working with.

Forms should look correct and work correctly.

This patch contains whitespace changes, so please ignore whitespace when
examining changes.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The add item screen continues to work as before.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl. Works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-14 11:21:45 -07:00
02d4719437 Bug 10416 - Correct template markup problems on course detail page
This patch corrects several problems with the course reserves course
detail page:

- Unescaped ampersands
- Extra </div>
- Incorrect text in title tag
- Use of a table to display information which is more consistently
  displayed as a list.
- More accurate alert message, "Are you sure you want to remove this
  item from the course?" rather than "Are you sure you want to delete
  this item?"
- Missing icons from toolbar buttons

To test, apply the patch and view the details of an existing
course (Course reserves -> [Course name]). Confirm that these changes
are present and look like an improvement.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The course details screen looks much more consistent with other parts
of Koha now.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, template only changes. Everything checks out and
works as advertised.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-14 11:11:14 -07:00
39de7a8de8 Bug 10432 - Display of enabled status on course list is not accessible
The list of courses in Course Reserves uses an image with no alt
attribute to display the enabled/disabled status of each course. This is
not accessible or valid HTML.

This patch removes the image altogether in favor of a simple "Yes" or
"No." To test, view the list of existing course reserves. Enabled and
disabled courses should show "yes" or "no" in the "Enabled" column.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-12 11:08:28 -07: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
20180b4c39 Bug 10420 - Standardize spelling of "authorized"
This patch corrects instances of the non-[American]-standard spelling
"authorised" when used in text.

The following instances are corrected:

- In Administration -> Funds, the error message displayed if you do not
  have permission to edit a fund.
- In Administration -> Authorized values, the instructions linked to the
  "Libraries limitation" field.
- In Administration -> MARC bibliographic framework test, instructions
  related to linking to authorized values.
- In the course reserves add form, error messages referring to missing
  authorized values.
- In guided reports, error messages shown when an authorized value
  chosen as a report parameter doesn't exit.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-07 08:26:13 -07:00
Galen Charlton
4a91381d5a bug 8215: (followup) remove extraneous underscore in template
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2013-05-21 15:51:04 -07:00
Jonathan Druart
b049827042 Bug 8215: FIX ergonomic issue : 'Unchanged()' 2013-05-21 15:50:59 -07:00
Jonathan Druart
e7dbbabf83 Bug 8215: Followup Fix confirmation links for delete course and item
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-05-21 15:50:58 -07:00
1940d4871c Bug 8215 - Add Course Reserves - QA Followup
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-05-21 15:50:58 -07:00
Jonathan Druart
0ba129131c Bug 8215: Followup FIX QA issues
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2013-05-21 15:50:57 -07:00
be869ab279 Bug 8215 - Course Reserves
Adds a course reserves system for academic libraries.

The course reserves system allows libraries to create courses
and put items on reserves for those courses.

Each item with at least one reserve can have some of its attributes
modified while it is on reserve for at least one active course.
These attributes include item type, collection code, shelving location,
and holding library. If there are no active courses with this item
on reserve, it's attributes will revert to the original attributes
it had before going on reserve.

Test Plan:
  1) Create new authorised value categories DEPARTMENT and TERM
  2) Create a new course, add instructors to that course.
  3) Reserve items for that course, verify item attributes have changed.
  4) Disable course, verify item attributes have reverted.
  5) Enable course again, verify item attributes again.
  6) Delete course, verify item attributes again.
  7) Create two new courses, add the same item(s) to both courses.
  8) Disable one course, verify item attributes have not reverted.
  9) Disable both courses, verify item attributes have reverted.
 10) Enable one course, verify item attributes are again set to the
     new values.
 11) Edit reserve item attributes, verify.
 12) Disable all courses, edit reserve item attributes, verify
     the item itself still has its original attributes, verify
     the reserve item attributes have been updated.
 13) Verify the ability to remove instructors from a course.
 14) Verify new permissions, top level coursereserves, with
     subpermissions add_reserves and delete_reserves.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Corinne Bulac <corinne.hayet@bulac.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

http://bugs.koha-community.org/show_bug.cgi?id=8125
2013-05-21 15:50:55 -07:00