synch'ing 2.2 and head

diff --git a/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl b/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl
index 79b3e6b..a5057ef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl
@@ -1,47 +1,39 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
-
-<!-- The manual invoice and credit buttons -->
-
-<h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
-<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
-&nbsp;
-<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
-<center>
-<p>
-
-<!-- The table with the account items -->
-
-<table  cellspacing="0"  cellpadding="5" border="1" >
-
-  <tr valign="top">
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="2"><b>FINES &amp; CHARGES</td>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>AMOUNT</td>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>STILL OWING</td>
-  </tr>
-
-  <!-- TMPL_LOOP NAME="accounts" -->
-
-    <tr valign="top">
-      <td><!-- TMPL_VAR NAME="date" --></td>
-      <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
-      <td><!-- TMPL_VAR NAME="amount" --></td>
-      <td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
-    </tr>
-
-  <!-- /TMPL_LOOP -->
-
-  <tr valign="top">
-    <td></td>
-    <td colspan="2"><b>Total Due</b></td>
-    <td><b><!-- TMPL_VAR NAME="total" --></b></td>
-  </tr>
-
-</table>
-
-<br clear="all">
-<p> &nbsp; </p>
-
-<!-- endmenu (member) -->
-
+<div id="mainbloc">
+       <!-- The manual invoice and credit buttons -->
+       
+       <h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
+       <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
+       &nbsp;
+       <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
+       <!-- The table with the account items -->
+       
+       <table>
+       
+       <tr>
+               <th>FINES &amp; CHARGES</th>
+               <th>AMOUNT</th>
+               <th>STILL OWING</th>
+       </tr>
+       
+       <!-- TMPL_LOOP NAME="accounts" -->
+       
+               <tr>
+               <td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
+               <td><!-- TMPL_VAR NAME="amount" --></td>
+               <td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
+               </tr>
+       
+       <!-- /TMPL_LOOP -->
+       
+       <tr>
+               <th>Total Due</th>
+               <th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
+       </tr>
+       
+       </table>
+       
+       <!-- endmenu (member) -->
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 

diff --git a/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
index a32f2ff..97aaede 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
@@ -42,6 +42,15 @@
                        if (!(layer = MM_findObj('Hint' + item))) return;
                        layer.style.visibility = 'hidden';
                }
+               function addauthority() {
+                       X = document.forms["f"].authtype.value;
+                       window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+               }
+               function searchauthority() {
+                       X = document.forms["f"].authtype2.value;
+                       Y = document.forms["f"].value.value;
+                       window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+               }
        </script>
        <script language="javascript" type="text/javascript">
        var blnOk=true;
@@ -114,14 +123,83 @@
                <div id="Hint3" class="hint">
                        <h1 class="acquisition">Acquisitions</h1>
                        Order items, receive orders, set budgets...
+                       <form action="/cgi-bin/koha/acqui/order.pl" method="post">
+                       Supplier name : <input type="text"  size="25"   name="supplier">
+                       <input type="submit" class="button acquisition" value="OK">
+                       </form>
+                       <p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+                       
                </div>
                <div id="Hint4" class="hint">
                        <h1 class="reports">Reports</h1>
                        All the system reports
+                       <div id="bloc25">
+                       <h2 class="reports">Stats</h2>
+                       <ul>
+                       <li>on catalogue
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+                       <li>on issues
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+                       </ul>
+                       </div>
+                       <div id="bloc25">
+                       <h2 class="reports">Stat wizards</h2>
+                       <table>
+                       <tr>
+                       <td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+                       <td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+                       </tr>
+                       <tr>
+                       <td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+                       <td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+                       </tr>
+                       </table>
+                       </div>
+                       <div id="bloc25">
+                       <h2 class="reports">Top Lists</h2>
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+                               <p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+                       </div>
                </div>
+               
                <div id="Hint5" class="hint">
-                       <h1 class="reports">Authorities</h1>
+                       <h1 class="authority">Authorities</h1>
                        Authorities management &amp; searches
+                       <form name="f" >
+                               <h2 >
+                                       <select name="authtype">
+                                       <!-- TMPL_LOOP NAME="authtypesloop" -->
+                                               <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                                                       <!-- TMPL_VAR NAME="authtypetext" -->
+                                               </option>
+                                       <!-- /TMPL_LOOP -->
+                                       </select>
+                                       <a href="javascript:addauthority()" class="authority">Add Authority</a>
+                               </h2>
+                               <h2>Search 
+                               <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+                               in
+                                       <select name="authtype2">
+                                       <!-- TMPL_LOOP NAME="authtypesloop" -->
+                                               <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                                                       <!-- TMPL_VAR NAME="authtypetext" -->
+                                               </option>
+                                       <!-- /TMPL_LOOP -->
+                                       </select>
+                               </h2>
+                               <input type="hidden" name="marclist" value="">
+                               <input type="hidden" name="and_or" value="and">
+                               <input type="hidden" name="excluding" value="">
+                               <input type="hidden" name="operator" value="contains">
+                               <input type="hidden" name="op" value="do_search">
+                               <img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+                               <a href="javascript:searchauthority()" class="authority">
+                                       Search
+                               </a>
+                       </form>
                </div>
                <div id="Hint6" class="hint">
                        <h1 class="parameters">Parameters</h1>
