From 6ba210af184930f530bb6ed458fbf1034f52c734 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 18 Jul 2011 14:36:05 -0400 Subject: [PATCH] Fix for Bug 6609, Clean up guided reports dictionary entry process Some general interface cleanup tasks with the guided reports dictionary entry process: - Improving the breadcrumb links - Eliminating the tabs in favor of more descriptive labels - Clarifying some labels - Correcting form markup according to established patterns (Undertaken primarily because the tabs translated poorly when trying to re-implement them for Bug 5481, Replace YUI JS libraries with Jquery UI) Signed-off-by: Nicole Engard Signed-off-by: Chris Cormack --- .../prog/en/modules/reports/dictionary.tt | 197 ++++++++---------- 1 file changed, 88 insertions(+), 109 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index f6d48ba56f..e11b59883a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -2,12 +2,19 @@ Koha › Reports › Guided Reports › Dictionary [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'header.inc' %] [% INCLUDE 'circ-search.inc' %] - +
@@ -70,17 +77,9 @@ [% END %] [% IF ( new_dictionary ) %] +

Add New Definition

- -
-
    -
  • Step 1: Name
    • -
  • Step 2: Area
    • -
  • Step 3: Columns
    • -
  • Step 4: Values
    • -
-
-
Add New Definition
    +
    Step 1 of 5: Name the new definition
    1. @@ -93,23 +92,14 @@
      -
-
[% END %] [% IF ( step_2 ) %] -
-
    -
  • Step 1: Name
    • -
  • Step 2: Area
    • -
  • Step 3: Columns
    • -
  • Step 4: Values
    • -
-
+

Add New Definition

-Add New Definition +Step 2 of 5: Choose the area
  1. @@ -122,28 +112,21 @@
-
-
[% END %] [% IF ( step_3 ) %] -

Add New Definition

-
-
    -
  • Step 1: Name
    • -
  • Step 2: Area
    • -
  • Step 3: Columns
    • -
  • Step 4: Values
    • -
-
+

Add New Definition

+
+Step 3 of 5: Choose columns -
+ - + + +
-
- - - - -
-
+ +
+ [% END %] [% IF ( step_4 ) %] -

Add New Definition

-
-
    -
  • Step 1: Name
    • -
  • Step 2: Area
    • -
  • Step 3: Columns
    • -
  • Step 4: Values
    • -
-
+

Add New Definition

+
+Step 4 of 5: Specify a value @@ -192,78 +167,82 @@ [% FOREACH column IN columns %] -[% column.name %] +
  1. Column: [% column.name %]
    2. [% IF ( column.distinct ) %] - +
    3. [% END %] [% IF ( column.date ) %] - - - - - - -
    All datesORDate range
    - - - - - - - - - -
    Start of date range - - -
    [% INCLUDE 'date-format.inc' %]
    -
    End of date range - - - -
    [% INCLUDE 'date-format.inc' %]
    -
    +
  3. Choose: + + + + + +
    All datesORDate range
    + + + + + + + + + +
    Start of date range + + +
    [% INCLUDE 'date-format.inc' %]
    +
    End of date range + + + +
    [% INCLUDE 'date-format.inc' %]
    +
    4. [% END %] [% IF ( column.text ) %] -

    Search string matches

    +
    5. [% END %] [% END %] +
- +
+
+ +
-
-
[% END %] [% IF ( step_5 ) %] -
+ -

Confirm Definition

+

Add New Definition

-
  1. +
    +Step 5 of 5: Confirm details +
    1. Name: [% definition_name %]
      2. @@ -274,9 +253,9 @@ align : "Tl"
    2. Area: [% areaname %] -
    - -
    1. +
      2. +
    2. +Data: -- 2.39.2
      Columns