From 3cb985eab1d204a7443bda87fb6345bfac61ba48 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 5 Nov 2007 16:43:27 -0600 Subject: [PATCH] More enhancements to guided reports markup and layout. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 43 ++--- .../prog/en/includes/dictionary-toolbar.inc | 21 +++ .../prog/en/includes/tools-menu.inc | 1 + .../prog/en/modules/reports/dictionary.tmpl | 150 +++++++++++------- .../modules/reports/guided_reports_start.tmpl | 6 +- .../prog/en/modules/tools/scheduler.tmpl | 77 ++++----- 6 files changed, 169 insertions(+), 129 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc 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 724dcdde56..917d04fb37 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -640,16 +640,17 @@ fieldset.rows .inputnote { list-style : none; } -.tabs-nav a, .tabs-nav a span { +.tabs-nav a, .tabs-nav a span, .tabs-nav span.a { background : none; + display : block; padding: .2em .5em .25em .5em; } -.tabs-nav a { +.tabs-nav a, .tabs-nav span.a { z-index : auto; } -.tabs-nav .tabs-selected a { +.tabs-nav .tabs-selected a, .tabs-nav .tabs-selected span.a { background-color : #FFFFCC; border-top: 1px solid #FFFFCC; border-right: 1px solid #FF9900; @@ -661,11 +662,11 @@ fieldset.rows .inputnote { top : -1px; } -.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { +.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active, .tabs-nav span.a { background-position : inherit; outline: 0; /* prevent dotted border in Firefox */ } -.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active { +.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active, .tabs-nav span.a { background-position: inherit; } @@ -677,7 +678,7 @@ fieldset.rows .inputnote { background-color : #FFFFCC; } -.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { +.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active, .tabs-nav span.a { background : none; outline: 0; /* prevent dotted border in Firefox */ } @@ -695,7 +696,7 @@ fieldset.rows .inputnote { margin-top : 1em; } -.toptabs .tabs-nav a { +.toptabs .tabs-nav a, .toptabs .tabs-nav span.a { top: 0; } @@ -703,7 +704,7 @@ fieldset.rows .inputnote { margin-right : .5em; } -.toptabs .tabs-nav li a { +.toptabs .tabs-nav li a, .toptabs .tabs-nav li span.a { background-color : #F3F3F3; border-top : 1px solid #E8E8E8; border-left : 1px solid #E8E8E8; @@ -717,7 +718,7 @@ fieldset.rows .inputnote { background-color : #FFF; } -.toptabs .tabs-nav li.tabs-selected a { +.toptabs .tabs-nav li.tabs-selected a, .toptabs .tabs-nav li.tabs-selected span.a { background-color : #FFF; border-top : 1px solid #E8E8E8; border-left : 1px solid #E8E8E8; @@ -941,26 +942,4 @@ div.first fieldset { div.results { padding : .7em 0; - } - - #section-nav ul { - margin : .5em 0 .5em 2px; - padding : 0; - } - - #section-nav ul li { - display : inline; - list-style-type : none; - } - - #section-nav ul li a { - background-color : #d2e9f5; - border : 1px solid #69C; - padding : 2px 3px; - text-decoration : none; - } -<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css - -======= - ->>>>>>> Correcting invalid markup in new YUI autocomplete search feature; Correcting and updating markup in guided reports.:koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css + } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc new file mode 100644 index 0000000000..9abda17b3d --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc @@ -0,0 +1,21 @@ +
+ +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index d39631b9bd..f7dc3670c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -13,4 +13,5 @@
  • Export bibs/holdings
  • Import patrons
  • Patrons (anonomize, bulk-delete)
    • +
  • Task Scheduler
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl index eac69fa619..20c5dde7a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl @@ -14,12 +14,14 @@
    - -
    + + +

    Dictionary

    Use the dictionary to define custom criteria for reporting.

    +

    Current Terms

    Filter By Area - - - +

    @@ -54,66 +54,89 @@ Filter By Area
    +  -

    Add New Definition

    -

    1 Name | 2 Area | 3 Columns | 4 Values

    - - - - - - - - - -
    Definition Name:
    Definition Description:
    +
    +
      +
    • Step 1: Name
      • +
    • Step 2: Area
      • +
    • Step 3: Columns
      • +
    • Step 4: Values
      • +
    +
    +
    Add New Definition
      +
    1. + + +
      2. +
    2. + + +
      3. +
    - - +
    +
    +
    +
    -

    Add New Definition

    - -

    1 Name | 2 Area | 3 Columns | 4 Values

    +
    +
      +
    • Step 1: Name
      • +
    • Step 2: Area
      • +
    • Step 3: Columns
      • +
    • Step 4: Values
      • +
    +
    - +
    +Add New Definition +
    1. " /> " /> -Select table - - - +
      2. +
    +
    +
    +
    +

    Add New Definition

    - -

    1 Name | 2 Area | 3 Columns | 4 Values

    +
    +
      +
    • Step 1: Name
      • +
    • Step 2: Area
      • +
    • Step 3: Columns
      • +
    • Step 4: Values
      • +
    +
    " /> " /> -"> / +" /> - - - + "> @@ -125,21 +148,30 @@ Select table - + + +
    - - + +
    +
    +

    Add New Definition

    - -

    1 Name | 2 Area | 3 Columns | 4 Values

    +
    +
      +
    • Step 1: Name
      • +
    • Step 2: Area
      • +
    • Step 3: Columns
      • +
    • Step 4: Values
      • +
    +
    " /> " /> @@ -206,6 +238,8 @@ align : "Tl"
    +
    +
    @@ -217,19 +251,20 @@ align : "Tl"

    Confirm Definition

    - - - - - - - - - - - - - +
    1. +Name: + +
      2. +
    2. +Description: + +
      3. +
    3. +Area: + +
    + +
  • Name:
    Description:
    Area:
    @@ -240,17 +275,14 @@ align : "Tl" -
    Columns Values
    + -" /> +
    " /> - +
    - - -
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl index 3df4892677..4b1caa0b2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl @@ -83,14 +83,16 @@ reports

    Choose the report to run from the list

    - + - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl index 8986afa191..8c56253da2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl @@ -1,9 +1,12 @@ +Koha › Tools › Task Scheduler + + - +
    @@ -13,14 +16,16 @@
    - + -
    Report NameTypeNotesSaved ResultsSaved SQLDeleteReport NameTypeNotesSaved ResultsSaved SQL 
    &phase=Run%20this%20report">
    "> &phase=Show%20SQL">Show SQL&phase=Run%20this%20report">Run this Report">Schedule this Report &phase=Delete%20Saved">Delete
    - - - - - - - - - - - - - - - -
    Current server time is
    Time +
  • + -
    		•  @@ -69,62 +74,62 @@ - -
    Report - -
    Output Format -
    Email - -
    -
    + + +
  • + + +
    • + +
    -

    Jobs already entered

    +

    Jobs already entered

    - +
    - +     - - + + -"> +" /> - -
    Date/Time Action  
     
    + +
    +
    -- 2.39.2