From e04586d2f6aaf594699192f6cd2935892c333885 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 4 Nov 2007 16:23:53 -0600 Subject: [PATCH] Correction to include in bookfund.tmpl; Formatting input form in systempreferences.tmpl; Tweaking markup and formatting of guided reports interface. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 12 +++ .../prog/en/includes/guided-reports-view.inc | 10 ++ .../prog/en/modules/acqui/bookfund.tmpl | 2 +- .../en/modules/admin/systempreferences.tmpl | 46 ++++----- .../prog/en/modules/reports/dictionary.tmpl | 94 +++++++++---------- .../modules/reports/guided_reports_start.tmpl | 39 ++++---- .../prog/en/modules/reports/reports-home.tmpl | 10 +- 7 files changed, 117 insertions(+), 96 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.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 2c031fd494..6deb475329 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -51,6 +51,10 @@ h6 { font-weight : bold; } +h1,h2,h3,h4,h5,h6 { + margin : .3em 0; +} + p { margin: .5em 0 .5em 0; } @@ -542,6 +546,14 @@ fieldset.rows label, fieldset.rows span.label { text-align: right; } +.yui-b fieldset.rows label, .yui-b fieldset.rows span.label { + width: 9em; +} + +.yui-u fieldset.rows label, .yui-u fieldset.rows span.label { + width: 6em; +} + fieldset.rows.left label, fieldset.rows.left span.label { width : 8em; text-align : left; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc new file mode 100644 index 0000000000..65ab896dfa --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/guided-reports-view.inc @@ -0,0 +1,10 @@ +
Build and Run Reports
+ +
Reports Dictionary
+ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl index 3d0601cded..c8596525ed 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/bookfund.tmpl @@ -58,7 +58,7 @@
- +
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl index 8918406996..f17cce0fa9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl @@ -76,19 +76,18 @@ - -

Modify a system preference

- -

Add a system preference

- -
" name="Aform" method="post"> - - - - - - -
" />
">
+ " name="Aform" method="post"> + +
+ Modify a system preference + + Add a system preference +
    +
  1. " />
    2. +
"> + +
  • @@ -110,16 +109,21 @@ ON OFF -
    • -

    Save ChangesAdd this Preference"> '; return false;" />

    + + +
    Save ChangesAdd this Preference"> '; return false;" />
    -

    Koha internal

    - Note: you should have no reasons to modify the following default values - - - -
    " size="40" maxlength="40"> (Choice, YesNo, Integer, Textarea, Float, Themes, Languages, or ClassSource)
    " size="60" maxlength="80" />(a choice list for Choice (separated by |) or cols|rows for Texarea)
    +
    + Koha internal +
    Note: you should have no reasons to modify the following default values
    +
      + +
      (Choice, YesNo, Integer, Textarea, Float, Themes, Languages, or ClassSource)
      + " size="40" maxlength="40"> + +
      (a choice list for Choice (separated by |) or cols|rows for Texarea)
      + " size="60" maxlength="80" /> +
    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 6a1d1b5fa6..eac69fa619 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl @@ -1,6 +1,5 @@ -Koha -- Reports - +Koha › Reports › Guided Reports › Dictionary @@ -30,8 +29,8 @@ Filter By Area - - + +
    @@ -40,6 +39,7 @@ Filter By Area + @@ -48,9 +48,9 @@ Filter By Area @@ -74,8 +74,8 @@ Filter By Area
    Description Area Definition 
    -"> - - +" /> + +
    - - + + @@ -84,16 +84,16 @@ Filter By Area -"> -"> + +" /> +" /> Select table - + @@ -102,11 +102,11 @@ Select table "> -"> -"> +" /> +" /> +"> / - @@ -126,13 +126,13 @@ Select table - + - - + + - - + + @@ -141,32 +141,32 @@ Select table "> -"> -"> -"> +" /> +" /> +" /> +" />

    -"> +" /> -_value"> + - - + + - - + + -
    _all" value="all">All Dates
    _all" value="all" />All Dates ORDate Range
    +    		Date Range
    -
    Start of Date Range_start_value" name="_start_value" value="" > +_start_value" name="_start_value" value="" /> /lib/calendar/cal.gif" id="buttonfrom1" style="cursor: pointer;" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl index 78da6cf8df..166bb41475 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl @@ -7,15 +7,13 @@ -
    +
    -
    - -

    Reports

    +

    Reports

    Guided Report Wizard

      @@ -54,10 +52,6 @@
    -
    -
    -
    -
    -- 2.39.5