From 86576e7fd234999df3a35493cb997f6d23d72949 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 30 Jan 2011 09:42:18 -0500 Subject: [PATCH] Revised fix for Bug 3850 - Budget Planning Pages Need Design Work - Filter moved to left-hand sidebar consistent with other pages - Export option moved to left-hand sidebar to improve visibility - Show/hide column controls moved to their own role with clear labels - "Locked" icon added to replace indicating locked status by row color Signed-off-by: Nicole Engard Signed-off-by: Chris Cormack --- .../prog/en/includes/acquisitions-menu.inc | 2 +- .../prog/en/modules/admin/aqplan.tmpl | 225 +++++++++--------- 2 files changed, 119 insertions(+), 108 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 392a6c52bc..7b6f196282 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -2,7 +2,7 @@
  • Late orders
  • Suggestions
    • -
  • Budgets & Funds
    • +
  • Budgets & Funds
  • Currencies
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl index 2192178f3a..46ab6d7b6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl @@ -1,8 +1,8 @@ -Koha › Administration › Budgets › Budget planning +Koha › Administration › Budgets › Funds › Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --> - + - + @@ -86,60 +86,26 @@ YAHOO.util.Event.onAvailable("popmenu", function () { -
    - -
    - -"/> -
    -Planning for by - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - -
    - - - - - - -
    -
    - -
    + +

    Planning for by

    - +

    Currency = . + + Each cell contain both actual and estimated values. + + Cells contain estimated values only. + +

    No active currency is defined

    Please specify an active currency.

    + +

    Each cell contain both actual and estimated values.

    + +

    Cells contain estimated values only.

    + + @@ -149,38 +115,43 @@ YAHOO.util.Event.onAvailable("popmenu", function () { - - + - - - + + + + + + + + + + + - - - - - + + + + - + @@ -191,15 +162,15 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
    " style="text-align: center;" - class="" > + " class=""> - " style="text-align: center; - display:none;" - class="" > + " styl="display:none;" class=""> -  ', '')" > -   Fund remaining - + Fund remaining 
      "> + + [ show a column ] 
    class="locked" title="Fund locked">&budget_period_id=">">  -   -
    - + - @@ -212,32 +183,32 @@ YAHOO.util.Event.onAvailable("popmenu", function () { - -
    +   - " /> + " value="" /> - " id='budget_' class='plan_entry_' onchange="calcTotalRow(this);" /> + " value="" id="budget_" class="plan_entry_" onchange="calcTotalRow(this);" />
    + - + - + - + + "> - + "> - + "> -   +  
    - + ')" value="Auto-fill row"/> @@ -249,19 +220,14 @@ YAHOO.util.Event.onAvailable("popmenu", function () { - - Each cell contain both actual and estimated values.
    - - Cells contain estimated values only.
    - - + - +
    -
    +
    @@ -274,28 +240,73 @@ YAHOO.util.Event.onAvailable("popmenu", function () { + +
    No funds to display for this search criteria
    + + + +
    +
    +
    +
    -
    +
    +

    Filter

    + +
      +
    1. + + +
      2. +
    2. + + + + + + +
      3. + +
    3. + + + + + + +
      4. + + +
    4. + + + + + + +
      5. +
    +
    +
    +
    + + +
    +

    Export

    +
      -
    1. -
      3. +
    3. -     - +
      4. +
    +
    " /> - - +
    + - -No funds to display for this search criteria - - - -
    - -
    -- 2.39.5