[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.13,1.14 returns.tmpl,1.2,1.3

[Owen Leonard]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18635/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
        circulation.tmpl returns.tmpl 
Log Message:
Synching with rel_2_2.

Index: circulation.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** circulation.tmpl    17 Feb 2005 21:02:57 -0000      1.13
--- circulation.tmpl    2 May 2005 19:35:17 -0000       1.14
***************
*** 98,102 ****
        <!-- TMPL_IF NAME="message" -->
        <div class="details">
!       No patron matched <span class="ex"><!-- TMPL_VAR name="message" 
--></span> <a href="/cgi-bin/koha/members/memberentry.pl?type=Add">Add a new 
patron</a>
        </div>
        <!-- /TMPL_IF -->
--- 98,102 ----
        <!-- TMPL_IF NAME="message" -->
        <div class="details">
!       No patron matched <span class="ex"><!-- TMPL_VAR name="message" 
--></span> <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a 
new patron</a>
        </div>
        <!-- /TMPL_IF -->
***************
*** 115,119 ****
        <p><!-- TMPL_VAR name="CGIselectborrower" --></p>
        <p><input type="submit" class="submit" value="Select" /></p>
!       <p>Patron not found? <a 
href="/cgi-bin/koha/memberentry.pl?type=Add">Add a new patron</a></p>
        </form>
        <!-- TMPL_ELSE -->
--- 115,119 ----
        <p><!-- TMPL_VAR name="CGIselectborrower" --></p>
        <p><input type="submit" class="submit" value="Select" /></p>
!       <p>Patron not found? <a 
href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new 
patron</a></p>
        </form>
        <!-- TMPL_ELSE -->
***************
*** 129,137 ****
        </div>
        <h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> 
(<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
! <h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF 
NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" 
--> overdue</span><!-- /TMPL_IF --></h4><br clear="right" />
  
  <!-- TMPL_IF NAME="flagged" -->
  </div><div class="details">
  <ul>
  <!-- TMPL_IF NAME="gna" -->
  <li><span class="error">Address:</span> Patron's address in doubt</li>
--- 129,138 ----
        </div>
        <h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> 
(<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
! <h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF 
NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" 
--> overdue</span><!-- /TMPL_IF --></h4> <!-- Display for NPL // <h4> &nbsp; 
&nbsp; <!-- TMPL_IF NAME="avcount" --><!-- TMPL_VAR NAME="avcount" --> AV 
Issues, <!-- TMPL_IF NAME="avflag" --><span class="error">AV Limit 
Reached!</span><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="avleftcount" --> More 
Allowed<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="avleftcount" --> 
AV Issues Allowed<!-- /TMPL_IF --> //Display for NPL --></h4><br clear="right" 
/>
  
  <!-- TMPL_IF NAME="flagged" -->
  </div><div class="details">
  <ul>
+ <!-- Display for NPL // <!-- TMPL_IF NAME="avflag" --><li>Patron has reached 
the <span class="error">AV issue limit</span></li><!-- /TMPL_IF --> //Display 
for NPL -->
  <!-- TMPL_IF NAME="gna" -->
  <li><span class="error">Address:</span> Patron's address in doubt</li>
***************
*** 305,309 ****
  </form>
  
! <!-- TMPL_IF name="previssues" --><form class="inline" 
action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><!-- TMPL_LOOP 
NAME="previssues" --><input type="hidden" name="renew_item_<!-- TMPL_VAR 
NAME="itemnumber" -->" value="y" /><!-- /TMPL_LOOP --><input type="submit" 
class="submit" value="Renew All" /></form><!-- /TMPL_IF -->
        
  </div>
--- 306,310 ----
  </form>
  
! <!-- TMPL_IF name="previssues" --><form class="inline" 
action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" 
value="circ" name="destination" /><input type="hidden" name="cardnumber" 
value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><!-- TMPL_LOOP 
NAME="previssues" --><input type="hidden" name="renew_item_<!-- TMPL_VAR 
NAME="itemnumber" -->" value="y" /><!-- /TMPL_LOOP --><input type="submit" 
class="submit" value="Renew All" /></form><!-- /TMPL_IF -->
        
  </div>

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** returns.tmpl        13 Apr 2004 16:53:45 -0000      1.2
--- returns.tmpl        2 May 2005 19:35:18 -0000       1.3
***************
*** 18,21 ****
--- 18,22 ----
                        <!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR 
NAME="borzip" --></li>
                        <li><!-- TMPL_VAR Name="borphone" --></li>
+                       <!-- Display for NPL // <!-- TMPL_IF NAME="boremail" 
--><li><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR 
NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" 
onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR 
NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" 
-->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes');
 return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // 
Display for NPL -->
                        </ul></td></tr>
        <tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="branchname" 
--></td></tr>
***************
*** 62,65 ****
--- 63,67 ----
                        <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR 
NAME="borzip" --></li>
                        <li><!-- TMPL_VAR Name="borphone" --></li>
+                       <!-- Display for NPL // <!-- TMPL_IF NAME="boremail" 
--><li><a href="/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" 
-->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" 
onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR 
NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" 
-->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes');
 return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // 
Display for NPL -->
                        </ul></td></tr>
                        <tr><th>Transfer to: </th><td><!-- TMPL_VAR 
Name="branchname" --></td></tr></table>