Tried to get these working like other CSS-ified pages

diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl
index e24abf8..fd2ae03 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl
@@ -1,86 +1,79 @@
 <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
-
-<table align=right cellpadding=10><tr><td>
-<a class="button" href=circulation.pl>
+<div id="mainbloc">
+<div class="bloc25">
+<a class="button" href="circulation.pl">
 Next Borrower</a>
-<a class="button" href=returns.pl>
+<a class="button" href="returns.pl">
 Returns</a>
-</td></tr></table>
+</div>
 
-<h1>Circulation: Transfers</h1><br>
+<h1>Circulation: Transfers</h1>
 <b>Branch:</b> <!-- TMPL_VAR Name="genbrname" --> &nbsp;
-<b>Printer:</b> <!-- TMPL_VAR Name="genprname" --><br>
+<b>Printer:</b> <!-- TMPL_VAR Name="genprname" -->
 <a href=selectbranchprinter.pl class="button">Change Settings</a>
-<input type=hidden name=branch value=<!-- TMPL_VAR Name="branch" -->>
-<input type=hidden name=printer value=<!-- TMPL_VAR Name="printer" -->>
+<input type="hidden" name="branch" value="<!-- TMPL_VAR Name="branch" -->">
+<input type="hidden" name="printer" value="<!-- TMPL_VAR Name="printer" -->">
 
 <!-- TMPL_IF Name="found" -->
-       <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-       <tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Reserve Found</font></th></tr>
-       <tr><td> <font color='red' size='+2'>
-               <!-- TMPL_IF Name="reserved" -->Reserved:</font> reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
-               <!-- TMPL_IF Name="waiting" --> Item marked Waiting:</font><br>
-    Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<br><!-- /TMPL_IF -->
-               <table border=1 cellpadding=5 cellspacing=0>
-               <tr><td>
-                       <!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
-                       <!-- TMPL_IF Name="waiting" -->Cancel reservation and then attempt transfer: <!-- /TMPL_IF -->
-               </td>
-               <td>
-                       <form method=post action='branchtransfers.pl'>
+       <table>
+       <tr><th>Reserve Found</th></tr>
+       <tr><td><!-- TMPL_IF Name="reserved" -->Reserved: reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,"Member", 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
+               <!-- TMPL_IF Name="waiting" --> Item marked Waiting:<br>
+    Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,"Member", 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<br><!-- /TMPL_IF -->
+
+<p>                    
+
+                       <form method="post" action="branchtransfers.pl"><!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
+                       <!-- TMPL_IF Name="waiting" --><strong>Cancel reservation and then attempt transfer:</strong> <!-- /TMPL_IF -->
                                <!-- TMPL_LOOP Name="trsfitemloop" -->
-                                       <input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-                                       <input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
-                                       <input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+                                       <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->">
+                                       <input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->">
+                                       <input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->">
                                <!-- /TMPL_LOOP -->
-                               <input type=hidden name=itemnumber value=<!-- TMPL_VAR Name="itemnumber" -->>
-                               <input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
-                               <!-- TMPL_IF Name="waiting" --><input type=hidden name=barcode value=<!-- TMPL_VAR Name="barcode" -->>
-                                       <input type=hidden name=request value='KillWaiting'>
-                                       <input type=submit value="Cancel">
+                               <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->">
+                               <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->">
+                               <!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->">
+                                       <input type="hidden" name="request" value="KillWaiting">
+                                       <input type="submit" value="Cancel" class="button">
                                <!-- /TMPL_IF -->
-                               <!-- TMPL_IF Name="reserved" --><input type=hidden name=request value='SetWaiting'>
-                                       <input type=submit value="Waiting"><!-- /TMPL_IF -->
-                       </form>
-               </td></tr>
-               <!-- TMPL_IF Name="reserved" --><tr><td>Cancel reservation and then attempt transfer:</td>
-                       <td>
-                       <form method=post action='branchtransfers.pl'>
+                               <!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
+                                       <input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
+                       </form></p>
 
+               <!-- TMPL_IF Name="reserved" --><p>
+                       <form method="post" action="branchtransfers.pl">
+<strong>Cancel reservation and then attempt transfer:</strong>
                        <!-- TMPL_LOOP Name="trsfitemloop" -->
