Browse Source

Bug 29052: Make consistent use of spans and div with hint class

This patch makes minor HTML corrections to several templates, primarily
to wrap form help text in <span class="hint"> or <div class="hint">.

To test, apply the patch and rebuild the staff interface CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).

View the following pages to confirm that forms look correct:

- Administration -> Authority types -> Authority type -> Edit.
- Administration -> Authority types -> Authority type -> MARC structure.
  -> Subfields -> Edit.
- Administration -> Authorised values -> View category -> New authorized
  value.
- Administration -> Credit types -> New credit type.
- Administration -> Debit types -> New debit type.
- Administration -> Item types -> New item type.
  Also changed: Added link to ITEMTYPECAT authorized value page for
  users with the correct permission.
- Administration -> MARC frameworks -> MARC structure -> Edit subfields.
- Administration -> Patron attribute types -> New patron attribute type.
- Administration -> Share content with Mana KB.
- Administration -> Z39.50/SRU servers -> New Z39.50 server.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
21.11.x
Owen Leonard 3 years ago
committed by Jonathan Druart
parent
commit
ecd9bd421e
  1. 19
      koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
  2. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
  3. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
  4. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
  5. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
  6. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
  7. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
  8. 24
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
  9. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
  10. 16
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
  11. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
  12. 26
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt

19
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss

