From: Paul Poulain <paul.poulain@biblibre.com>
Date: Tue, 16 Feb 2010 20:46:52 +0000 (+0100)
Subject: MT 2348 : acqui-home minor improvements
X-Git-Tag: v3.02.00-alpha2~353
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=c26b6957b59b0ef623c7cb5a0c62e7fd9a9a3e6c;p=koha.git

MT 2348 : acqui-home minor improvements

- moving some links to the left part of koha (currencies and suggestions)
- removed currency table
- changing supplier display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
---

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index 8ce7d001fe..f8cb78e79b 100755
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -25,8 +25,6 @@ acqui-home.pl
 =head1 DESCRIPTION
 
 this script is the main page for acqui/
-It presents the budget's dashboard, another table about differents currency with
-their rates and the pending suggestions.
 
 =head1 CGI PARAMETERS
 
@@ -74,7 +72,6 @@ my @results = GetBudgets($homebranch);
 my $count = scalar @results;
 my $branchname = GetBranchName($homebranch);
 
-#my $count = scalar @results;
 my $classlist   = '';
 my $total       = 0;
 my $totspent    = 0;
@@ -86,8 +83,6 @@ my @loop_budget = ();
 # ---------------------------------------------------
 # currencies
 my $cur;
-my @rates = GetCurrencies();
-$count = scalar @rates;
 
 my $active_currency = GetCurrency;
 my $num;
@@ -110,15 +105,6 @@ if ( $cur_format eq 'FR' ) {
     );
 }
 
-my @loop_currency = ();
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my %line;
-    $line{currency}        = $rates[$i]->{'currency'} ;
-    $line{currency_symbol} = $rates[$i]->{'symbol'};
-    $line{rate}            = sprintf ( '%.2f',  $rates[$i]->{'rate'} );
-    push @loop_currency, \%line;
-}
-
 # suggestions
 my $status           = $query->param('status') || "ASKED";
 my $suggestion       = CountSuggestion($status);