-                               <input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-                               <input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
-                               <input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+                               <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->">
+                               <input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->">
+                               <input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->">
                        <!-- /TMPL_LOOP -->
 
-                       <input type=hidden name=biblionumber value=<!-- TMPL_VAR Name="biblionumber" -->>
-                       <input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
-                       <input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobranchcd" -->>
-                       <input type=hidden name=barcode value=<!-- TMPL_VAR Name="barcode" -->>
-                       <input type=hidden name=request value='KillReserved'>
-                       <input type=submit value="Cancel">
-                       </form>
+                       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
+                       <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->">
+                       <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->">
+                       <input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->">
+                       <input type="hidden" name="request" value="KillReserved">
+                       <input type="submit" value="Cancel" class="button">
+                       </form></p>
                <!-- /TMPL_IF -->
-               </td></tr>
-               <tr><td>Ignore and return to transfers: </td>
-                       <td>
-                       <form method=post action='branchtransfers.pl'>
-                       <input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobranchcd" -->>
-                       <input type=hidden name=barcode value=0>
+<p>
+                       <form method="post" action="branchtransfers.pl"><strong>Ignore and return to transfers:</strong> 
+                       <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->">
+                       <input type="hidden" name="barcode" value="0">
                        <!-- TMPL_LOOP Name="trsfitemloop" -->
-                               <input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-                               <input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
-                               <input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
+                               <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->">
+                               <input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->">
+                               <input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->">
                        <!-- /TMPL_LOOP -->
-                       <input type=submit value="Ignore">
-                       </form>
-                       </td>
-               </tr></table>
+                       <input type="submit" value="Ignore" class="button">
+                       </form></p>
+
        </td></tr></table>
 
 <!-- TMPL_ELSE -->
-       <table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-       <tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Messages</font></th></tr>
+       <table>
+       <tr><th>Messages</th></tr>
        <tr><td>
        <!-- TMPL_IF Name="reqmessage" -->
                <!-- TMPL_IF Name="cancelled" -->
@@ -91,8 +84,7 @@ Returns</a>
                <!-- /TMPL_IF -->
        <!-- /TMPL_IF -->
        <!-- TMPL_LOOP Name="errmsgloop" -->
-               <font color='red' size='+2'>
-               <!-- TMPL_IF Name="errbadcode" -->
+                               <!-- TMPL_IF Name="errbadcode" -->
                        No Item with barcode: <!-- TMPL_VAR Name="msg" -->
                <!-- /TMPL_IF -->
                <!-- TMPL_IF Name="errispermanent" -->
@@ -102,60 +94,48 @@ Returns</a>
                        Item is already at destination branch.
                <!-- /TMPL_IF -->
                <!-- TMPL_IF Name="errwasreturned" -->
-                       Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
-onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>
+                       Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
+onclick="openWindow(this,"Member", 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>
 <!-- TMPL_VAR Name="name" --> and has been returned.
                <!-- /TMPL_IF -->
-               </font>
-               <BR>
-       <!-- /TMPL_LOOP -->
+       <!-- /TMPL_LOOP -->&nbsp;
        </td></tr></table>
-       <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=24 height=24>
-       <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
-       <table border=1 cellpadding=5 cellspacing=0 align=left>
-       <tr><td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-       <font color=black><b>Select Branch</b></font></td></tr>
-       <tr><td>Destination Branch:</td>
-               <td><select name=tobranchcd>
+
+       <form method="post" action="/cgi-bin/koha/circ/branchtransfers.pl">
+       <p><b>Select Destination Branch: </b><select name="tobranchcd">
                        <!-- TMPL_LOOP Name="branchoptionloop" -->
-                               <option value=<!-- TMPL_VAR Name="code" --> <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --> <br>
+                               <option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --></option>
                        <!-- /TMPL_LOOP -->
-               </select></td></tr></table>
-
-       <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=24 height=50 align=left>
+               </select></p>
 
-       <table border=1 cellpadding=5 cellspacing=0 ><tr>
-       <td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-       <font color=black><b>Enter Book Barcode</b></font></td></tr>
-       <tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr>
-       </table>
-       <input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobrancd" -->>
+       <p><b>Enter Item Barcode:</b> Item Barcode: <input name="barcode" size="10">
+       <input type="hidden" name=tobranchcd value=<!-- TMPL_VAR Name="tobrancd" -->>
 
        <!-- TMPL_LOOP Name="trsfitemloop" -->