@ -806,33 +806,34 @@ fieldset {
div {
&.hint {
margin: .5em 0;
margin-left: 10.5em;
font-size: 105%;
margin: .5rem 0;
margin-left: 10.5rem;
}
}
label {
float: left;
font-weight: bold;
margin-right: 1em;
margin-right: 1rem;
text-align: right;
width: 9em;
width: 9rem;
&.error {
float: none;
margin-left: 1em;
margin-left: 1rem;
width: auto;
}
&.inline {
display: inline;
float: none;
margin-left: 1em;
margin-left: 1rem;
}
&.radio {
display: inline-block;
margin: 0 1em 0 0;
margin: 0 1rem 0 0;
padding: 0;
width: auto;
}
@ -941,6 +942,10 @@ fieldset {
text-align: right;
width: 9em;
}
&.hint {
font-size: 105%;
}
}
table {

6
koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt

@ -125,7 +125,7 @@
<thead>
<tr>
<th>Name</th>
<th>Authorised value category</th>
<th>Authorized value category</th>
[% IF show_marcfield %]
<th>MARC field</th>
[% END %]
@ -170,8 +170,8 @@
<span class="required">Required</span>
</li>
<li>
<label for="av">Authorised value category: </label>
<select name="authorised_value_category">
<label for="av">Authorized value category: </label>
<select id="av" name="authorised_value_category">
<option value="">None</option>
[% PROCESS options_for_authorised_value_categories authorised_value_categories = AuthorisedValues.GetCategories({selected => field.authorised_value_category}) %]
</select>

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt

@ -149,7 +149,7 @@
[%- END -%]
[%- END -%]
</select>
(ignore means that the subfield does not display in the record editor)
<div class="hint">Ignore means that the subfield does not display in the record editor</div>
</li>
<li>
<fieldset>
@ -181,7 +181,7 @@
[% ELSE %]
<input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" />
[% END %]
(if checked, it means that the subfield is a URL and can be clicked)
<span class="hint">If checked, it means that the subfield is a URL and can be clicked.</span>
</li>
<li>
<label for="defaultvalue[% loo.row | html %]">Default value:</label>

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt

@ -214,7 +214,7 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
<option value=""></option>
[% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value ) %]
</select>
(if you select a value here, the indicators will be limited to the authorized value list)
<div class="hint">If you select a value here, the indicators will be limited to the authorized value list</div>
</li>
</ol>
</fieldset>

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt

@ -133,7 +133,7 @@ Authorized values &rsaquo; Administration &rsaquo; Koha
[% END %]
[% END %]
</select>
<span>Select 'All libraries' if this authorized value must be displayed all the time. Otherwise select libraries you want to associate with this value.</span>
<div class="hint">Select 'All libraries' if this authorized value must be displayed all the time. Otherwise select libraries you want to associate with this value.</div>
</li>
</ol>

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt

@ -122,7 +122,7 @@
[% ELSE %]
<input type="checkbox" name="credit_number_enabled" id="credit_number_enabled" value="1" />
[% END %]
<span>Enable automatic generation of credit number (see <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoCreditNumber">AutoCreditNumber</a>)</span>
<span class="hint">Enable automatic generation of credit number (see <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoCreditNumber">AutoCreditNumber</a>)</span>
</li>
<li>
<label for="branches">Libraries limitation: </label>
@ -139,7 +139,7 @@
[% END %]
[% END %]
</select>
<span>Select 'All libraries' if this credit type should be available at all libraries. Otherwise select libraries you want to associate credit type with.</span>
<div class="hint">Select 'All libraries' if this credit type should be available at all libraries. Otherwise select libraries you want to associate credit type with.</div>
[% END %]
</li>
</ol>

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt

@ -131,7 +131,7 @@
[% END %]
[% END %]
</select>
<span>Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with.</span>
<div class="hint">Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with.</div>
</li>
</ol>
</fieldset>

24
koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt

@ -182,7 +182,7 @@ Item types &rsaquo; Administration &rsaquo; Koha
<input type="text" id="parent_type" value="[% parent_type | html %]" name="parent_type" size="10" maxlength="10" disabled/>
<p>No available parent types</p>
[% END %]
<span class="hint">Defining a parent type will apply checkout limits for all children as described on the circulation rules page.</span>
<div class="hint">Defining a parent type will apply checkout limits for all children as described on the circulation rules page.</div>
</li>
<li>
<label for="description" class="required">Description: </label>
@ -192,7 +192,7 @@ Item types &rsaquo; Administration &rsaquo; Koha
[% END %]
</li>
<li>
<span class="label">Search category</span>
<label for="searchcategory">Search category: </label>
<select id="searchcategory" name="searchcategory">
<option value="">None</option>
[% FOREACH cat IN searchcategory %]
@ -207,7 +207,13 @@ Item types &rsaquo; Administration &rsaquo; Koha
[% END %]
[% END %]
</select>
<span class="hint">Options are defined as the authorized values for the ITEMTYPECAT category.</span>
<div class="hint">
[% IF ( CAN_user_parameters_manage_auth_values ) %]
Options are defined by the authorized value <a target="_blank" href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=ITEMTYPECAT">ITEMTYPECAT</a>.
[% ELSE %]
Options are defined by the authorized value ITEMTYPECAT.
[% END %]
</div>
</li>
[% IF ( Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') ) %]
<li>
@ -312,12 +318,12 @@ Item types &rsaquo; Administration &rsaquo; Koha
<li>
<label for="rentalcharge">Rental charge: </label>
<input type="text" id="rentalcharge" name="rentalcharge" size="10" value="[% itemtype.rentalcharge | $Price on_editing => 1 %]" min="0" />
<span class="hint">This fee is charged once per checkout/renewal per item</span>
<div class="hint">This fee is charged once per checkout/renewal per item</div>
</li>
<li>
<label for="rentalcharge_daily">Daily rental charge: </label>
<input type="text" id="rentalcharge_daily" name="rentalcharge_daily" size="10" value="[% itemtype.rentalcharge_daily | $Price on_editing => 1 %]" min="0" />
<span class="hint">This fee is charged at checkout/renewal time for each day between the checkout/renewal date and due date for loans specified in days.</span>
<div class="hint">This fee is charged at checkout/renewal time for each day between the checkout/renewal date and due date for loans specified in days.</div>
</li>
<li>
<label for="rentalcharge_daily_calendar">Daily rentals use calendar: </label>
@ -331,7 +337,7 @@ Item types &rsaquo; Administration &rsaquo; Koha
<li>
<label for="rentalcharge_hourly">Hourly rental charge: </label>
<input type="text" id="rentalcharge_hourly" name="rentalcharge_hourly" size="10" value="[% itemtype.rentalcharge_hourly | $Price on_editing => 1 %]" min="0" />
<span class="hint">This fee is charged at checkout/renewal time for each hour between the checkout/renewal date and due date for loans specified in hours.</span>
<div class="hint">This fee is charged at checkout/renewal time for each hour between the checkout/renewal date and due date for loans specified in hours.</div>
</li>
<li>
<label for="rentalcharge_hourly_calendar">Hourly rentals use calendar: </label>
@ -387,13 +393,13 @@ Item types &rsaquo; Administration &rsaquo; Koha
<option value="">All libraries</option>
[% PROCESS options_for_libraries libraries => Branches.all( selected => itemtype.get_library_limits, unfiltered => 1, do_not_select_my_library => 1 ) %]
</select>
<span class="hint">Select 'All libraries' if all libraries use this item type. Otherwise, select the specific libraries that use this item type.</span>
<div class="hint">Select 'All libraries' if all libraries use this item type. Otherwise, select the specific libraries that use this item type.</div>
</li>
<li>
<label for="summary">Summary: </label>
<textarea id="summary" name="summary" cols="55" rows="5">[% itemtype.summary | html %]</textarea>
<p>Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype : </p>
<p><strong>&lt;a href="[856u]"&gt;open site&lt;/a&gt;</strong> will show the link just below the title</p>
<div class="hint">Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype : </div>
<div class="hint"><strong>&lt;a href="[856u]"&gt;open site&lt;/a&gt;</strong> will show the link just below the title</div>
</li>
</ol>
</fieldset>

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt

@ -251,7 +251,7 @@
[% ELSE %]
<input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" />
[% END %]
<div class="hint">If checked, it means that the subfield is a URL and can be clicked</div>
<span class="hint">If checked, it means that the subfield is a URL and can be clicked</span>
</li>
<li>
<label for="link[% loo.row | html %]">Link:</label>

16
koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt

@ -126,7 +126,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="repeatable" name="repeatable" />
[% END %]
<span>Check to let a patron record have multiple values of this attribute.</span>
<span class="hint">Check to let a patron record have multiple values of this attribute.</span>
</li>
[% IF attribute_type AND not can_be_set_to_unique %]
@ -147,7 +147,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="unique_id" name="unique_id" />
[% END %]
<span>If checked, attribute will be a unique identifier &mdash; if a value is given to a patron record, the same value
<span class="hint">If checked, attribute will be a unique identifier. If a value is given to a patron record, the same value
cannot be given to a different record.</span>
</li>
@ -157,7 +157,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="opac_display" name="opac_display" />
[% END %]
<span>Check to display this attribute on a patron's details page in the OPAC.</span>
<span class="hint">Check to display this attribute on a patron's details page in the OPAC.</span>
</li>
<li><label for="opac_editable">Editable in OPAC: </label>
[% IF attribute_type AND attribute_type.opac_editable %]
@ -165,7 +165,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="opac_editable" name="opac_editable" />
[% END %]
<span>Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work during <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=PatronSelfRegistration" target="_blank">self-registration</a> if <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=PatronSelfRegistrationVerifyByEmail" target="_blank">PatronSelfRegistrationVerifyByEmail</a> is set.)</span>
<span class="hint">Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work during <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=PatronSelfRegistration" target="_blank">self-registration</a> if <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=PatronSelfRegistrationVerifyByEmail" target="_blank">PatronSelfRegistrationVerifyByEmail</a> is set.)</span>
</li>
<li><label for="staff_searchable">Searchable: </label>
[% IF attribute_type AND attribute_type.staff_searchable %]
@ -173,7 +173,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="staff_searchable" name="staff_searchable" />
[% END %]
<span>Check to make this attribute staff_searchable in the staff patron search.</span>
<span class="hint">Check to make this attribute staff_searchable in the staff patron search.</span>
</li>
<li><label for="mandatory">Mandatory: </label>
[% IF attribute_type AND attribute_type.mandatory %]
@ -181,7 +181,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="mandatory" name="mandatory" />
[% END %]
<span>Check to make this attribute mandatory when creating or editing a patron.</span>
<span class="hint">Check to make this attribute mandatory when creating or editing a patron.</span>
</li>
<li><label for="display_checkout">Display in patron's brief information: </label>
[% IF attribute_type AND attribute_type.display_checkout %]
@ -189,7 +189,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="display_checkout" name="display_checkout" />
[% END %]
<span>Check to show this attribute in the brief information panel in the patron's record (staff interface).</span>
<span class="hint">Check to show this attribute in the brief information panel in the patron's record (staff interface).</span>
</li>
[% IF Koha.Preference('Pseudonymization') %]
@ -200,7 +200,7 @@ Patron attribute types &rsaquo; Administration &rsaquo; Koha
[% ELSE %]
<input type="checkbox" id="keep_for_pseudonymization" name="keep_for_pseudonymization" />
[% END %]
<span>Check to make this attribute copied to the patron's pseudonymized attributes.</span>
<span class="hint">Check to make this attribute copied to the patron's pseudonymized attributes.</span>
</li>
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt

@ -97,7 +97,7 @@
[% ELSE %]
<input id="autosharewithmana" type="checkbox" name="autosharewithmana" checked="checked">
[% END %]
<div class="hint">If checked, new subscriptions you create will be automatically shared with Mana KB.</div>
<span class="hint">If checked, new subscriptions you create will be automatically shared with Mana KB.</span>
</li>
</ol>
<fieldset class="action">

26
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt

@ -111,21 +111,30 @@
</li>
<li><label for="password">Password: </label> <input type="text" name="password" id="password" value="[% server.password | html %]" />
</li>
<li><label for="checked">Preselected (searched by default): </label>
<li>
<label for="checked">Preselected: </label>
[% IF ( server.checked ) %]
<input type="checkbox" name="checked" id="checked" value="1" checked="checked" />
[% ELSE %]
<input type="checkbox" name="checked" id="checked" value="1" />
[% END %]
<span class="hint">Searched by default.</span>
</li>
<li><label for="rank">Rank (display order): </label> <input type="text" name="rank" id="rank" size="4" value="[% server.rank | html %]" />
<li>
<label for="rank">Rank: </label>
<input type="text" name="rank" id="rank" size="4" value="[% server.rank | html %]" />
<div class="hint">Display order.</div>
</li>
[% IF (server.servertype||type) == 'zed' %]
<li><label for="attributes">Attributes (additional PQF attributes added to each query): </label><input type="text" name="attributes" id="attributes" size="30" value="[% server.attributes | html %]" />
<li>
<label for="attributes">Attributes: </label>
<input type="text" name="attributes" id="attributes" size="30" value="[% server.attributes | html %]" />
<div class="hint">Additional PQF attributes added to each query.</div>
</li>
[% END %]
<li><label for="syntax">Syntax (z3950 can send<br /> records in various format. Choose one): </label>
<li>
<label for="syntax">Syntax: </label>
<select name="syntax" id="syntax">
<option value="UNIMARC">UNIMARC</option>
<option value="INTERMARC">INTERMARC</option>
@ -144,18 +153,23 @@
<option value="CATMARC">CATMARC</option>
<option value="MALMARC">MALMARC</option>
</select>
<div class="hint">Z39.50 can send records in various formats. Choose one.</div>
</li>
<li><label for="encoding">Encoding (z3950 can send<br /> records in various encodings. Choose one): </label>
<li>
<label for="encoding">Encoding: </label>
<select name="encoding" id="encoding">
[% FOREACH enc IN [ 'utf8' 'EUC-KR' 'ISO_5426' 'ISO_6937' 'ISO_8859-1' 'MARC-8' ] %]
<option value="[% enc | html %]">[% enc | html %]</option>
[% END %]
</select>
<div class="hint">Z39.50 can send records in various encodings. Choose one.</div>
</li>
<li><label for="timeout">Timeout (0 its like not set): </label>
<li>
<label for="timeout">Timeout: </label>
<input type="text" name="timeout" id="timeout" size="4" value="[% server.timeout | html %]" /> seconds
<div class="hint">Enter 0 to disable.</div>
</li>
<li><label for="recordtype">Record type: </label>
<select name="recordtype" id="recordtype">

Loading…
Cancel
Save