* bugfixes

* adding buttons to switch between normal and MARC view of a record
* adding graphic buttons in templates

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
index b2d56d4..cf4d85b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -1,4 +1,4 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
+<TMPL_INCLUDE NAME="cat-top.inc">
 
 <STYLE TYPE="text/css" MEDIA=screen>
        table { font-family:Arial;

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
index 1a3f722..a553a95 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
@@ -1,35 +1,23 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
+<TMPL_INCLUDE NAME="cat-top.inc">
 <STYLE TYPE="text/css" MEDIA=screen>
        table { font-family:Arial;
        font-weight:normal;
        text-decoration:none;
        font-size:10pt;}
 </STYLE>
-
+<br /><br />
 <form method="post" action="additem.pl" name="f">
-<table width=100% cellspacing=0 cellpadding=5 border=1>
+<input type="hidden" name="op" value="<TMPL_VAR name="op">">
+<input type="hidden" name="bibid" value="<TMPL_VAR name="bibid">">
+<table width="80%" align="center" cellspacing=0 cellpadding=5 border=1>
 <tr background="/images/background-mem.gif">
-       <th>MARC biblio : <TMPL_VAR name="bibid"></th>
-</tr>
-<tr>
        <td>
-       <table width=100% border=0 colspacing=0 cellpadding=0>
-       <tr>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=10% align="center">
-                       <input type="hidden" name="op" value="<TMPL_VAR name="op">">
-                       <input type="hidden" name="bibid" value="<TMPL_VAR name="bibid">">
-                       </td>
-       </tr>
+       <table width="100%" border=0 cellpadding=0 cellspacing=0>
+               <tr>
+                       <td width=8%><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"></td>
+                       <td width=8%><a href="../detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
+                       <td align="center"><b>MARC biblio : <TMPL_VAR name="bibid"></b></td>
+               </tr>
        </table>
        </td>
 </tr>
@@ -37,12 +25,12 @@
 <br />
 <center>
 <DIV name="10XX" id="10XX">
-<table border=1 cellspacing=0 cellpadding=5 width=100%>
+<table border=1 cellspacing=0 cellpadding=5 width=80%>
        <tr  background="/images/background-mem.gif">
                <th>Existing items</th>
        </tr>
 </table>
-<table border=1 cellspacing=0 cellpadding=0 width=100%>
+<table border=1 cellspacing=0 cellpadding=0 width=80%>
        <tr  background="/images/background-mem.gif">
                <TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP><th colspan=2>&nbsp;</th>
        </tr>
@@ -55,11 +43,11 @@
 </table>
 </DIV>
 <br /><br />
-<table border=1 cellspacing=0 cellpadding=5 width=100%>
+<table border=1 cellspacing=0 cellpadding=5 width=80%>
        <tr  background="/images/background-mem.gif">
                <th>New Item</th>
        </tr>
-</table><table width=100%  cellspacing=0 cellpadding=1 border=0>
+</table><table width=80%  cellspacing=0 cellpadding=1 border=0>
        <TMPL_LOOP name="item">
        <tr>
                <td width="3%">&nbsp;</td>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
index 3652c40..616920f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl
@@ -31,7 +31,7 @@ Received By: <TMPL_VAR name="user"><br>
        <CENTER>
        <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
                <tr valign=top bgcolor=#99cc33>
-                       <td background="/images/background-mem.gif" colspan=2>
+                       <td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2>
                                <B>CATALOGUE DETAILS</B>
                        </td>
                </tr>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
index d94aa46..a225fa6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl
@@ -67,7 +67,7 @@ win.document.write("</font></body></html>");
        <input type=hidden name="<TMPL_VAR name="currency">" value="<TMPL_VAR name="rate">">
 </TMPL_LOOP>
 <TMPL_IF name="orderexists"><input type=hidden name=orderexists value=yes></TMPL_IF>
-<a href=basket.pl?basket=<TMPL_VAR name="basket">><img src=/images/view-basket.gif width=187 heigth=42 border=0 align=right alt="View Basket"></a>
+<a href=basket.pl?basket=<TMPL_VAR name="basket">><img src=<TMPL_VAR name="themelang">/images/view-basket.gif width=187 heigth=42 border=0 align=right alt="View Basket"></a>
 <FONT SIZE=6><em><TMPL_VAR name="ordnum"> - Order Details </em></FONT><br>
 Shopping Basket For: <TMPL_VAR name="name">
 <P>
@@ -110,7 +110,7 @@ Shopping Basket For: <TMPL_VAR name="name">
                <td><input type=text size=20 name=barcode value="<TMPL_VAR name="barcode">"></td>
        </tr>
 </table>
-<img src="/images/holder.gif" width=32 height=250 align=left>
+<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=32 height=250 align=left>
 <table border=1 cellspacing=0 cellpadding=5 width="40%">
        <tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
        <TR VALIGN=TOP>
@@ -153,7 +153,7 @@ Shopping Basket For: <TMPL_VAR name="name">
                <td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
        </tr>
        <TR VALIGN=TOP>
-               <TD colspan=2><input type=image  name=submit src=/images/add-order.gif border=0 width=187 height=42 align=right>        </td>
+               <TD colspan=2><input type=image  name=submit src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 align=right>     </td>
        </tr>
 </table>
 </form>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
index 0111bbf..2c91705 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl
@@ -1,6 +1,6 @@
 <TMPL_INCLUDE name="acquisitions-top.inc">
 <FONT SIZE=6><em>Supplier Search Results</em></FONT><br />
-<a href=supplier.pl?id=0><input type=image src="/<TMPL_VAR name="theme">/images/filenew.png" title="Add supplier" ALT="Add" BORDER=0 ></a>
+<a href=supplier.pl?id=0><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add supplier" ALT="Add" BORDER=0 ></a>
 <CENTER>
 You searched on <b>supplier <TMPL_VAR name="supplier">,</b> <TMPL_VAR name="count"> results found<p>
 <table border=0 cellspacing=0 cellpadding=5 width="80%">
@@ -23,10 +23,10 @@ You searched on <b>supplier <TMPL_VAR name="supplier">,</b> <TMPL_VAR name="coun
 <TMPL_LOOP name="loop_suppliers">
        <tr valign=top bgcolor=<TMPL_VAR name="color">>
                <td>
-                       <a href="basket.pl?id=<TMPL_VAR name="id">"><input type=image src="/<TMPL_VAR name="theme">/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
+                       <a href="basket.pl?id=<TMPL_VAR name="id">"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
                </td>
                <td>
-                       <a href="recieveorder.pl?id=<TMPL_VAR name="id">"><input type=image src="/<TMPL_VAR name="theme">/images/mail_get.png" title="recieve" ALT="Add" BORDER=0 ></a>
+                       <a href="recieveorder.pl?id=<TMPL_VAR name="id">"><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_get.png" title="recieve" ALT="Add" BORDER=0 ></a>
                </td>
                <td><a href="supplier.pl?id=<TMPL_VAR name="id">"><TMPL_VAR name="name"></a></td>
                <td>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
index 12be7e9..c6cf505 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl
@@ -73,5 +73,3 @@ Received By: <TMPL_VAR name="user"><br>
        </tr>
 </table>
 </CENTER>
-
-THEMELANG :<TMPL_VAR name="themelang">
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
index 01cdcb7..a755142 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl
@@ -1,4 +1,5 @@
 <TMPL_INCLUDE NAME="cat-top.inc">
+
 <STYLE TYPE="text/css" MEDIA=screen>
        table { font-family:Arial;
        font-weight:normal;
@@ -6,27 +7,48 @@
        font-size:10pt;}
 </STYLE>
 
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="/images/background-mem.gif">
-       <th>MARC biblio : <TMPL_VAR name="bibid"></th>
-</tr>
+<table width="100%" cellspacing=0 cellpadding=5>
 <tr>
+       <td width="80%">
+               <table width=100% cellspacing=0 cellpadding=5 border=1>
+               <tr background="/images/background-mem.gif">
+                       <td>
+                       <table width="100%" border=0 cellpadding=0 cellspacing=0>
+                               <tr>
+                                       <td width=8%><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"></td>
+                                       <td width=8%><a href="detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
+                                       <td align="center"><b>MARC biblio : <TMPL_VAR name="bibid"></b></td>
+                               </tr>
+                       </table>
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan=3>
+                       <table width=100% border=0 colspacing=0 cellpadding=0>
+                       <tr>
+                               <td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(1)" ><div id="link1">1</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(2)"><div  id="link2">2</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(3)"><div  id="link3">3</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(4)"><div  id="link4">4</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(5)"><div  id="link5">5</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(6)"><div  id="link6">6</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
+                               <td width=9% align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
+                               <td width=10% align="center"><a href="javascript:active(10)"><div  id="link10">Item</div></a></td>
+                       </tr>
+                       </table>
+                       </td>
+               </tr>
+               </table>
+       </td>
        <td>
-       <table width=100% border=0 colspacing=0 cellpadding=0>
-       <tr>
-               <td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(1)" ><div id="link1">1</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(2)"><div  id="link2">2</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(3)"><div  id="link3">3</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(4)"><div  id="link4">4</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(5)"><div  id="link5">5</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(6)"><div  id="link6">6</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
-               <td width=9% align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
-               <td width=10% align="center"><a href="javascript:active(10)"><div  id="link10">Item</div></a></td>
-       </tr>
-       </table>
+               <TMPL_IF NAME="norequests">
+               <TMPL_ELSE>
+                       <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
+                       src="<TMPL_VAR name="themelang">/images/requests.gif" align="right" border="0"></a>
+               </TMPL_IF>
        </td>
 </tr>
 </table>

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index fb04432..d30c671 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -1,65 +1,59 @@
 <TMPL_INCLUDE NAME="cat-top.inc">
 
-<!--
 <TMPL_IF NAME="loggedinuser">
     <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 <TMPL_ELSE>
     <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
 </TMPL_IF>
--->
 
 <TMPL_LOOP NAME="BIBLIO_RESULTS">
+       <TMPL_IF NAME="norequests">
+       <TMPL_ELSE>
+               <a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
+               src="<TMPL_VAR name="themelang">/images/requests.gif" align="right" border="0"></a>
+       </TMPL_IF>
 
-
-
-<TMPL_IF NAME="norequests">
-<TMPL_ELSE>
-<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
-src="/images/requests.gif" align="right" border="0"></a>
-</TMPL_IF>
-
-<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
-<TMPL_VAR NAME="class"></em></font><p>
-<!-- FIXME - "callpadding" should be "cellpadding", right? -->
-<table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
-<tr valign="top">
-
-<td bgcolor="#cccc99" background="/images/background-mem.gif">
-<b>BIBLIO RECORD</b>
-
-
-
-
-<TMPL_VAR NAME="biblionumber">
-</td>
-</tr>
-<tr valign="top">
-<td>
-<form action="/cgi-bin/koha/modbib.pl" method="post">
-<input type="hidden" name="bibnum" value="<TMPL_VAR NAME="biblionumber">">
-<input type="image" name="submit" value="modify" height="42" width="93"
-border="0" src="/images/modify-mem.gif">
-<input type="image" name="delete" value="delete" height="42" width="93"
-border="0" src="/images/delete-mem.gif">
-</form>
-<br>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Subtitle:</b> <TMPL_VAR NAME="subtitle"><br>
-<b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR
-NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a><br>
-<b>Additional Author:</b> <TMPL_VAR NAME="additional"><br>
-<b>Series Title:</b> <TMPL_VAR NAME="seriestitle"><br>
-<b>Subject:</b> <TMPL_VAR NAME="subject"><br>
-<b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
-<b>Notes:</b> <TMPL_VAR NAME="notes"><br>
-<b>Unititle:</b> <TMPL_VAR NAME="unititle"><br>
-<b>Serial:</b> <TMPL_VAR NAME="serial"><br>
-<b>Total Number of Items:</b> <TMPL_VAR NAME="count">
-<p>
-</font></td>
-</tr>
-</table>
+       <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
+       <TMPL_VAR NAME="class"></em></font><p>
+       <table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
+       <!-----------------BIBLIO RECORD TABLE--------->
+       <tr valign="top">
+               <td bgcolor="#cccc99" background="/images/background-mem.gif">
+                       <b>BIBLIO RECORD <TMPL_VAR NAME="biblionumber"></b>
+               </td>
+       </tr>
+       <tr valign="top">
+               <td>
+                       <form action="/cgi-bin/koha/modbib.pl" method="post">
+                       <table width="100%" border=0 cellspacing=0 cellpadding=0>
+                               <tr>
+                                       <td width="33%">
+                                               <input type="hidden" name="bibnum" value="<TMPL_VAR NAME="biblionumber">">
+                                               <input type="image" name="submit" value="modify" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>
+                                       </td>
+                                       <td width="33%"><input type="image" name="delete" value="delete" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0"></td>
+                                       <td width="33%"><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">">MARC</a></td>
+                               </tr>
+                       </table>
+                       </form>
+                       <br>
+                       <FONT SIZE=2  face="arial, helvetica">
+                       <b>Subtitle:</b> <TMPL_VAR NAME="subtitle"><br>
+                       <b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR
+                       NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a><br>
+                       <b>Additional Author:</b> <TMPL_VAR NAME="additional"><br>
+                       <b>Series Title:</b> <TMPL_VAR NAME="seriestitle"><br>
+                       <b>Subject:</b> <TMPL_VAR NAME="subject"><br>
+                       <b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
+                       <b>Notes:</b> <TMPL_VAR NAME="notes"><br>
+                       <b>Unititle:</b> <TMPL_VAR NAME="unititle"><br>
+                       <b>Serial:</b> <TMPL_VAR NAME="serial"><br>
+                       <b>Total Number of Items:</b> <TMPL_VAR NAME="count">
+                       <p>
+                       </font>
+               </td>
+       </tr>
+       </table>
 </TMPL_LOOP>
 <!-- FIXME - The help box overflows on the right. I think this is
      because it is specified as "width=70%", which the browser
@@ -71,59 +65,60 @@ NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a><br>
 
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor="#cccc99" background="/images/background-mem.gif">
-<td>Item Type</td>
-<td>Class</td>
-<td>Location</td>
-<td>Date Due</td>
-<td>Last Seen</td>
-<td>Barcode</td>
-<td>Volume</td>
-</tr>
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td><a href=/cgi-bin/koha/search.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="class"></a></td>
-<td><TMPL_VAR NAME="branchname"></td>
-<td><TMPL_VAR NAME="datedue"></td>
-<td><TMPL_VAR NAME="datelastseen"></td>
-<td><a href="/cgi-bin/koha/moredetail.pl?type=<TMPL_VAR NAME="type">&item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_VAR NAME="barcode"></a></td>
-<td><TMPL_VAR NAME="volumeddesc"></td>
-<TMPL_IF NAME="type">
-<td><a href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<TMPL_VAR
-NAME="biblioitemnumber">&item=<TMPL_VAR NAME="itemtype">>Fix Itemtype</a></td>
-</TMPL_IF>
-</tr>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="WEB_RESULTS">
-<tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td>Website</td>
-<td>Online</td>
-<td>Available</td>
-<td></td>
-<td><a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR
-NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR
-NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a></td>
-</tr>
-</TMPL_LOOP>
+       <tr bgcolor="#cccc99" background="/images/background-mem.gif">
+               <td>Item Type</td>
+               <td>Class</td>
+               <td>Location</td>
+               <td>Date Due</td>
+               <td>Last Seen</td>
+               <td>Barcode</td>
+               <td>Volume</td>
+       </tr>
+       <TMPL_LOOP NAME="ITEM_RESULTS">
+               <tr>
+                       <td><TMPL_VAR NAME="itemtype"></td>
+                       <td><a href=/cgi-bin/koha/search.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="class"></a></td>
+                       <td><TMPL_VAR NAME="branchname"></td>
+                       <td><TMPL_VAR NAME="datedue"></td>
+                       <td><TMPL_VAR NAME="datelastseen"></td>
+                       <td><a href="/cgi-bin/koha/moredetail.pl?type=<TMPL_VAR NAME="type">&item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_VAR NAME="barcode"></a></td>
+                       <td><TMPL_VAR NAME="volumeddesc"></td>
+                       <TMPL_IF NAME="type">
+                               <td>
+                                       <a href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<TMPL_VAR NAME="biblioitemnumber">&item=<TMPL_VAR NAME="itemtype">>Fix Itemtype</a>
+                               </td>
+                       </TMPL_IF>
+               </tr>
+       </TMPL_LOOP>
+       <TMPL_LOOP NAME="WEB_RESULTS">
+               <tr>
+                       <td><TMPL_VAR NAME="itemtype"></td>
+                       <td>Website</td>
+                       <td>Online</td>
+                       <td>Available</td>
+                       <td></td>
+                       <td>
+                               <a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a>
+                       </td>
+               </tr>
+       </TMPL_LOOP>
 </table>
 <p>
 <table border="0" cellspacing="0" cellpadding="5" width=70%>
-<tr valign="top">
-<td bgcolor="99cc33" background="/images/background-mem.gif"
-colspan="2"><p><b>HELP</b><br>
-<b>Update Biblio for all Items:</b> Click on the <b>Modify</b>
-      button [left] to amend the biblio.  Any changes you make will update
-the record for <b>all</b> the items listed above. <p>
-<b>Updating the Biblio for only ONE or SOME Items:</b>
-If some of the items listed above need a different biblio, or are on the
-wrong biblio, you must use the
-<a
-href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>
-process to fix this. You will need to "re-order" the items, and delete them
-from this biblio.
-<p /></tr>
+       <tr valign="top">
+               <td bgcolor="99cc33" background="/images/background-mem.gif" colspan="2">
+                       <p><b>HELP</b><br>
+                       <b>Update Biblio for all Items:</b> Click on the <b>Modify</b>
+                       button [left] to amend the biblio.  Any changes you make will update
+                       the record for <b>all</b> the items listed above. <p>
+                       <b>Updating the Biblio for only ONE or SOME Items:</b>
+                       If some of the items listed above need a different biblio, or are on the
+                       wrong biblio, you must use the
+                       <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">acquisitions</a>
+                       process to fix this. You will need to "re-order" the items, and delete them
+                       from this biblio.<p />
+               </td>
+       </tr>
 </table>
 </center>
 <br clear=all>

diff --git a/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl b/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl
index 17d9f61..3090944 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl
@@ -7,11 +7,11 @@
 <table border="0" cellspacing="0" cellpadding="5">
 <tr valign="top">
 <td>Author</td>
-<td><input type="text" name="author" value="<TMPL_VAR Name="author">"></td>
+<td><input type="text" name="author" value="<TMPL_VAR Name="author" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Title</td>
-<td><input type="text" name="title" value="<TMPL_VAR Name="title">"></td>
+<td><input type="text" name="title" value="<TMPL_VAR Name="title" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Abstract</td>
@@ -25,39 +25,31 @@
 </tr>
 <tr valign="top">
 <td>Copyright Date</td>
-<td><input type="text" name="copyrightdate" value="<TMPL_VAR Name="copyrightdate">"></td>
+<td><input type="text" name="copyrightdate" value="<TMPL_VAR Name="copyrightdate" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Series Title</td>
-<td><input type="text" name="seriestitle" value="<TMPL_VAR Name="seriestitle">"></td>
+<td><input type="text" name="seriestitle" value="<TMPL_VAR Name="seriestitle" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Additional Author</td>
-<td><input type="text" name="additionalauthor" value="<TMPL_VAR Name="additionalauthor">"></td>
+<td><input type="text" name="additionalauthor" value="<TMPL_VAR Name="additionalauthor" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Subtitle</td>
-<td><input type="text" name="subtitle" value="<TMPL_VAR Name="subtitle">"></td>
+<td><input type="text" name="subtitle" value="<TMPL_VAR Name="subtitle" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Unititle</td>
-<td><input type="text" name="unititle" value="<TMPL_VAR Name="untitle">"></td>
+<td><input type="text" name="unititle" value="<TMPL_VAR Name="untitle" ESCAPE=HTML>"></td>
 </tr>
 <tr valign="top">
 <td>Notes</td>
-<td><textarea name="notes" cols="40" rows="4"><TMPL_VAR Name="notes"></textarea></td>
+<td><textarea name="notes" cols="40" rows="4"><TMPL_VAR Name="notes" ESCAPE=HTML></textarea></td>
 </tr>
 <tr valign="top">
 <td>Serial</td>
-<td><input type="text" name="serial" value="<TMPL_VAR Name="serial">"></td>
-</tr>
-<tr valign="top">
-<td>Analytic Author</td>
-<td><input type="text" name="analyticauthor"></td>
-</tr>
-<tr valign="top">
-<td>Analytic Title</td>
-<td><input type="text" name="analytictitle"></td>
+<td><input type="text" name="serial" value="<TMPL_VAR Name="serial" ESCAPE=HTML>"></td>
 </tr>
 </table>
 <br>
@@ -69,4 +61,4 @@ function Dopop() {
 }
 </script>
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
\ No newline at end of file
+<TMPL_INCLUDE Name="cat-bottom.inc">

diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
index 2370572..297a131 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -1,65 +1,55 @@
 <TMPL_INCLUDE Name="cat-top.inc">
 
 <form action="placerequest.pl" method=post>
-<INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=187 BORDER=0 src="/images/place-request.gif" align=right >
+<INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/place-request.gif" align=right >
 <input type=hidden name=biblio value="<TMPL_VAR Name="bib">">
 <input type=hidden name=type value=str8>
 <input type=hidden name=title value="<TMPL_VAR Name="title">">
-<FONT SIZE=6><em>Requesting: <br>
-<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="bib">><TMPL_VAR Name="bib"></a>
+<FONT SIZE=6><em>Requesting:
+<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="bib">><TMPL_VAR Name="title"></a>
 <TMPL_VAR Name="author">)</em></FONT><P>
 <p>
 
 
