diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 73f532ed4b..b8a857d47c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -262,7 +262,8 @@ table+table { border : 0; } -.highlighted-row { background-color: orange !important } +.highlighted-row, +.highlighted-row td { background-color: #FFD000 !important } tbody tr:nth-child(odd) td { background-color : #F3F3F3; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc index 995e1f6582..a886a8b5ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc @@ -1,24 +1,27 @@ - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc index 6e6fa4915a..74bd3dc39f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc @@ -45,7 +45,7 @@
  • Classification sources
  • Record matching rules
  • OAI sets configuration
    • -
  • Items search fields
    • +
  • Item search fields
    • Acquisition parameters
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/item_search_fields.js b/koha-tmpl/intranet-tmpl/prog/en/js/item_search_fields.js new file mode 100644 index 0000000000..32418b5d29 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/js/item_search_fields.js @@ -0,0 +1,24 @@ +$(document).ready(function(){ + $("#add_field_form").hide(); + $("#new_search_field").on("click",function(e){ + e.preventDefault(); + $("#add_field_form").show(); + $(".dialog").hide(); + $("#search_fields_list,#toolbar").hide(); + }); + $(".cancel").on("click",function(e){ + e.preventDefault(); + $("#add_field_form").hide(); + $(".dialog").show(); + $("#search_fields_list,#toolbar").show(); + }); + $(".field-delete").on("click",function(){ + $(this).parent().parent().addClass("highlighted-row"); + if( confirm( MSG_ITEM_SEARCH_DELETE_CONFIRM )){ + return true; + } else { + $(this).parent().parent().removeClass("highlighted-row"); + return false; + } + }); +}); \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index d0f65f2241..eea0b0d78c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -83,8 +83,8 @@
    Manage rules for automatically matching MARC records during record imports.
    OAI sets configuration
    Manage OAI Sets
    -
    Items search fields
    -
    Manage custom fields for items search
    +
    Item search fields
    +
    Manage custom fields for item search.

    Acquisition parameters

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt index 6e0f373a3a..ed1f9c5890 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] - Koha › Administration › Items search fields + Koha › Administration › Item search fields [% INCLUDE 'doc-head-close.inc' %] @@ -8,7 +8,7 @@ @@ -16,21 +16,21 @@
    -

    Items search field: [% field.label %]

    +

    Item search field: [% field.label %]

    -
    +
    Edit field [% INCLUDE 'admin-items-search-field-form.inc' field=field %]
    -
    - -
    +
    +
    + + Cancel
    - Return to items search fields overview page
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt index 200e614aef..f5b980c21f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -1,6 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] - Koha › Administration › Items search fields + Koha › Administration › Item search fields [% INCLUDE 'doc-head-close.inc' %] + + [% INCLUDE 'header.inc' %] @@ -8,83 +12,96 @@
    + + + [% IF field_added %] -
    +
    Field successfully added: [% field_added.label %]
    [% ELSIF field_not_added %] -
    -

    Failed to add field. Please check if the field name doesn't already exist.

    +
    +

    Failed to add field. Please make sure the field name doesn't already exist.

    Check logs for more details.

    [% ELSIF field_deleted %] -
    +
    Field successfully deleted.
    [% ELSIF field_not_deleted %] -
    +

    Failed to delete field.

    Check logs for more details.

    [% ELSIF field_updated %] -
    +
    Field successfully updated: [% field_updated.label %]
    [% ELSIF field_not_updated %] -
    +

    Failed to update field.

    Check logs for more details.

    [% END %] -

    Items search fields

    [% IF fields.size %] - - - - - - - - - - - - - [% FOREACH field IN fields %] - - - - - - - - - [% END %] - -
    NameLabelMARC fieldMARC subfieldAuthorised values categoryOperations
    [% field.name %][% field.label %][% field.tagfield %][% field.tagsubfield %][% field.authorised_values_category %] - Edit - Delete -
    +
    +

    Item search fields

    + + + + + + + + + + + + + + [% FOREACH field IN fields %] + + + + + + + + + [% END %] + +
    NameLabelMARC fieldMARC subfieldAuthorised values categoryOperations
    [% field.name %][% field.label %][% field.tagfield %][% field.tagsubfield %][% field.authorised_values_category %] + Edit + Delete +
    +
    + [% ELSE %] +
    + There are no item search fields defined. +
    [% END %] -
    + +
    Add a new field [% INCLUDE 'admin-items-search-field-form.inc' field=undef %] -
    - -
    -
    - -
    + +
    +
    + + Cancel
    +