projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1fb6279)
Tidying up and correcting patron image embedding.
authorOwen Leonard <oleonard@myacpl.org>
Mon, 26 Nov 2007 20:59:36 +0000 (14:59 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Tue, 27 Nov 2007 01:58:16 +0000 (19:58 -0600)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl patch | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl patch | blob | history

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index cecee8e..da05e80 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,6 +1,7 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 <div class="patroninfo"><h5><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h5>
 <ul>
+<!-- TMPL_IF NAME="patronimages" --><li><img src="/intranet-tmpl/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.jpg" alt="" border="0"   style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li><!-- /TMPL_IF -->
      <!-- TMPL_IF NAME="userid" --> <li> <!-- TMPL_VAR NAME="userid" -->  </li><!--/TMPL_IF-->
                <li><!-- TMPL_IF NAME="address"-->
             <!-- TMPL_VAR NAME="address" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 6fde5f6..842aa51 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -9,10 +9,10 @@
 //<![CDATA[
         $(document).ready(function() {
                $('#patronlists').tabs();
+               verify_patron_images();
         });
 //]]>
-</script>
-<script type="text/JavaScript" language="JavaScript">
+
 // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
 function verify_patron_images() {
     for (var i = 0; i < document.images.length; i++) {
@@ -29,7 +29,7 @@ function verify_patron_images() {
 </script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 </head>
-<body onload="verify_patron_images();">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
@@ -163,7 +163,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <fieldset id="circ_circulation_issue">
     <label for="barcode">Checking out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->) </label>
        <div class="hint">Enter item barcode:</div>
-       <!-- TMPL_IF NAME="patronimages" --><img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="" border="0" /><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+       
        <input type="text" name="barcode" id="barcode" class="focus" size="14" />
 
         <!-- RESULT OF ISSUING REQUEST -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index db2c271..dd543a6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -606,12 +606,12 @@ patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" -->
                <!-- /TMPL_UNLESS -->   
 <!-- /TMPL_IF -->
     <fieldset class="action">
+        <input type="button" name="save" onclick="return check_form_borrowers();" value="Save" />
       <!-- TMPL_IF NAME="opadd" -->
-        <input type="button" name="add" onclick="return check_form_borrowers(); unique();" value="Add Patron" />
-      <!-- TMPL_ELSE -->
-        <input type="button" name="save" onclick="return check_form_borrowers();" value="Save Changes" />
-      <!--/TMPL_IF -->
-         <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
+       <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
+          <!-- TMPL_ELSE -->
+         <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Cancel</a>
+          <!-- /TMPL_IF -->
     </fieldset>
 </form>
   
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 871da42..c83255a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -61,7 +61,7 @@ function verify_patron_images() {
 
  <div class="yui-u first">
 <div id="patron-information" style="padding : .5em;">
-<!-- TMPL_IF NAME="patronimages" --><img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="" border="0" /><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="patronimages" --><img src="/intranet-tmpl/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.jpg" alt="" border="0"  style="float: right; margin: 1em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 <h3>
     <!-- TMPL_UNLESS NAME="I" -->
    <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --></h3> <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" --> <!-- TMPL_VAR NAME="othernames" --> <!-- /TMPL_IF -->  <p><!-- TMPL_VAR NAME="streetnumber" -->
@@ -113,28 +113,6 @@ function verify_patron_images() {
             <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=1">Edit</a>
 </div>
 
-<div id="patron-alternate-address" style="padding : .5em;">
-    <h3>Alternate Address</h3>
-    <!-- TMPL_UNLESS NAME="I"-->
-      <!-- TMPL_UNLESS NAME="C"-->
-  <p><!-- TMPL_VAR NAME="B_address" --><br />
-      <!-- TMPL_VAR NAME="B_city" --><br />
-      <!-- TMPL_VAR NAME="B_zipcode" --></p>
-  <!-- /TMPL_UNLESS -->
-    <!-- /TMPL_UNLESS -->
- 
-     <!-- TMPL_IF NAME="C" -->
-    <p><strong>Name: </strong><!-- TMPL_VAR NAME="contactname" --></p>
-    <p><strong>Firstname: </strong><!-- TMPL_VAR NAME="firstname" --></p>    
-    <p><strong>Phone: </strong><!-- TMPL_VAR NAME="phone" --></p>
-    <p><strong>Email: </strong><!-- TMPL_VAR NAME="email" --></p>
-    <p><strong>Relationship: </strong><!-- TMPL_VAR NAME="relationship" --></p>
-   <!-- /TMPL_IF -->
-       
-    <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=2">Edit</a>
-</div>
-
-
 </div>
  <div class="yui-u"> 
  <div id="patron-library-details" style="padding : .5em;">
@@ -167,6 +145,28 @@ function verify_patron_images() {
        </ul>
             <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=3">Edit</a>
  </div>
+ 
+ <div id="patron-alternate-address" style="padding : .5em;">
+    <h3>Alternate Address</h3>
+    <!-- TMPL_UNLESS NAME="I"-->
+      <!-- TMPL_UNLESS NAME="C"-->
+  <p><!-- TMPL_VAR NAME="B_address" --><br />
+      <!-- TMPL_VAR NAME="B_city" --><br />
+      <!-- TMPL_VAR NAME="B_zipcode" --></p>
+  <!-- /TMPL_UNLESS -->
+    <!-- /TMPL_UNLESS -->
+ 
+     <!-- TMPL_IF NAME="C" -->
+    <p><strong>Name: </strong><!-- TMPL_VAR NAME="contactname" --></p>
+    <p><strong>Firstname: </strong><!-- TMPL_VAR NAME="firstname" --></p>    
+    <p><strong>Phone: </strong><!-- TMPL_VAR NAME="phone" --></p>
+    <p><strong>Email: </strong><!-- TMPL_VAR NAME="email" --></p>
+    <p><strong>Relationship: </strong><!-- TMPL_VAR NAME="relationship" --></p>
+   <!-- /TMPL_IF -->
+       
+    <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=2">Edit</a>
+</div>
+ 
 </div>
 </div>
 <div id="patrons-fines-and-charges" class="yui-g">
@@ -185,6 +185,7 @@ function verify_patron_images() {
        <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
     <table>
         <tr>
+                       <th scope="col"></th>
             <th scope="col">Title</th>
             <th scope="col">Barcode</th>
             <th scope="col">Date due</th>
@@ -205,14 +206,16 @@ function verify_patron_images() {
         <tr>
             <!-- /TMPL_IF -->
           <!-- /TMPL_IF -->
+                 <td>
+                <!-- TMPL_IF NAME="itemtype_image" -->
+                <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" />
+                               <!-- TMPL_ELSE -->&nbsp;
+                <!-- /TMPL_IF --></td>
             <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> <!-- TMPL_IF name="publishercode" -->; <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --> <!-- TMPL_IF name="publicationyear" -->, <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->            </td>
             <td><!-- TMPL_VAR NAME="barcode" --></td>
             <td><!-- TMPL_VAR NAME="date_due" --></td>
             <td>
                 <!-- TMPL_VAR NAME="itemtype_description" -->
-                <!-- TMPL_IF NAME="itemtype_image" -->
-                <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" />
-                <!-- /TMPL_IF -->
             </td>
             <td><!-- TMPL_VAR NAME="charge" --></td>
             <td><!-- TMPL_VAR NAME="replacementprice" --></td>
@@ -235,15 +238,15 @@ function verify_patron_images() {
         </tr>
         <!-- /tmpl_loop -->
         <tr>
-            <td colspan="5">Total replacement cost:</td>
+            <td colspan="6">Total replacement cost:</td>
             <td><!-- TMPL_VAR NAME="totalprice" --></td>
             <td colspan="2">&nbsp;</td>
         </tr>
         </table>
-        <div>
+        <fieldset class="action">
         <input type="submit" name="renew_checked" value="Renew checked items" />
         <input type="submit" name="renew_all" value="Renew all" />
-        </div>
+        </fieldset>
     </form><!-- TMPL_ELSE --><p>Patron has nothing checked out.</p><!-- /TMPL_IF -->
        </div>
        
@@ -302,7 +305,7 @@ function verify_patron_images() {
                        </tr>
                <!-- /TMPL_LOOP -->
        </table>
-                       <p><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></p>
+                       <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset>
        </form>
        <!-- TMPL_ELSE -->
        <p>Patron has nothing on hold.</p>
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git