-
-
-
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Rank</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Member Number</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Notes</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Date</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pickup</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Request</b></TD>
-</TR>
-<tr VALIGN=TOP  >
-<td><select name=rank-request>
-<!--$priorityoptions-->
-<TMPL_LOOP Name="optionloop">
-       <option value="<TMPL_VAR Name="num">" <TMPL_IF Name="selected"> selected</TMPL_IF>>
-               <TMPL_VAR Name="num">
-       </option>
-</TMPL_LOOP>
-</select>
-</td>
-<td><input type=text size=10 name=member></td>
-<td><input type=text size=20 name=notes></td>
-<td><TMPL_VAR Name=date></td>
-<td><select name=pickup>
-<!--$branchoptions-->
-<TMPL_LOOP Name="branchloop">
-       <option value=<TMPL_VAR Name="branch"> <TMPL_IF Name="selected">selected</TMPL_IF>>
-               <TMPL_VAR Name="branchname">
-       </option>
-</TMPL_LOOP>
-
-</select></td>
-<td><input type=checkbox name=request value=any>Next Available,
-<br>(or choose from list below)</td>
-</tr></table>
-
+       <TR VALIGN=TOP>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Rank</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Member Number</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Notes</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Date</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Pickup</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Request</b></TD>
+       </TR>
+       <tr VALIGN=TOP  >
+               <td>
+                       <select name=rank-request>
+                       <!--$priorityoptions-->
+                       <TMPL_LOOP Name="optionloop">
+                               <option value="<TMPL_VAR Name="num">" <TMPL_IF Name="selected"> selected</TMPL_IF>>
+                                       <TMPL_VAR Name="num">
+                               </option>
+                       </TMPL_LOOP>
+                       </select>
+               </td>
+               <td><input type=text size=10 name=member></td>
+               <td><input type=text size=20 name=notes></td>
+               <td><TMPL_VAR Name=date></td>
+               <td><TMPL_VAR name="CGIbranch"></td>
+               <td>
+                       <input type=checkbox name=request value=any>Next Available,<br>(or choose from list below)
+               </td>
+       </tr>
+</table>
 
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 <TR VALIGN=TOP>
-
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Request</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Item Type</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Classification</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Volume</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pubdate</b></TD>
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Copies</b></TD>
+       <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Request</b></TD>
+       <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Item Type</b></TD>
+       <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Classification</b></TD>
+       <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Volume</b></TD>
+       <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Pubdate</b></TD>
+       <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Copies</b></TD>
 </TR>
 <!--$bibitemrows-->
 <TMPL_LOOP Name="bibitemloop">