@@ -132,6 +210,22 @@
                <div id="Hint7" class="hint">
                        <h1 class="circulation">Circulation</h1>
                        Work at the front desk on Issues and returns using only a barcode reader and a mouse
+                               <h2 class="circulation">
+                                       Issue
+                               </h2>
+                               <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+                                       <p>Enter borrower card number or partial last name <input name="findborrower">
+                                       <input type="submit" value="OK" class="button circulation"></p>
+                               </form>
+                               <h2 class="circulation">
+                                       Return
+                               </h2>
+                               <form method="post" action="/cgi-bin/koha/circ/returns.pl">
+                               <p>Enter Book Barcode</p>
+                               <label class="label20">Item Barcode:</label><input name="barcode" size="10">
+                               <input type="submit" value="OK" class="button circulation">
+                               </form>
+
                </div>
 <!-- MAIN MENU -->
                <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" class="acquisition" onMouseOver="SetOn(3);">Acquisitions</a><br/>

diff --git a/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl b/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl
index 5e1f865..0cd2be5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl
@@ -1,22 +1,20 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
-
-<Center><h3>Manual Credit</h3></center>
-<form action="/cgi-bin/koha/mancredit.pl" method="post">
-<table cellpadding="2" cellspacing="0" border="0">
-<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-<tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
-<tr><td><b>Type</b></td><Td>
-<select name="type">
-<option value="C">Credit</option>
-<option value="BAY">Baycorp Adjustment</option>
-<option value="WORK">Worked off</option>
-</select>
-</td></tr>
-<tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
-<tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
-<tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
-<tr><td><input type="submit" name="add" value="Add"></td></tr>
-</table>
-</form>
-
+<div id="mainbloc">
+       <h1 class="member">Manual Credit</h1>
+       <form action="/cgi-bin/koha/mancredit.pl" method="post">
+               <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+               <p><label class="label100">Borrowernumber</label><!-- TMPL_VAR NAME="bornum" --></p>
+               <p><label class="label100">Type</label>
+                       <select name="type">
+                               <option value="C">Credit</option>
+                               <option value="BAY">Baycorp Adjustment</option>
+                               <option value="WORK">Worked off</option>
+                       </select>
+               </p>
+               <p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
+               <p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
+               <p><label class="label100">Amount</label><input type="text" name="amount"></p>
+               <p><input type="submit" name="add" value="Add" class="button"></p>
+       </form>
+</div>
 <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl
index 644281c..8c82c87 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
-
-<Center><h3>Manual Invoice</h3></center>
-<form action="/cgi-bin/koha/maninvoice.pl" method="post">
-<table cellpadding="2" cellspacing="0" border="0">
-<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
-<tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
-<tr><td><b>Type</b></td><Td>
-<select name="type">
-<option value="L">Lost Item</option>
-<option value="F">Fine</option>
-<option value="A">Account Management Fee</option>
-<option value="N">New Card</option>
-<option value="M">Sundry</option>
-<option value="REF">Cash Refund</option>
-</select>
-</td></tr>
-<tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
-<tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
-<tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
-<tr><td><input type="submit" name="add" value="Add"></td></tr>
-</table>
-</form>
-
+<div id="mainbloc">
+       <h1 class="member">Manual Invoice</h1>
+       <form action="/cgi-bin/koha/maninvoice.pl" method="post">
+       <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+       <p><label class="label100">Borrowernumber </label><!-- TMPL_VAR NAME="bornum" --></p>
+       <p>
+               <label class="label100"><b>Type</label>
+               <select name="type">
+                       <option value="L">Lost Item</option>
+                       <option value="F">Fine</option>
+                       <option value="A">Account Management Fee</option>
+                       <option value="N">New Card</option>
+                       <option value="M">Sundry</option>
+                       <option value="REF">Cash Refund</option>
+               </select>
+       </p>
+       <p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
+       <p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
+       <p><label class="label100">Amount</label><input type="text" name="amount"></p>
+       <p><label class="label100"><input type="submit" class="button" name="add" value="Add"></p>
+       </table>
+       </form>
+</div>
 <!-- TMPL_INCLUDE Name="members-bottom.inc" -->