From f958f83106e2d4b616cde3b207341d8622e9a7b2 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Oct 2012 14:07:01 -0400 Subject: [PATCH 1/3] Bug 8906 - Improve OAI management interface Revising OAI configuration interface to conform to existing interface patterns: - Properly-formatted form rows - "clone" and "clear" links consistent with other forms which use these conventions - Improved title and breadcrumbs - Standard save and cancel markup New to the mappings interface: A "clear" button to remove or empty the contents of a row. This replaces the help text about emptying fields. To test: view, add and edit OAI sets and mappings. Try adding and removing multiple set descriptions and mappings. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov --- .../prog/en/modules/admin/oai_set_mappings.tt | 48 ++++++--- .../prog/en/modules/admin/oai_sets.tt | 101 ++++++++---------- 2 files changed, 76 insertions(+), 73 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt index 1724c0661f..58f3807c3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -1,10 +1,19 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Admin › OAI set mappings +Koha › Administration › OAI sets › OAI set mappings [% INCLUDE 'doc-head-close.inc' %] @@ -29,7 +42,7 @@ function returnToSetsPage() { [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
@@ -37,16 +50,16 @@ function returnToSetsPage() {
[% IF ( mappings_saved ) %] -
-

Mappings have been saved

+
+

Mappings have been saved

Return to sets management

[% END %]

Mappings for set '[% setName %]' ([% setSpec %])

[% UNLESS ( mappings ) %] -

Warning: no mappings defined for this set

+

Warning: No mappings have been defined for this set

[% END %] -
+ @@ -55,6 +68,7 @@ function returnToSetsPage() { + @@ -67,11 +81,12 @@ function returnToSetsPage() { + [% END %] [% ELSE %] @@ -80,17 +95,16 @@ function returnToSetsPage() { - + + [% END %]
  Value   
[% IF ( loop.last ) %] - + [% ELSE %] OR [% END %] Clear
is equal to Clear
-

Hint: to delete a line, empty at least one of the text fields in this line

- - + Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index 21a0c4f5b5..6f25c710de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -1,13 +1,13 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Admin › OAI sets +Koha › Administration › [% IF ( op_new ) %]OAI sets configuration › Add a new OAI set[% ELSE %]OAI sets configuration[% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -28,67 +28,56 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
-

OAI sets configuration

- - [% IF op_new %] -

Add a new set

+ [% IF ( op_new || op_mod ) %]
+ [% IF ( op_new ) %] +

Add a new OAI set

-
- - -
- - -
- -
    -
- Add description -
- - -
- [% ELSE %][% IF op_mod %] -

Modify set '[% spec %]'

-
- - -
- - -
- - -
- -
    + [% ELSIF ( op_mod ) %] +

    Modify OAI set '[% spec %]'

    + + + [% END %] +
    +
      +
    1. + + +
      2. +
    2. + + +
      3. [% FOREACH desc IN descriptions %]
    3. - -  × + + + Remove
      4. [% END %] -
- Add description -
- - -
- [% END %] - [% END %] +
  •  Add description
    • -

    List of sets

    - [% UNLESS ( op_new ) %] - Add a new set - [% END %] + + +
    + Cancel +
    + + [% ELSE %] + +
    +
    + +

    OAI sets

    [% IF sets_loop %] @@ -127,9 +116,9 @@ $(document).ready(function() {
    [% ELSE %] -

    There is no set defined.

    +

    There are no sets defined.

    + [% END %] [% END %] -
    From 82daf63b05004abbdeff18803b4bdf67820f360c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 20 Nov 2012 16:41:57 +0100 Subject: [PATCH 2/3] Bug 8906: Followup FIX hardcoded localhost url Signed-off-by: Mirko Tietgen Signed-off-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov --- .../intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt index 58f3807c3f..64ed733f12 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -42,7 +42,7 @@ function hideDialogBox() { [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index 6f25c710de..bd5d54a80b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -28,7 +28,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    From 32584801dff8d2be997ddbea7fc9c9e565a84897 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 26 Dec 2012 12:06:47 +0100 Subject: [PATCH 3/3] Bug 8906: Followup replace 'Clear' with 'Delete' Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov --- .../intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt index 64ed733f12..b449191549 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -86,7 +86,7 @@ function hideDialogBox() { OR [% END %] - Clear + Delete [% END %] [% ELSE %] @@ -96,7 +96,7 @@ function hideDialogBox() { is equal to - Clear + Delete [% END %]