Bugzilla – Attachment 2808 Details for
Bug 3850
Budget Planning Pages Need Design Work
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Revised for current HEAD
0001-Revised-fix-for-Bug-3850-Budget-Planning-Pages-Need-.patch (text/plain), 16.08 KB, created by
Owen Leonard
on 2010-12-06 15:38:03 UTC
(
hide
)
Description:
Revised for current HEAD
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2010-12-06 15:38:03 UTC
Size:
16.08 KB
patch
obsolete
>From 61fe808ba85324618d855bfda3ee8ec4fb3f0f19 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> >-<title>Koha › Administration › Budgets › Budget planning</title> >+<title>Koha › Administration › Budgets › Funds › Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> > <!-- TMPL_INCLUDE NAME="calendar.inc" --> >-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/acq.js"></script> >+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/acq.js"></script> > <script type="text/javascript"> > //<![CDATA[ > // --------------------------------------------------------------------- >@@ -64,7 +64,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > }); > //]]> > </script> >- >+<style type="text/css">td.locked { background-image: url('/intranet-tmpl/prog/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 4% 50%; } a.control { font-size:85%;text-decoration:none; }</style> > </head> > <body> > <!-- TMPL_INCLUDE NAME="header.inc" --> >@@ -86,60 +86,26 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > > <!-- TMPL_INCLUDE NAME="budgets-admin-toolbar.inc" --> > >-<br /> >- >-<form method="post" id='Aform' name="Aform" action="/cgi-bin/koha/admin/aqplan.pl"> >- >-<input type="hidden" id="budget_period_id" name="budget_period_id" value="<!-- TMPL_VAR NAME="budget_period_id" -->"/> >-<fieldset style=" border:2px solid #EEEEEE; " > >-<legend>Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></legend> >- <table class="invis" > >- <tr><td> >- <!-- TMPL_IF NAME="show_mine" --> >- <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" /> >- <!-- TMPL_ELSE --> >- <input type="checkbox" id="show_mine" name="show_mine" value="1" /> >- <!-- /TMPL_IF --> >- <label for="show_mine">Show my funds only</label> >- </td> >- <td> >- <label for="authcat" > Select planning type:</label> >- <!-- TMPL_VAR NAME="authcat_dropbox" --> >- <input type="submit" name="option_submit" value="Select" /> >- </td> >- </tr> >- >- <tr><td> >- <!-- TMPL_IF NAME="show_active" --> >- <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" /> >- <!-- TMPL_ELSE --> >- <input type="checkbox" id="show_active" name="show_active" value="1" /> >- <!-- /TMPL_IF --> >- <label for="show_active">Show active funds only</label> >- </td> >- <td></td> >- </tr> >- >- <tr><td> >- <!-- TMPL_IF NAME="show_actual" --> >- <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" /> >- <!-- TMPL_ELSE --> >- <input type="checkbox" id="show_actual" name="show_actual" value="1" /> >- <!-- /TMPL_IF --> >- <label for="show_actual">Show actual/estimated values:</label> >- </td> >- <td></td> >- </tr> >- </table> >-</fieldset> >- >-<br /> >+<form method="post" id="Aform" name="Aform" action="/cgi-bin/koha/admin/aqplan.pl"> >+<h3>Planning for <!-- TMPL_VAR NAME="budget_period_description" --> by <!-- TMPL_VAR NAME="authcat" --></h3> > > <!-- Budget Lines --> > > <!-- TMPL_IF NAME="budget_lines" --> > >- <!-- TMPL_INCLUDE NAME="budgets-active-currency.inc" --> >+ <!-- TMPL_IF name="currency" --><p><b>Currency = <!-- TMPL_VAR name="currency" --></b>. >+ <!-- TMPL_IF NAME="show_actual" --> >+ <b>Each cell contain both actual and estimated values.</b> >+ <!-- TMPL_ELSE --> >+ <b>Cells contain estimated values only.</b> >+ <!-- /TMPL_IF --> >+ </p><!-- TMPL_ELSE --><div class="dialog alert"><h3>No active currency is defined</h3><p>Please <a href="/cgi-bin/koha/admin/currency.pl">specify an active currency</a>.</p></div> >+<!-- TMPL_IF NAME="show_actual" --> >+ <p><b>Each cell contain both actual and estimated values.</b></p> >+ <!-- TMPL_ELSE --> >+ <p><b>Cells contain estimated values only.</b></p> >+ <!-- /TMPL_IF --> >+ <!-- /TMPL_IF --> > > <table id="plan" width="100%"> > <thead> >@@ -149,38 +115,43 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > > <!-- TMPL_LOOP NAME="authvals_row" --> > <!-- TMPL_IF NAME="display" --> >- <th id="<!-- TMPL_VAR NAME="code" -->" style="text-align: center;" >- class="<!-- TMPL_VAR NAME='colnum' -->" > >+ <th id="col<!-- TMPL_VAR NAME="code" -->" class="<!-- TMPL_VAR NAME="colnum" -->"> > <!-- TMPL_ELSE --> >- <th id="<!-- TMPL_VAR NAME="code" -->" style="text-align: center; >- display:none;" >- class="<!-- TMPL_VAR NAME='colnum' -->" > >+ <th id="col<!-- TMPL_VAR NAME="code" -->" styl="display:none;" class="<!-- TMPL_VAR NAME="colnum" -->"> > <!-- /TMPL_IF --> > >- <!-- TMPL_VAR NAME="code" --> <span class="buttonPlus" onclick="delColumn('<!-- TMPL_VAR NAME="colnum" -->', '<!-- TMPL_VAR NAME="code" -->')" > - </span></th> >- >+ <!-- TMPL_VAR NAME="code" --></th> > <!-- /TMPL_LOOP --> > >- <th>Fund remaining</th> >- >- <th id='popmenu' style=" text-align: center;" > >- <span id="add_popmenu_item" class="buttonPlus" > + </span></th> >+ <th>Fund remaining</th><th> </th> > </tr> >+ <tr> >+ <th> </th><th> </th> >+ <!-- TMPL_LOOP NAME="authvals_row" --> >+ <!-- TMPL_IF NAME="display" --> >+ <th class="<!-- TMPL_VAR NAME="colnum" -->"> >+ <!-- TMPL_ELSE --> >+ <th style="display:none;" class="<!-- TMPL_VAR NAME="colnum" -->"> >+ <!-- /TMPL_IF --> >+ >+ <a class="control" onclick="delColumn('<!-- TMPL_VAR NAME="colnum" -->', 'col<!-- TMPL_VAR NAME="code" -->')" href="#" title="Hide this column">[ hide ]</a></th> >+ >+ <!-- /TMPL_LOOP --> >+ <th id="popmenu"><a style="font-size:85%;text-decoration:none;" id="add_popmenu_item" href="#" title="Show a hidden column">[ show a column ]</a></th><th> </th> >+ </tr> >+ > </thead> > > <tbody> > <!-- TMPL_LOOP NAME="budget_lines" --> >- <!-- TMPL_IF Name="budget_lock" --> >- <tr class="highlight" > >- <!--TMPL_ELSE --> >- <tr > >- <!--/TMPL_IF --> >+ <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS --> >+ >+ <td align="left"<!-- TMPL_IF NAME="budget_lock" --> class="locked" title="Fund locked"<!-- /TMPL_IF -->><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=<!-- TMPL_VAR NAME="budget_id" -->&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"><!-- TMPL_VAR NAME="budget_name_indent"--></a></td> >+ <td><span id="budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->"><!-- TMPL_VAR NAME="budget_amount_formatted"--> </span> > >- <td align='left'><!-- TMPL_VAR NAME="budget_name_indent"--></td> >- <td align='right'><span id='budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount_formatted"--> </span> > > <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS --> >- <div style="display:none;" id='budget_tot_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount"--></div></td> >+ <div style="display:none;" id="budget_tot_<!-- TMPL_VAR NAME="budget_id" -->"><!-- TMPL_VAR NAME="budget_amount"--></div></td> > > <!-- TMPL_LOOP NAME="lines" --> > <!-- TMPL_IF NAME="display" --> >@@ -191,15 +162,15 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > <table class="invis" width="100%"> > <tr> > <!-- TMPL_IF Name="show_actual" --> >- <td width="50%" align="right" ><!-- TMPL_VAR NAME="actual_amount" --></td> >+ <td width="50%" ><!-- TMPL_VAR NAME="actual_amount" --></td> > <!--/TMPL_IF --> >- <td align="right"> >+ <td> > > <!--TMPL_IF Name="budget_lock" --> > <!-- TMPL_VAR NAME="estimated_amount" --> >- <input type="hidden" style="text-align: right;" name='<!-- TMPL_VAR NAME="cell_name"-->' value="<!-- TMPL_VAR NAME="estimated_amount" -->" /> >+ <input type="hidden" style="text-align: right;" name="<!-- TMPL_VAR NAME="cell_name"-->" value="<!-- TMPL_VAR NAME="estimated_amount" -->" /> > <!--TMPL_ELSE --> >- <input type="text" style="text-align: right; width:90%; " size='6' name='<!-- TMPL_VAR NAME="cell_name"-->' value="<!-- TMPL_VAR NAME="estimated_amount" -->" id='budget_<!-- TMPL_VAR NAME="budget_id"--><!-- TMPL_VAR NAME="colnum"-->' class='plan_entry_<!-- TMPL_VAR NAME="budget_id"-->' onchange="calcTotalRow(this);" /> >+ <input type="text" style="text-align: right; width:90%; " size="6" name="<!-- TMPL_VAR NAME="cell_name"-->" value="<!-- TMPL_VAR NAME="estimated_amount" -->" id="budget_<!-- TMPL_VAR NAME="budget_id"--><!-- TMPL_VAR NAME="colnum"-->" class="plan_entry_<!-- TMPL_VAR NAME="budget_id"-->" onchange="calcTotalRow(this);" /> > <!--/TMPL_IF --> > > </td></tr> >@@ -212,32 +183,32 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > <tr> > <!-- TMPL_IF Name="show_actual" --> > <!-- TMPL_IF NAME="act_negative" --> >- <td width="50%" align="right" style="color: red;"> >+ <td width="50%" style="color: red;"> > <!-- TMPL_ELSIF NAME="act_positive" --> >- <td width="50%" align="right" style="color: green;"> >+ <td width="50%" style="color: green;"> > <!-- TMPL_ELSE --> >- <td width="50%" align="right"> >+ <td width="50%"> > <!--/TMPL_IF --> > <!-- TMPL_VAR NAME="budget_act_remain"--> > <!-- TMPL_ELSE --> >- <td width="50%" align="right"> >+ <td width="50%"> > <!-- /TMPL_IF --> > </td> > > <!-- TMPL_IF NAME="est_negative" --> >- <td width="50%" align="right" style="color: red;" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> >+ <td width="50%" style="color: red;" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->"> > <!-- TMPL_ELSIF NAME="est_positive" --> >- <td width="50%" align="right" style="color: green;" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> >+ <td width="50%" style="color: green;" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->"> > <!-- TMPL_ELSE --> >- <td width="50%" align="right" id='budget_est_<!-- TMPL_VAR NAME="budget_id"-->'> >+ <td width="50%" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->"> > <!--/TMPL_IF --> >- <!-- TMPL_VAR NAME="budget_est_remain"--> >+ <!-- TMPL_VAR NAME="budget_est_remain"--> > </td> > </tr> > </table> > </td> > >- <td align="center"> >+ <td> > <!-- TMPL_UNLESS Name="budget_lock" --> > <input type="button" onclick="autoFillRow('<!-- TMPL_VAR NAME="budget_id"-->')" value="Auto-fill row"/> > <!-- TMPL_ELSE --> >@@ -249,19 +220,14 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > </tbody> > </table> > >- <!-- TMPL_IF NAME="show_actual" --> >- <span><b>Each cell contain both actual and estimated values.</b></span><br /> >- <!-- TMPL_ELSE --> >- <span><b>Cells contain estimated values only.</b></span><br /> >- <!-- /TMPL_IF --> > <!-- TMPL_IF name="budget_period_locked" --> >- <!-- <input STYLE="background: gray;" type="submit" value="Save" disabled='disabled'/> --> >+ <!-- <input STYLE="background: gray;" type="submit" value="Save" disabled="disabled"/> --> > <!-- TMPL_ELSE --> >- <input type="button" onclick="Check(this.form)" value="Save"/> >+ <fieldset class="action"><input type="button" onclick="Check(this.form)" value="Save"/></fieldset> > <!-- /TMPL_IF --> > > >-<div id='hide_div'> >+<div id="hide_div"> > <!-- TMPL_LOOP NAME="authvals_row" --> > > <!-- TMPL_UNLESS Name="display" --> >@@ -274,28 +240,73 @@ YAHOO.util.Event.onAvailable("popmenu", function () { > > </form> > >+ <!-- TMPL_ELSE --> >+<div class="dialog message">No funds to display for this search criteria</div> >+ <!-- /TMPL_IF --> >+ >+ >+</div> >+</div> >+<div class="yui-b"> >+ > <form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> >-<fieldset class="rows"> >+<fieldset class="brief"> >+<h4>Filter</h4> >+ >+<ol> >+ <li> >+ <label for="authcat"> Select planning type:</label> >+ <!-- TMPL_VAR NAME="authcat_dropbox" --> >+ </li> >+ <li class="radio"> >+ <!-- TMPL_IF NAME="show_mine" --> >+ <input type="checkbox" id="show_mine" name="show_mine" value="1" checked="checked" /> >+ <!-- TMPL_ELSE --> >+ <input type="checkbox" id="show_mine" name="show_mine" value="1" /> >+ <!-- /TMPL_IF --> >+ <label for="show_mine">Show my funds only</label> >+ </li> >+ >+ <li class="radio"> >+ <!-- TMPL_IF NAME="show_active" --> >+ <input type="checkbox" id="show_active" name="show_active" value="1" checked="checked" /> >+ <!-- TMPL_ELSE --> >+ <input type="checkbox" id="show_active" name="show_active" value="1" /> >+ <!-- /TMPL_IF --> >+ <label for="show_active">Show active funds only</label> >+ </li> >+ >+ >+ <li class="radio"> >+ <!-- TMPL_IF NAME="show_actual" --> >+ <input type="checkbox" id="show_actual" name="show_actual" value="1" checked="checked" /> >+ <!-- TMPL_ELSE --> >+ <input type="checkbox" id="show_actual" name="show_actual" value="1" /> >+ <!-- /TMPL_IF --> >+ <label for="show_actual">Show actual/estimated values</label> >+ </li> >+ </ol> >+<fieldset class="action"> >+ <input type="submit" name="option_submit" value="Submit" /></fieldset> >+</fieldset> >+</form> >+<!-- TMPL_IF NAME="budget_lines" --> >+<form method="post" action="/cgi-bin/koha/admin/aqplan.pl"> >+<h4>Export</h4> >+<fieldset class="brief"> > <ol> >- <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /> >- <label class="inline" for="MIME">Into an application >+ <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" /></li> >+ <li><label class="inline" for="MIME">Into an application > </label><!-- TMPL_VAR NAME="CGIextChoice" --> >- <!-- TMPL_VAR NAME="CGIsepChoice" --> >- <input type="submit" value="Output"/> >+ <!-- TMPL_VAR NAME="CGIsepChoice" --></li> >+ </ol> >+ <fieldset class="action"> <input type="submit" value="Submit"/> > <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" /> >- <input type="hidden" name="output" value="file" /> >- </li></ol> >+ <input type="hidden" name="output" value="file" /></fieldset> > </fieldset> > </form> >+<!-- /TMPL_IF --> > >- <!-- TMPL_ELSE --> >-No funds to display for this search criteria >- <!-- /TMPL_IF --> >- >- >-</div> >-</div> >-<div class="yui-b"> > <!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" --> > </div> > </div> >-- >1.7.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3850
:
2226
|
2227
|
2228
|
2277
|
2278
|
2808
|
3042