@@ -98,25 +88,18 @@
 <p>&nbsp;</p>
 
 
-
-
-
 <form name=T<TMPL_VAR Name="time"> action=modrequest.pl method=post>
-
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-
        <TR VALIGN=TOP>
-
-               <td  bgcolor="99cc33" background="/images/background-mem.gif" colspan=7><B>MODIFY EXISTING REQUESTS </b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=7><B>MODIFY EXISTING REQUESTS </b></TD>
        </TR>
        <TR VALIGN=TOP>
-
-               <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Rank</b></TD>
-               <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Member</b></TD>
-               <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Notes</b></TD>
-               <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Date</b></TD>
-               <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Pickup</b></TD>
-               <td  bgcolor="99cc33" background="/images/background-mem.gif"><B>Request</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Rank</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Member</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Notes</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Date</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Pickup</b></TD>
+               <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Request</b></TD>
        </TR>
        <!--$existingreserves-->
        <TMPL_LOOP Name="reserveloop">
@@ -140,19 +123,19 @@
                        </td>
                        <td><TMPL_VAR Name="notes"></td>
                        <TD><TMPL_VAR Name="date"></td>
-                       <TD>OO <TMPL_IF Name="wait">
+                       <TD><TMPL_IF Name="wait">
                                Item waiting at <b> <TMPL_VAR Name="wbrname"></b> <input type=hidden name=pickup value=<TMPL_VAR Name="wbrcd">>
