From 61fe808ba85324618d855bfda3ee8ec4fb3f0f19 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 6 Dec 2010 10:01:02 -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 --- .../prog/en/modules/admin/aqplan.tmpl | 225 ++++++++++--------- 1 files changed, 118 insertions(+), 107 deletions(-) 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 2192178..5e30fa8 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. +
  3. + + + + + + +
  4. + +
  5. + + + + + + +
  6. + + +
  7. + + + + + + +
  8. +
+
+
+
+ + +
+

Export

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