-               <input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-               <input type=hidden name=fb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="frombrcd" -->>
-               <input type=hidden name=tb-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="tobrcd" -->>
-       <!-- /TMPL_LOOP -->
+               <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->">
+               <input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->">
+               <input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->">
+       <!-- /TMPL_LOOP --></p>
 
        </form>
        <!-- TMPL_IF Name="transferred" -->
                <p>
-               <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-               <tr><th colspan=6  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font color=black>Transfered Items</font></th></tr>
-               <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
+               <table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
+               <tr><th colspan="6">Transfered Items</th></tr>
+               <tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
                <!-- TMPL_LOOP Name="trsfitemloop" -->
-                       <tr><td align=center bgcolor=<!-- TMPL_VAR Name="color" -->>
-                       <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR Name="barcode" --></a></td>
-                       <td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="title" --></td>
-                       <td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="author" --></td>
-                       <td align=center bgcolor=<!-- TMPL_VAR Name="color" --> ><!-- TMPL_VAR Name="itemtype" --></td>
-                       <td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="frbrname" --></td>
-                       <td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="tobrname" --></td>
+                       <tr><td align="center" bgcolor="<!-- TMPL_VAR Name="color" -->">
+                       <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, "Item", 480, 640); return false;"><!-- TMPL_VAR Name="barcode" --></a></td>
+                       <td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
+                       <td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+                       <td align="center" bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="itemtype" --></td>
+                       <td align="center" bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="frbrname" --></td>
+                       <td align="center" bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="tobrname" --></td>
                        </tr>
                <!-- /TMPL_LOOP -->
                </table>
        <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
-
+</div>
 <!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
index 0251d15..e92651a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl
@@ -1,42 +1,37 @@
 <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
-<h1>Circulation: Select Printer and Branch Settings</h1><br>
+<div id="mainbloc">
+<h1>Circulation: Select Printer and Branch Settings</h1>
 
-<center>
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 cellpadding=5 cellspacing=0>
-<tr><td colspan=2 bgcolor=<!-- TMPL_VAR Name="headerbackgroundcolor" --> align=center background=<!-- TMPL_VAR Name="backgroundimage" -->>
-<font color=black><b>Please Set Branch and Printer</b></font></td></tr>
-<tr><td>
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+<p>
 <!--branchselection-->
 <!-- TMPL_IF Name="onebranch" -->
-Branch: <!-- TMPL_VAR Name="branchname" --><br>
+<b>Branch:</b> <!-- TMPL_VAR Name="branchname" -->
 <!-- TMPL_ELSE -->
-       <select name=branch>
+<b>Please Set Branch:</b>
+       <select name="branch">
        <!-- TMPL_LOOP Name="branchloop" -->
-               <option value=<!-- TMPL_VAR Name="value" --><!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+               <option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" --></option>
        <!-- /TMPL_LOOP -->
        </select>
-<!-- /TMPL_IF -->
-</td>
-<td>
-<!--printerselection-->
+<!-- /TMPL_IF --></p>
+
+<p><!-- printerselection -->
 <!-- TMPL_IF Name="oneprinter" -->
-Printer: <!-- TMPL_VAR Name="printername" --><br>
+<b>Printer:</b> <!-- TMPL_VAR Name="printername" -->
 <!-- TMPL_ELSE -->
-       <select name=printer>
+<b>Please Set Printer:</b>
+       <select name="printer">
        <!-- TMPL_LOOP Name="printerloop" -->
-               <option value=<!-- TMPL_VAR Name="value" --><!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+               <option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" --></option>
        <!-- /TMPL_LOOP -->
        </select>
-<!-- /TMPL_IF -->
-</td></tr>
-</table>
-<input type="hidden" name="setcookies" value=1>
-<input type="submit" value="Submit" type="changesettings">
+<!-- /TMPL_IF --></p>
+<p><input type="hidden" name="setcookies" value="1">
+<input type="submit" value="Submit" type="changesettings" class="button"></p>
 </form>
-</center>
-
 
+</div>
 <!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->