-                       <TMPL_ELSE>
-                               <select name=pickup>
-                                       <TMPL_LOOP Name="branchloop">
-                                               <option value=<TMPL_VAR Name="branch">
-                                                       <TMPL_IF Name="selected">
-                                                               selected
-                                                       </TMPL_IF>
-                                               ><TMPL_VAR Name="branchname"></option>
-                                       </TMPL_LOOP>
-                               </select>
-                       </TMPL_IF>
+                               <TMPL_ELSE>
+                                       <select name=pickup>
+                                               <TMPL_LOOP Name="branchloop">
+                                                       <option value=<TMPL_VAR Name="branch">
+                                                               <TMPL_IF Name="selected">
+                                                                       selected
+                                                               </TMPL_IF>
+                                                       ><TMPL_VAR Name="branchname"></option>
+                                               </TMPL_LOOP>
+                                       </select>
+                               </TMPL_IF>
                        </td>
                        <TD>
                                <TMPL_IF Name="wait">
@@ -175,7 +158,7 @@
        <tr VALIGN=TOP>
        <TD colspan=6 align=right>
        Delete a request by selecting "del" from the rank list.
-       <INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=64 BORDER=0 src="/images/ok.gif"></td>
+       <INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png"></td>
        </tr>
 </table>
 <P>