@@ -189,7 +175,6 @@ $template->param(
     classlist     => $classlist,
     type          => 'intranet',
     loop_budget   => \@loop_budget,
-    loop_currency => \@loop_currency,
     active_symbol => $active_currency->{'symbol'},
     branchname    => $branchname,
     budget        => $period->{budget_name},
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 75fd20f114..f50eefb601 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
@@ -1,6 +1,10 @@
 <ul>
 	<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
+    <li><!-- TMPL_IF name="suggestion" --> <a href="/cgi-bin/koha/suggestion/suggestion.pl"><!--TMPL_VAR NAME="suggestion" --> suggestions waiting</a>
+        <!-- TMPL_ELSE --> <a href="/cgi-bin/koha/suggestion/suggestion.pl">No suggestions waiting</a> <!-- /TMPL_IF -->
+    </li>
 	<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a></li>
 	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
 	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
+     <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></li>
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index 4760c9c8a0..932cefc5b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -43,16 +43,6 @@
     <!-- /TMPL_IF -->
     </fieldset>
 </div>
-<div id="acqui_acqui_home_suggestions">
-    <fieldset>
-    <legend>Pending suggestions</legend>
-        <!-- TMPL_IF name="suggestion" -->
-            <!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a>
-        <!-- TMPL_ELSE -->
-            <p>No suggestions waiting</p>
-        <!-- /TMPL_IF -->
-    </fieldset>
-</div>
 </div>
 
 <div class="yui-u">
@@ -110,42 +100,6 @@
     </table>
     </div>
     <!-- /TMPL_IF -->
-
-    <div id="acqui_acqui_home_currency">
-    <!-- TMPL_IF NAME="loop_currency" -->
-        <h3>Exchange rates</h3>
-        <form action="/cgi-bin/koha/acqui/currency.pl">
-        <table>
-            <tr>
-                <th>Currency</th>
-                <th>Symbol</th>
-                <th>Rate</th>
-                <th>&nbsp;</th>
-            </tr>
-            <!-- TMPL_LOOP name="loop_currency" -->
-                <tr>
-                    <td align='center'><!-- TMPL_VAR name="currency" --></td>
-                    <td align='center'><!-- TMPL_VAR name="currency_symbol" --></td>
-                    <td>
-                            <input type="hidden" name="type" value="change" />
-                            <input type="text" size="10" value="<!-- TMPL_VAR name="rate" -->" />
-                    </td>
-
-
-
-
-
-                    <td><input type="submit" value="Save" /></td>
-                </tr>
-            <!-- /TMPL_LOOP -->
-        </table>
-        </form>
-    <!-- TMPL_ELSE -->
-        <a href="/cgi-bin/koha/admin/currency.pl?op=add_form" class="button">
-        Add Currency
-        </a>
-    <!-- /TMPL_IF -->
-    </div>
 </div>
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index a5d5f56fb9..61fea49252 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -146,37 +146,29 @@ if (f.company.value == "") {
     <h1><!-- TMPL_VAR NAME="name" --></h1>
         <div class="yui-g">
             <div id="supplier-company-details" class="yui-u first">
-                <h3>Supplier details</h3>
-                <div class="rows">
-                    <ol>
-                        <li><span class="label">Company Name: </span><!-- TMPL_VAR NAME="name" --></li>
-                        <li><span class="label">Postal Address: </span><!-- TMPL_VAR NAME="postal" --></li>
-                        <li><span class="label">Physical Address: </span><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></li>
-                        <li><span class="label">Phone: </span><!-- TMPL_VAR NAME="phone" --></li>
-                        <li><span class="label">Fax: </span><!-- TMPL_VAR NAME="fax" --></li>
-                        <!-- TMPL_IF NAME="url" -->
-                            <li><span class="label">Web site: </span><a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></li>
-                        <!-- /TMPL_IF -->
-                    </ol>
-                </div>
+                <h2>Supplier details</h2>
+                <p><span class="label">Company Name: </span><!-- TMPL_VAR NAME="name" --></p>
+                <p><span class="label">Postal Address: </span><!-- TMPL_VAR NAME="postal" --></p>
+                <p><span class="label">Physical Address: </span><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></p>
+                <p><span class="label">Phone: </span><!-- TMPL_VAR NAME="phone" --></p>
+                <p><span class="label">Fax: </span><!-- TMPL_VAR NAME="fax" --></p>
+                <!-- TMPL_IF NAME="url" -->
+                    <p><span class="label">Web site: </span><a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a></p>
+                <!-- /TMPL_IF -->
             </div>
             <div id="supplier-contact-details" class="yui-u">
-                <h3>Contact details</h3>
-                <div class="rows">
-                    <ol>
-                        <li><span class="label">Contact name: </span><!-- TMPL_VAR NAME="contact" --></li>
-                        <li><span class="label">Position: </span><!-- TMPL_VAR NAME="contpos" --></li>
-                        <li><span class="label">Phone: </span><!-- TMPL_VAR NAME="contphone" --></li>
-                        <li><span class="label">Alternative phone: </span><!-- TMPL_VAR NAME="contaltphone" --></li>
-                        <li><span class="label">Fax: </span><!-- TMPL_VAR NAME="contfax" --></li>
-                        <!-- TMPL_IF NAME="contemail" -->
-                            <li><span class="label">Email: </span><a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></li>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="contnotes" -->
-                            <li><span class="label">Notes: </span><!-- TMPL_VAR NAME="contnotes" --></li>
-                        <!-- /TMPL_IF -->
-                    </ol>
-                </div>
+                <h2>Contact details</h2>
+                <p><span class="label">Contact name: </span><!-- TMPL_VAR NAME="contact" --></p>
+                <p><span class="label">Position: </span><!-- TMPL_VAR NAME="contpos" --></p>
+                <p><span class="label">Phone: </span><!-- TMPL_VAR NAME="contphone" --></p>
+                <p><span class="label">Alternative phone: </span><!-- TMPL_VAR NAME="contaltphone" --></p>
+                <p><span class="label">Fax: </span><!-- TMPL_VAR NAME="contfax" --></p>
+                <!-- TMPL_IF NAME="contemail" -->
+                    <p><span class="label">Email: </span><a href="mailto:<!-- TMPL_VAR NAME="contemail" -->"><!-- TMPL_VAR NAME="contemail" --></a></p>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="contnotes" -->
+                    <p><span class="label">Notes: </span><!-- TMPL_VAR NAME="contnotes" --></p>
+                <!-- /TMPL_IF -->
             </div>
         </div>
         <div id="supplier-ordering-information" class="yui-g">
@@ -202,17 +194,17 @@ if (f.company.value == "") {
             <!-- TMPL_IF NAME="notes" --><p><strong>Notes: </strong>
                 <!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
         </div>
-
-                <!-- TMPL_IF name="contracts" -->
-		    <h3>Contract(s)</h3>
-                    <table>
-                        <tr>
-                            <th scope="col">Name</th>
-                            <th scope="col">Description</th>
-                            <th scope="col">Start date</th>
-                            <th scope="col">End date</th>
-                            <th scope="col" colspan="2">&nbsp; </th>
-                        </tr>
+        <!-- TMPL_IF name="contracts" -->
+            <div id="supplier-contracts" class="yui-g">
+                <h2>Contract(s)</h2>
+                <table>
+                    <tr>
+                        <th scope="col">Name</th>
+                        <th scope="col">Description</th>
+                        <th scope="col">Start date</th>
+                        <th scope="col">End date</th>
+                        <th scope="col" colspan="2">&nbsp; </th>
+                    </tr>
                     <!-- TMPL_LOOP NAME="contracts" -->
                         <!-- TMPL_IF NAME="__even__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                         <td>
@@ -226,7 +218,8 @@ if (f.company.value == "") {
                         </tr>
                     <!-- /TMPL_LOOP -->
                 </table>
-                <!-- /TMPL_IF -->
+            </div>
+        <!-- /TMPL_IF -->
 
 <!--/TMPL_IF-->