Bugzilla – Attachment 20371 Details for
Bug 10661
Mandatory item fields should be formatted the same on all forms
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10661 - Mandatory item fields should be formatted the same on all forms
Bug-10661---Mandatory-item-fields-should-be-format.patch (text/plain), 6.79 KB, created by
Owen Leonard
on 2013-08-15 14:19:54 UTC
(
hide
)
Description:
Bug 10661 - Mandatory item fields should be formatted the same on all forms
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2013-08-15 14:19:54 UTC
Size:
6.79 KB
patch
obsolete
>From 087ea4638da8316e88e5bcfc055e5f13104ee46c Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 15 Aug 2013 10:06:29 -0400 >Subject: [PATCH] Bug 10661 - Mandatory item fields should be formatted the > same on all forms >Content-Type: text/plain; charset="utf-8" > >Mandatory item fields are not indicated the same way in all places. This >patch corrects two places where required fields were shown in bold >rather than using the standard "required" class: When adding an order >from a staged file and when adding an item for a new issue of a serial. > >Unrelated changes: Added $KohaDates formatting of date and time and >corrected capitalization on a heading on the add order from staged file >page. > >It would be nice to be able to use the same method for displaying the >item form as we use on neworderentry.tt -- pulling in the form from a >separate include. However that system is designed for handling multiple >items and would need to be adapted for these cases. > >To test, you must have a staged file from which to add an order. Open an >existing basket or create a new one and choose to add an order "From a >staged file." Choose a staged file from which to order. The item entry >form under the "Import all" heading should show required fields in red. > >To test in serials: Begin the process for receiving an item from an >existing subscription. On the serials-edit page, find the "Click to add >item" links and click to open the item edit forms. There should be one >under the numbered issue and the supplemental issue forms. In both cases >the item edit screen should show the mandatory item fields in red. >--- > .../prog/en/modules/acqui/addorderiso2709.tt | 11 +++++++---- > .../prog/en/modules/serials/serials-edit.tt | 14 ++++++++++---- > 2 files changed, 17 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 3223dc2..78107d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -52,7 +52,7 @@ > <div class="yui-b"> > [% IF ( batch_details ) %] > <h1>Add orders from [% comments %] >- ([% file_name %] staged on [% upload_timestamp %]) >+ ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %]) > </h1> > <div> > <form action="[% scriptname %]" method="post" name="import_biblios"> >@@ -123,7 +123,7 @@ > </div> > [% IF ( import_batch_id ) %] > <div class="yui-b"> >- <h2>Import All</h2> >+ <h2>Import all</h2> > <p>Import all the lines in the basket with the following parameters:</p> > <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform"> > <input type="hidden" name="op" value="import_records"/> >@@ -148,8 +148,11 @@ > <div id="itemblock"> > <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];"> > <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> >- >- <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label> >+ [% IF (iteminformatio.mandatory) %] >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% ELSE %] >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% END %] > [% iteminformatio.marc_value %] > <input type="hidden" name="itemid" value="1" /> > <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >index 8f9ea5f..ecae99d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt >@@ -236,8 +236,11 @@ $(document).ready(function() { > <div id="item[% item.serialid %][% item.countitems %]" class="items"> > <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li> > <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> >- >- <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label> >+ [% IF (iteminformatio.mandatory) %] >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% ELSE %] >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% END %] > [% iteminformatio.marc_value %] > <input type="hidden" name="itemid" value="[% item.itemid %]" /> > <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >@@ -344,8 +347,11 @@ $(document).ready(function() { > <div id="item[% newserialloo.serialid %][% newserialloo.countitems %]" class="items"> > <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li> > <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]"> >- >- <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label> >+ [% IF (iteminformatio.mandatory) %] >+ <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% ELSE %] >+ <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label> >+ [% END %] > [% iteminformatio.marc_value %] > <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" /> > <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" /> >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10661
:
20371
|
20380
|
20992
|
22118
|
22343