koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en stats.tmpl ... [dev_week]


From: Joshua Ferraro
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en stats.tmpl ... [dev_week]
Date: Tue, 11 Jul 2006 14:03:24 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/07/11 14:03:24

Modified files:
        koha-tmpl/intranet-tmpl/npl/en: stats.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/acqui: newbasket2.tmpl 
                                              newbiblio.tmpl order.tmpl 
                                              suggestion-select.tmpl 
                                              supplier.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/barcodes: result.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/bull: serial-issues.tmpl 
                                             statecollection.tmpl 
                                             subscription-add.tmpl 
                                             subscription-detail.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/catalogue: ISBDdetail.tmpl 
                                                  MARCdetail.tmpl 
                                                  moredetail.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/circ: circulation.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/help/admin: biblio_framework.tmpl 
                                                   
marc_subfields_structure.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/help/bull: statecollection.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/includes: colors.css 
                                                 colors.npl.css 
                                                 doc-head-close-addbiblio.inc 
                                                 intranet.css 
        koha-tmpl/intranet-tmpl/npl/en/members: memberentry.tmpl 
                                                moremember.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/parameters: aqbudget.tmpl 
                                                   checkmarc.tmpl 
                                                   systempreferences.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/reports: inventory.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/search.marc: result.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/z3950: searchresult.tmpl 
Removed files:
        koha-tmpl/intranet-tmpl/npl/en/includes: marc-editor.css 

Log message:
        sync with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2&r2=1.2.4.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.5&r2=1.2.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4&r2=1.2.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.6&r2=1.2.2.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.3&r2=1.2.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4&r2=1.2.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/ISBDdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.5&r2=1.3.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/moredetail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.3&r2=1.3.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.17&r2=1.6.2.17.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin/biblio_framework.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/colors.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/colors.npl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4&r2=1.1.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.9&r2=1.1.2.9.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.17&r2=1.5.2.17.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/marc-editor.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.9&r2=1.3.2.9.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.10&r2=1.5.2.10.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbudget.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4&r2=1.2.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.2&r2=1.2.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.3.2.5&r2=1.3.2.5.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/inventory.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2&r2=1.1.2.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.4&r2=1.5.2.4.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.2&r2=1.2.2.2.2.1

Patches:
Index: stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- stats.tmpl  13 Apr 2004 16:50:26 -0000      1.2
+++ stats.tmpl  11 Jul 2006 14:03:23 -0000      1.2.4.1
@@ -8,6 +8,7 @@
        <caption>Statistics</caption>
                <tr>
                        <th>Name</th>
+                       <th>Description</th>
                        <th>Type</th>
                        <th>Date/time</th>
                        <th>Amount</th>
@@ -16,6 +17,7 @@
                <!-- TMPL_LOOP name="loop1" -->
                <tr>
                        <td><!-- TMPL_VAR NAME="name" --></td>
+                       <td><!-- TMPL_VAR NAME="description" --></td>
                        <td><!-- TMPL_VAR NAME="type" --></td>
                        <td><!-- TMPL_VAR NAME="time" --></td>
                        <td><!-- TMPL_VAR NAME="amount" --></td>

Index: acqui/newbasket2.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- acqui/newbasket2.tmpl       20 Jan 2005 19:31:58 -0000      1.1.2.1
+++ acqui/newbasket2.tmpl       11 Jul 2006 14:03:23 -0000      1.1.2.1.2.1
@@ -3,17 +3,16 @@
 <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 
 <div id="main">
- <h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
+ <h1>Shopping Basket <!-- TMPL_VAR name="basketno" --> For: <!-- TMPL_VAR 
name="bookselname" --></h1>
+
+<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR 
NAME="parsub" -->">Add New Biblio</a> | 
+       <a href="basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View 
Basket</a> | 
 
-<!-- TMPL_IF name ="testdonation" -->
-       <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;sub=<!-- TMPL_VAR name="parsub" -->">Add New 
Biblio</a>
-<!-- TMPL_ELSE -->
-       <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;sub=<!-- TMPL_VAR name="parsub" -->">Add New 
Biblio</a>
-<!-- /TMPL_IF --> | <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" 
-->">View Basket</a> | 
 <form class="inline" action="/cgi-bin/koha/acqui/newbasket2.pl">
-<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-<input type="hidden" name="basket" value="<!-- TMPL_VAR name="basket" -->" />
-New Search: <input type="text"  size="25" name="search" /></form>
+<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR 
NAME="booksellerid" -->" />
+<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" 
/>
+<label for="acquisearch">New Search:</label> <input type="text"  size="25" 
id="acquisearch" name="search" />
+<input type="submit" value="Search" class="submit" /></form>
 
 
 <h3>You searched for <span class="ex">
@@ -36,15 +35,9 @@
 <!-- TMPL_LOOP name="loopresult" -->
        <tr bgcolor="<!-- TMPL_VAR name="toggle" -->">
                <td>
-                       <!-- TMPL_IF name="testdonation" -->
-                               <a 
href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" 
-->&amp;author=<!-- TMPL_VAR name="author2" -->&amp;copyright=<!-- TMPL_VAR 
name="copyright" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" 
-->&amp;title=<!-- TMPL_VAR name="title2" -->">
-                               <!-- TMPL_VAR name="title" -->
-                               </a>
-                       <!-- TMPL_ELSE -->
-                               <a 
href="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" 
-->&amp;copyright=<!-- TMPL_VAR name="copyright" -->&amp;id=<!-- TMPL_VAR 
name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;biblio=<!-- 
TMPL_VAR name="biblionumber" -->&amp;title=<!-- TMPL_VAR name="title2" -->">
-                               <!-- TMPL_VAR name="title" -->
+                       <a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- 
TMPL_VAR NAME="sub" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblio=<!-- TMPL_VAR 
NAME="biblionumber" -->">
+                                       <!-- TMPL_VAR NAME="title" -->
                                </a>
-                       <!-- /TMPL_IF -->
                </td>
                <td>
                        <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR 
name="word" -->&amp;type=<!-- TMPL_VAR name="type" -->">
@@ -55,10 +48,18 @@
                        <!-- TMPL_VAR name="copyright" -->
                </td>
                <td>
-                       <!-- TMPL_VAR name="itemcount" -->
+                               <!-- TMPL_VAR NAME="itemcount" -->
                </td>
                <td>
-                       <!-- TMPL_VAR name="location" -->
+                               <!-- TMPL_IF name="use-location-flags-p" -->
+                               <!-- TMPL_IF name="location-only" --><!-- 
TMPL_VAR NAME="location-only" --><br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="on-loan-p" -->On 
Loan<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="lost-p" -->Lost<br><!-- 
/TMPL_IF -->
+                               <!-- TMPL_IF name="mending-p" 
-->Mending<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="in-transit-p" -->In 
Transit<br><!-- /TMPL_IF -->
+                               <!-- TMPL_ELSE -->
+                               <!-- TMPL_VAR NAME="location" -->
+                               <!-- /TMPL_IF -->
                </td>
        </tr>
 

Index: acqui/newbiblio.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.5.2.1
diff -u -b -r1.2.2.5 -r1.2.2.5.2.1
--- acqui/newbiblio.tmpl        9 Mar 2006 20:35:40 -0000       1.2.2.5
+++ acqui/newbiblio.tmpl        11 Jul 2006 14:03:23 -0000      1.2.2.5.2.1
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="main-top-addbiblio.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF 
name="ordnum" -->Modify Order Details (Line #<!-- TMPL_VAR NAME="ordnum" -->)   
    <!-- TMPL_ELSE -->New order<!-- /TMPL_IF --> <!-- TMPL_IF 
name="suggestionid" -->(Created From Suggestion #<!-- TMPL_VAR 
NAME="suggestionid" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE 
NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 <script language="javascript" type="text/javascript">

Index: acqui/order.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.4.2.1
diff -u -b -r1.2.2.4 -r1.2.2.4.2.1
--- acqui/order.tmpl    7 Mar 2006 16:56:04 -0000       1.2.2.4
+++ acqui/order.tmpl    11 Jul 2006 14:03:23 -0000      1.2.2.4.2.1
@@ -18,7 +18,7 @@
                                <a href="basket.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->">Add Order</a><!-- TMPL_ELSE -->      Inactive<!-- 
/TMPL_IF -->
                </td>
                <td>
-                       <a href="recieveorder.pl?id=<!-- TMPL_VAR 
name="supplierid" -->">Receive</a>
+                       <a href="recieveorder.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->">Receive</a>
                </td>
                <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->&amp;op=display"><!-- TMPL_VAR name="name" --></a></td>
                <td>
@@ -41,10 +41,14 @@
                                                        <td><!-- TMPL_VAR 
NAME="creationdate" --></td>
                                                        <td>
                                                                <!-- TMPL_IF 
name="closedate" -->
-                                                                       Closed 
on <!-- TMPL_VAR NAME="closedate" -->
-                                                                       <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">(View)</a>
+                                                                       Closed 
on: <!-- TMPL_VAR NAME="closedate" -->
+                                                                       <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">View</a>
                                                                <!-- TMPL_ELSE 
-->
+                                                                       <!-- 
TMPL_IF name="active" -->
                                                                        <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">Modify</a>
+                                                                       <!-- 
TMPL_ELSE -->
+                                                                               
<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">View</a>
+                                                                       <!-- 
/TMPL_IF -->
                                                                <!-- /TMPL_IF 
-->
                                                        </td>
                                                </tr>
@@ -54,7 +58,7 @@
 <!-- /TMPL_LOOP -->
 </table>
 <form action="supplier.pl" method="get">
-       <input type="hidden" name="id" value="0" />
+       <input type="hidden" name="supplierid" value="0" />
        <input type="submit" class="submit" value="Add Supplier" /> 
 </form>
 </div><!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: acqui/suggestion-select.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- acqui/suggestion-select.tmpl        19 Apr 2005 17:17:48 -0000      1.1.2.2
+++ acqui/suggestion-select.tmpl        11 Jul 2006 14:03:23 -0000      
1.1.2.2.2.1
@@ -19,6 +19,7 @@
                        <th>Suggestion</th>
                        <th>Suggested by</th>
                        <th>Accepted by</th>
+                       <th>Duplicate</th>
                        <th>&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="suggestions_loop" -->
@@ -41,6 +42,12 @@
                                        <!-- TMPL_VAR NAME="surnamemanagedby" 
--><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR 
NAME="firstnamemanagedby" -->
                                </td>
                                <td>
+                                       <!-- TMPL_IF 
name="duplicateBiblionumber" -->
+                                               <a href="#" 
onclick="window.open('/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR 
name="duplicateBiblionumber" -->')">Duplicate suspected</a>
+                                               <a 
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR 
name="supplierid" -->&amp;basketno=<!-- TMPL_VAR 
name="basketno"-->&amp;op=connectDuplicate&amp;duplicateNumber=<!-- TMPL_VAR 
name="duplicateBiblionumber" -->&amp;suggestionid=<!-- TMPL_VAR 
name="suggestionid" -->">Connect</a>
+                                       <!-- /TMPL_IF -->
+                               </td>
+                               <td>
                                        <!-- TMPL_IF name="biblionumber" -->
                                                <a 
href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- 
TMPL_VAR NAME="suggestionid" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" 
-->">Order</a>
                                        <!-- TMPL_ELSE -->

Index: acqui/supplier.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- acqui/supplier.tmpl 7 Mar 2006 16:56:04 -0000       1.1.2.3
+++ acqui/supplier.tmpl 11 Jul 2006 14:03:23 -0000      1.1.2.3.2.1
@@ -145,7 +145,13 @@
        </tr>
        <tr>
                <th><label for="discount">Discount</label></th>
-               <td><input type="text" size="3" id="discount" name="discount" 
value="<!-- TMPL_VAR name="discount" -->" /> %
+               <td><input type="text" size="3" id="discount" name="discount" 
value="<!-- TMPL_VAR name="discount" -->" /> %</td>
+       </tr>
+       <tr>
+               <th>
+                       <label for="notes">Notes</label></th><td>
+                       <textarea cols="40" rows="4" name="notes" 
id="notes"><!-- TMPL_VAR NAME="notes" --></textarea>
+</td>
        </tr>
 </table>
 </div>
@@ -259,6 +265,11 @@
                        Discount: </th><td>
                        <!-- TMPL_VAR NAME="discount" --> %
                </td></tr>
+       <tr>
+               <th>Notes: </th><td>
+               <!-- TMPL_VAR NAME="notes" -->
+</td>
+       </tr>
        </table>
 </div>
 <!--/TMPL_IF-->

Index: barcodes/result.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/result.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- barcodes/result.tmpl        13 Apr 2006 21:41:30 -0000      1.1.2.2
+++ barcodes/result.tmpl        11 Jul 2006 14:03:23 -0000      1.1.2.2.2.1
@@ -4,7 +4,7 @@
        <div class="results">
                <p>
                        <!-- TMPL_IF NAME=displayprev -->
-                               <a href="label-bib-search.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">
+                               <a href="label-item-search.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">
                                        &lt;&lt;
                                </a>
                        <!-- /TMPL_IF -->
@@ -12,11 +12,11 @@
                                <!-- TMPL_IF NAME=highlight -->
                                        <span class="current"><!-- TMPL_VAR 
NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                                       <a 
href="label-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- 
TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR 
NAME="number" --></a>
+                                       <a 
href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- 
TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR 
NAME="number" --></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF NAME=displaynext -->
-                               <a href="label-bib-search.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
+                               <a href="label-item-search.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
                                <!-- /TMPL_IF -->
                </p>
                <p>
@@ -67,17 +67,17 @@
        <div class="results">
                <p>
                        <!-- TMPL_IF NAME=displayprev -->
-                       <a href="label-bib-search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a>
+                       <a href="label-item-search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME=numbers -->
                                <!-- TMPL_IF NAME=highlight -->
                                <span class="current"><!-- TMPL_VAR 
NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                               <a href="label-bib-search.pl?startfrom=<!-- 
TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+                               <a href="label-item-search.pl?startfrom=<!-- 
TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF NAME=displaynext -->
-                       <a href="label-bib-search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
+                       <a href="label-item-search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
                                <!-- /TMPL_IF -->
                </p>
        </div> 

Index: bull/serial-issues.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/serial-issues.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- bull/serial-issues.tmpl     10 Jan 2006 21:30:36 -0000      1.1.2.2
+++ bull/serial-issues.tmpl     11 Jul 2006 14:03:23 -0000      1.1.2.2.2.1
@@ -84,7 +84,7 @@
                        </b>
                </p>
                <p>Last renewal of subscription was <b><!-- TMPl_VAR 
name="startdate" --></b></p>
-               <!-- TMPL_IF name="enddate" --><p><b>This subscription is now 
ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" 
--></b></p><!-- /TMPL_IF name="enddate" -->
+               <!-- TMPL_IF name="enddate" --><p><b>This subscription is now 
ended. The last issue was received on <!-- TMPL_VAR name="enddate" 
--></b></p><!-- /TMPL_IF name="enddate" -->
        <!--TMPL_UNLESS Name=fullinfo -->
                <p><!-- TMPL_VAR name="notes" --></p>
                <!-- TMPL_IF name="opacnote" -->

Index: bull/statecollection.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.6.2.1
diff -u -b -r1.2.2.6 -r1.2.2.6.2.1
--- bull/statecollection.tmpl   8 Mar 2006 20:38:44 -0000       1.2.2.6
+++ bull/statecollection.tmpl   11 Jul 2006 14:03:23 -0000      1.2.2.6.2.1
@@ -33,6 +33,10 @@
                 <input type="text" id="serialseq" name="serialseq" value="<!-- 
TMPL_VAR name="serialseq" -->" size="30" maxlength="100" />
                        </td></tr>
                        <tr>
+               <th scope="row"><label for="publisheddate">Published On: 
</label></th><td><input type="text" name="publisheddate" id="publisheddate" 
value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
+                       </td>
+       </tr>
+                       <tr>
                <th scope="row"><label for="planneddate">Expected On:</label> 
</th><td>
                                <input type="text" id="planneddate" 
name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" 
maxlength="15" />
                        </td></tr>
@@ -41,7 +45,7 @@
                                <input type="hidden" name="serialid" 
value="<!-- TMPL_VAR name="serialid" -->" />
                                <select id="status" name="status" size="1">
                                        <!--TMPL_IF name="status1" -->
-                                               <option value="1" 
selected>Waited</option>
+                                               <option value="1" 
selected>Waiting</option>
                                        <!-- /TMPL_IF -->
                                        <!--TMPL_IF name="status2" -->
                                                <option value="2" 
selected>Arrived</option>
@@ -79,10 +83,9 @@
        
 
                <!--TMPL_IF Name="serialadditems" -->
+                               <tr><th><label for="barcode">Barcode: 
</label></th><td><input type="text" id="barcode" name="barcode" value="" 
size="20" maxlength="20" /></td></tr>
                <tr>
-                       
                                <th><label for="itemcallnumber">Callnumber: 
</label></th> <td><input type="text" id="itemcallnumber" name="itemcallnumber" 
value="" size="10" maxlength="15" /></td></tr>
-                               <tr><th><label for="barcode">Barcode: 
</label></th><td><input type="text" id="barcode" name="barcode" value="" 
size="20" maxlength="20" /></td>
                <tr><th><label for="branch">Branch:</label> </th>
                                <td><select  id="branch" name="branch" size="1">
                        <!-- TMPL_LOOP name="branchloop" -->
@@ -127,6 +130,10 @@
                                 <input type="text" id="manual-serialseq" 
name="serialseq" size="30" maxlength="100" />
                        </td>
                        </tr>
+       <tr>
+               <th scope="row"><label for="publisheddate2">Published On: 
</label></th><td><input type="text" name="publisheddate" id="publisheddate2" 
value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
+                       </td>
+       </tr>
                        <tr><th scope="row"><label 
for="manual-planneddate">Expected On: </label></th>
                        <td>
                                <input type="text" id="manual-planneddate" 
name="planneddate" size="10" maxlength="15" />
@@ -182,7 +189,7 @@
        </table>
        <input type="submit" value="Save changes" accesskey="w" class="submit" 
/>
        <!-- TMPL_IF name="hassubscriptionexpired" -->
-               <p>Subscription has expired. Waited last issue status can't be 
changed. <a href="#" onclick="popup()">Renew</a> your subscription</p>
+               <p>Subscription has expired. Last waiting issue status can't be 
changed. <a href="#" onclick="popup()">Renew</a> your subscription</p>
        <!-- /TMPL_IF -->
        </form></div><br>
 
@@ -196,7 +203,7 @@
                <tr><th scope="row"><label>Librarian: </label></th><td><!-- 
TMPL_VAR name="user" --></td></tr>
                <tr><th scope="row"><label for="histstartdate">Beginnning date 
(*): </label></th><td><input id="histstartdate" type="text" 
name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
                <tr><th scope="row"><label for="enddate">End date: 
</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- 
TMPL_VAR name="enddate" -->" /></td></tr>
-               <tr><th scope="row"><label for="recievedlist">Recieved 
issues</label></th><td><textarea id="recievedlist" name="recievedlist" 
cols="30" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
+               <tr><th scope="row"><label for="recievedlist">Received 
issues</label></th><td><textarea id="recievedlist" name="recievedlist" 
cols="30" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
                <tr><th scope="row"><label for="missinglist">Missing 
issues</label></th><td><textarea id="missinglist" name="missinglist" cols="30" 
rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
                <tr><th scope="row"><label for="opacnote">Opac 
note</label></th><td><textarea id="opacnote" name="opacnote" cols="30" 
rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
        </table>

Index: bull/subscription-add.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.3.2.1
diff -u -b -r1.2.2.3 -r1.2.2.3.2.1
--- bull/subscription-add.tmpl  9 Mar 2006 20:36:42 -0000       1.2.2.3
+++ bull/subscription-add.tmpl  11 Jul 2006 14:03:23 -0000      1.2.2.3.2.1
@@ -167,20 +167,22 @@
                                <td><input type="text" name="every2" 
value="<!-- TMPL_VAR name="every2" -->"></td>
                                <td><input type="text" name="every3" 
value="<!-- TMPL_VAR name="every3" -->"></td>
                        </tr>
-                       <tr>
-                               <th scope="row"><label for="whenmorethan1">When 
more than:</label></th>
-                               <td><input type="text" id="whenmorethan1" 
name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-                               <td><input type="text" name="whenmorethan2" 
value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-                               <td><input type="text" name="whenmorethan3" 
value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
-                       </tr>
                        <!-- TMPL_IF name="mod" -->
                        <tr>
                                <th scope="row"><label for="innerloop">The loop 
is for instance:</label></th>
+                               <!-- TMPL_ELSE -->
+                                       <td>Starting period</td>
+                               <!-- /TMPL_IF -->
                                <td><input type="text" id="innerloop" 
name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
                                <td><input type="text" name="innerloop2" 
value="<!-- TMPL_VAR name="innerloop2" -->"></td>
                                <td><input type="text" name="innerloop3" 
value="<!-- TMPL_VAR name="innerloop3" -->"></td>
                        </tr>
-                       <!-- /TMPL_IF -->
+                       <tr>
+                               <th scope="row"><label for="whenmorethan1">When 
more than:</label></th>
+                               <td><input type="text" id="whenmorethan1" 
name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+                               <td><input type="text" name="whenmorethan2" 
value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+                               <td><input type="text" name="whenmorethan3" 
value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+                       </tr>
                        <tr>
                                <th scope="row"><label for="setto1">...Set back 
to:</label></th>
                                <td><input type="text" id="setto1" 
name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>

Index: bull/subscription-detail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.4.2.1
diff -u -b -r1.2.2.4 -r1.2.2.4.2.1
--- bull/subscription-detail.tmpl       10 Jan 2006 21:30:36 -0000      1.2.2.4
+++ bull/subscription-detail.tmpl       11 Jul 2006 14:03:23 -0000      
1.2.2.4.2.1
@@ -135,13 +135,16 @@
                                <td><!-- TMPL_VAR name="every3" --></td>
                        </tr>
                        <tr>
-                               <th scope="row">When more than:</th>
-                               <td><!-- TMPL_VAR name="whenmorethan1" --> <!-- 
TMPL_IF name="innerloop1" --><br/>
-                                       <i>(is <!-- TMPL_VAR name="innerloop1" 
-->)</i><!-- /TMPL_IF --></td>
-                               <td><!-- TMPL_VAR name="whenmorethan2" --> <!-- 
TMPL_IF name="innerloop2" --><br/>
-                                       <i>(is <!-- TMPL_VAR name="innerloop2" 
-->)</i><!-- /TMPL_IF --></td>
-                               <td><!-- TMPL_VAR name="whenmorethan3" --> <!-- 
TMPL_IF name="innerloop3" --><br/>
-                                       <i>(is <!-- TMPL_VAR name="innerloop3" 
-->)</i><!-- /TMPL_IF --></td>
+                               <th scope="row">Starting period</th>
+                               <td><!-- TMPL_IF name="innerloop1" --><!-- 
TMPL_VAR name="innerloop1" --><!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_IF name="innerloop2" --><!-- 
TMPL_VAR name="innerloop2" --><!-- /TMPL_IF --></td>
+                               <td><!-- TMPL_IF name="innerloop3" --><!-- 
TMPL_VAR name="innerloop3" --><!-- /TMPL_IF --></td>
+                       </tr>
+                       <tr>
+                               <th scope="row">When more than</th>
+                               <td><!-- TMPL_VAR name="whenmorethan1" --></td>
+                               <td><!-- TMPL_VAR name="whenmorethan2" --></td>
+                               <td><!-- TMPL_VAR name="whenmorethan3" --></td>
                        </tr>
                        <tr>
                                <th scope="row">Set back to:</th>

Index: catalogue/ISBDdetail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- catalogue/ISBDdetail.tmpl   31 Jan 2006 22:32:47 -0000      1.1.2.3
+++ catalogue/ISBDdetail.tmpl   11 Jul 2006 14:03:23 -0000      1.1.2.3.2.1
@@ -5,9 +5,9 @@
 
 <div id="main">
 
-<div class="tabitem"><form action="MARCdetail.pl" method="get">
+<div class="tabitem"><form action="/cgi-bin/koha/detail.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" 
/><input type="submit" class="submit" value="View Brief Display" /></form> 
<form action="/cgi-bin/koha/MARCdetail.pl" method="get">
 <input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" 
/>
-<input type="submit" class="submit" value="View MARC" /></form> <form 
action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" 
name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" 
name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" 
name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" 
name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input 
type="submit" class="submit" value="Item Details" /></form> <form 
action="detailprint.pl" method="get"><input type="hidden" name="bib" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" 
class="submit" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF 
name="subscriptionsnumber" --> <form action="bull-home.pl" method="get"><input 
type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" 
/><input type="submit" class="submit" value="Subscription(s)" /></form><!-- 
/TMPL_IF --><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form 
action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR 
name="biblionumber" -->" name="bib" /> <input type="submit" value="Place 
Reserve" class="submit" /></form> <form 
action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" 
value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" 
value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
+<input type="submit" class="submit" value="View MARC" /></form>  <form 
action="detailprint.pl" method="get"><input type="hidden" name="bib" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" 
class="submit" value="Simple Print View" 
onclick="openWindow('/cgi-bin/koha/detailprint.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" -->', 'printview'); return false;" /></form><!-- TMPL_IF 
name="subscriptionsnumber" --> <form action="bull-home.pl" method="get"><input 
type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" 
/><input type="submit" class="submit" value="Subscription(s)" /></form><!-- 
/TMPL_IF --><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form 
action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR 
name="biblionumber" -->" name="bib" /> <input type="submit" value="Place 
Reserve" class="submit" /></form> <form 
action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" 
value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" 
value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
 </div>
 
        <div class="isbd">

Index: catalogue/MARCdetail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.5.2.1
diff -u -b -r1.3.2.5 -r1.3.2.5.2.1
--- catalogue/MARCdetail.tmpl   31 Jan 2006 22:32:47 -0000      1.3.2.5
+++ catalogue/MARCdetail.tmpl   11 Jul 2006 14:03:23 -0000      1.3.2.5.2.1
@@ -5,8 +5,8 @@
 
 <div id="main">
 <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
-<div class="tabitem"><form action="/cgi-bin/koha/detail.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" 
/><input type="submit" class="submit" value="Brief Display" /></form><!-- 
TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place 
Reserve" /></form>
-               <!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple 
Print View" /></form> <!-- TMPL_IF name="subscriptionsnumber" --><form 
action="/cgi-bin/koha/bull-home.pl" method="get"><input type="hidden" 
name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input 
type="submit" value="Subscription(s)" class="submit" /></form><!-- /TMPL_IF --> 
 </div>
+<div class="tabitem"><form action="/cgi-bin/koha/detail.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" 
/><input type="submit" class="submit" value="View Brief Display" /></form> 
<form action="ISBDdetail.pl" method="get" /><input type="hidden" name="bib" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" 
class="submit" value="View ISBD" /></form> <!-- TMPL_IF NAME="norequests" 
-->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input 
type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> 
<input type="submit" class="submit" value="Place Reserve" /></form>
+               <!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple 
Print View" onclick="openWindow('/cgi-bin/koha/detailprint.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" -->', 'printview'); return false;" /></form> <!-- TMPL_IF 
name="subscriptionsnumber" --><form action="/cgi-bin/koha/bull-home.pl" 
method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="submit" value="Subscription(s)" 
class="submit" /></form><!-- /TMPL_IF -->  </div>
 
 <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" 
method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR 
NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit 
MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" 
method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR 
name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" 
/></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR 
Name="framework" -->Framework <input type="submit" class="submit" 
value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> 
<form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input 
type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" 
value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" 
value="Delete Record" onclick="confirm_deletion(); return false;" 
/></form></div>
 

Index: catalogue/moredetail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/moredetail.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.3.2.1
diff -u -b -r1.3.2.3 -r1.3.2.3.2.1
--- catalogue/moredetail.tmpl   30 Mar 2005 22:51:53 -0000      1.3.2.3
+++ catalogue/moredetail.tmpl   11 Jul 2006 14:03:23 -0000      1.3.2.3.2.1
@@ -40,7 +40,11 @@
 <!-- TMPL_IF NAME="homebranch" --><tr><th>Home Branch:</th><td> <!-- TMPL_VAR 
NAME="homebranch" --></td></tr><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="holdingbranch" --><tr><th>Current Branch:</th><td> <!-- 
TMPL_VAR NAME="holdingbranch" --></td></tr><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="datelastseen" --><tr><th>Last seen:</th><td> <!-- TMPL_VAR 
NAME="datelastseen" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="issue" --><tr><th>Item Status:</th><td> Due <!-- TMPL_VAR 
NAME="date_due" --> (Issued to <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" 
--></a>)</td></tr><!-- TMPL_ELSE --><tr><th>Item 
Status</th><td>Available</td></tr><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="issue" --><tr><th>Date Due:</th><td> <!-- TMPL_VAR 
NAME="date_due" --> (Issued to <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" 
--></a>)</td></tr><!-- /TMPL_IF -->
+not for loan: <!-- TMPL_VAR name="notforloantext" -->
+<tr><th>Item Status</th><td><!-- TMPL_IF name="notforloantext" --><!-- 
TMPL_VAR name="notforloantext" --><!-- TMPL_ELSE --><!-- TMPL_IF 
name="itemlost"-->Item Lost<!-- TMPL_ELSE --><!-- TMPL_IF NAME="wthdrawn" 
-->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF --><!-- /TMPL_IF 
--><!-- /TMPL_IF --></td></tr>
+
 <tr><th>Last borrowed:</th><td> <!-- TMPL_VAR NAME="datelastborrowed" 
--></td></tr>
 <!-- on issue bit -->
 <!-- TMPL_IF NAME="card0" --><tr><th>Last Borrower 1:</th><td> <a 
href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card0" 
-->"><!-- TMPL_VAR NAME="card0" --></a></td></tr><!-- /TMPL_IF -->

Index: circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.17
retrieving revision 1.6.2.17.2.1
diff -u -b -r1.6.2.17 -r1.6.2.17.2.1
--- circ/circulation.tmpl       10 Apr 2006 18:18:11 -0000      1.6.2.17
+++ circ/circulation.tmpl       11 Jul 2006 14:03:23 -0000      1.6.2.17.2.1
@@ -283,6 +283,7 @@
                        <th>Call No</th>
                        <th>Barcode</th>
                        <th>Renew?</th>
+                       <th>Return?</th>
                </tr>
        <!-- TMPL_IF NAME="todayissues" -->
                <!-- TMPL_LOOP NAME="todayissues" -->
@@ -293,12 +294,13 @@
                        <td><!-- TMPL_VAR NAME="classification" --></td>
                        <td><!-- TMPL_VAR NAME="barcode" --></td>
                        <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
                </tr>
                <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="previssues" -->
-               <tr><th colspan="6"><a name="previous" id="previous">Previous 
Issues</a></th></tr>
+               <tr><th colspan="7"><a name="previous" id="previous">Previous 
Issues</a></th></tr>
                <!-- TMPL_LOOP NAME="previssues" -->
                        <!-- TMPL_IF NAME="togglecolor" --><tr><!-- TMPL_ELSE 
--><tr class="highlight"><!-- /TMPL_IF -->
                        <td><!-- TMPL_IF NAME="od" --><span class="error"><!-- 
/TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></span><!-- 
/TMPL_IF --></td>
@@ -306,7 +308,8 @@
                        <td><!-- TMPL_VAR NAME="author" --></td>
                        <td><!-- TMPL_VAR NAME="classification" --></td>
                        <td><!-- TMPL_VAR NAME="barcode" --></td>
-                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td></tr>
+                       <td><input type="checkbox" name="renew_item_<!-- 
TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> 
checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td></tr>
                <!-- /TMPL_LOOP -->
        </table>
        

Index: help/admin/biblio_framework.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin/biblio_framework.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- help/admin/biblio_framework.tmpl    14 Jan 2005 15:42:29 -0000      1.1.2.1
+++ help/admin/biblio_framework.tmpl    11 Jul 2006 14:03:24 -0000      
1.1.2.1.2.1
@@ -3,5 +3,5 @@
        <h1>Biblio framework</h1>
        <p>biblio frameworks are used to catalogue your biblios.</p>
        <p>Unlike Koha 2.0, in this version you can have more than 1 framework 
to catalogate differently various materials. You can, for example, define 1 
framework for monographies, 1 framework for serials, 1 framework for URL...</p>
-       <p>Once a framework type is created, you can clic on "MARC structure" 
to define the exact MARC structure. The first time, Koha will ask you to select 
an existing framework to copy into the new one. Thus, you don't have to define 
all the MARC structure</p>
+       <p>Once a framework type is created, you can click on "MARC structure" 
to define the exact MARC structure. The first time, Koha will ask you to select 
an existing framework to copy into the new one. Thus, you don't have to define 
all the MARC structure</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: help/admin/marc_subfields_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin/marc_subfields_structure.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- help/admin/marc_subfields_structure.tmpl    15 Mar 2006 05:32:34 -0000      
1.1.2.4
+++ help/admin/marc_subfields_structure.tmpl    11 Jul 2006 14:03:24 -0000      
1.1.2.4.2.1
@@ -46,7 +46,7 @@
 <li>Auth value : means the value is not free, but in the authorised value list 
of the selected type</li>
 <li>thesaurus : means that the value is not free, but can be searched in 
authority/thesaurus of the selected category</li>
 <li>plugin : means the value is calculated or managed by a plugin. Plugins can 
do almost anything. For example, in UNIMARC there are plugins for every 1xx 
fields that are coded fields. The plugin is a huge help for cataloger ! There 
are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can 
"magically" find the editor from an ISBN, and the collection list for the 
editor)</li>
-<li>link : If you enter a field/subfield here (200b), a little glass appears 
after the subfield. If the user clic on the glass, a search is done on the DB 
for the field/subfield with the same value. Can be used for 2 main topic : 
+<li>link : If you enter a field/subfield here (200b), a little glass appears 
after the subfield. If the user click on the glass, a search is done on the DB 
for the field/subfield with the same value. Can be used for 2 main topic : 
        <ul>
                <li>on a field like author (200f in UNIMARC), put 200f here, 
you will be able to see all biblios with the same author</li>
                <li>on a field that is a link (4xx) to reach another biblio. 
For example, put 011a in 464$x, will find the serial that was previously with 
this issn. With the 4xx pligin, you get a powerful tool to manage biblios 
connected to biblios</li>

Index: help/bull/statecollection.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull/statecollection.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- help/bull/statecollection.tmpl      14 Jan 2005 15:42:30 -0000      1.1.2.1
+++ help/bull/statecollection.tmpl      11 Jul 2006 14:03:24 -0000      
1.1.2.1.2.1
@@ -20,7 +20,7 @@
                <li>opac note : the field that appears in the librarian 
interface (with some other subscription information like beginning date and end 
date. This field must be filled manually. Nothing is put here 
automatically.</li>
        </ul>
        <h2>Subscription renewals</h2>
-       <p>Koha calculates automatically the end of the subscription (based on 
the start date and the number of issues recieved). when a subscription has 
ended, you can't change the status of the last "waited number" (as it's not 
waited in fact). To be able to "recieve" this number, you must renew your 
subscription.</p>
+       <p>Koha calculates automatically the end of the subscription (based on 
the start date and the number of issues received). when a subscription has 
ended, you can't change the status of the last "waited number" (as it's not 
waited in fact). To be able to "receive" this number, you must renew your 
subscription.</p>
        <p>Renewing a subscription means that you define some informations for 
the renewal. When those informations have been filled, a suggestion is 
automatically created in Koha. This suggestion can be managed by the librarian 
that orders books, as any other order (= budget and bookseller are defined 
here).</p>
        <p><i>Note that the subscription renewal done by the "serials 
librarian" is supposed to be immediate. We have decided to keep Koha as simple 
as possible. In fact, the subscription renewal won't be immediate, but we 
didn't wanted to add too much complexity.</i></p>
        </p>

Index: includes/colors.css
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/colors.css,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- includes/colors.css 13 Apr 2006 19:51:53 -0000      1.1.2.4
+++ includes/colors.css 11 Jul 2006 14:03:24 -0000      1.1.2.4.2.1
@@ -435,3 +435,84 @@
 #topmenu .submit, #nav .submit {
        background-color : #7EABD6;
 }
+
+
+/* MARC EDITOR */
+
+div.tabbed {
+}
+
+div.tabs {
+}
+
+div.tabs a {
+       background-color: #D8DEB8;
+       color: #000066;
+       border-bottom : 1px solid #666666;
+       border-left : 1px solid #666666;
+       border-right : 1px solid #FFFFCC;
+       border-top : 1px solid #EEEEEE;
+}
+
+div.tabs a:hover {
+       background-color : #CCFF99;
+       border-left : 1px solid #000066;
+       border-bottom : 1px solid #000066;
+}
+
+div.tab {
+       background-color : #EEEEEE;
+       border : 1px solid #E4E4E4;
+       border-top : 1px solid #EEEEEE;
+}
+
+/* style for tag definition (e.g. 700 - Statement of responsibility) */
+.MARCtag { 
+       color : #000000;
+       background-color : #EEEEEE;
+       border-top : 7px solid #EEEEEE;
+       border-bottom : thin solid #CCCCCC;
+}
+
+div.tab p {
+}      
+
+/* style for each subfield (e.g.: Publication year), just before the biblio 
subfield */
+.labelsubfield { 
+       background-color : #F0F0F0;
+}
+
+#loading {
+       background-color: #FFFFFF;
+       border: 10px solid #7EABD6;
+       }
+       
+input.mandatory {
+       background-color: #CCFF33;
+}
+
+div.tabs a.addbiblioTabOn {
+       background-color: #EEEEEE;
+       color: #000066;
+}
+
+div.tabs a.addbiblioTabOff {
+       background-color: #CBCBCB;
+       color: #669999;
+}
+
+input.addbiblioInput {
+       background-color: #FFFFFF;
+}
+
+input.addbiblioInputFocus {
+       background-color: #FFFFE1;
+}
+
+input.indicator {
+       background-color: #FFFFFF;
+}
+
+input.indicatorFocus {
+       background-color: #FFFF00; 
+}
\ No newline at end of file

Index: includes/colors.npl.css
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/colors.npl.css,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -u -b -r1.1.2.4 -r1.1.2.4.2.1
--- includes/colors.npl.css     13 Apr 2006 19:51:53 -0000      1.1.2.4
+++ includes/colors.npl.css     11 Jul 2006 14:03:24 -0000      1.1.2.4.2.1
@@ -626,3 +626,84 @@
 p.date-select input, p.date-select select {
                background-color : #EFF1D8;
 }
\ No newline at end of file
+
+
+/* MARC EDITOR */
+
+div.tabbed {
+}
+
+div.tabs {
+}
+
+div.tabs a {
+       background-color: #D8DEB8;
+       color: #000066;
+       border-bottom : 1px solid #999933;
+       border-left : 1px solid #999933;
+       border-right : 1px solid #FFFFCC;
+       border-top : 1px solid #FFFFCC;
+}
+
+div.tabs a:hover {
+       background-color : #CCFF99;
+       border-left : 1px solid #000066;
+       border-bottom : 1px solid #000066;
+}
+
+div.tab {
+       background-color : #FFFFCC;
+       border : 1px solid #D8DEB8;
+       border-top : 1px solid #FFFFCC;
+}
+
+/* style for tag definition (e.g. 700 - Statement of responsibility) */
+.MARCtag { 
+       color : #000000;
+       background-color : #FFFFCC;
+       border-top : 7px solid #FFFFCC;
+       border-bottom : thin solid #CCCC99;
+}
+
+div.tab p {
+}      
+
+/* style for each subfield (e.g.: Publication year), just before the biblio 
subfield */
+.labelsubfield { 
+       background-color : #FFFFE1;
+}
+
+#loading {
+       background-color: #FFFFFF;
+       border: 10px solid #CCCC99;
+       }
+       
+input.mandatory {
+       background-color: #CCFF33;
+}
+
+div.tabs a.addbiblioTabOn {
+       background-color: #EEEEEE;
+       color: #000066;
+}
+
+div.tabs a.addbiblioTabOff {
+       background-color: #CBCBCB;
+       color: #669999;
+}
+
+input.addbiblioInput {
+       background-color: #FFFFFF;
+}
+
+input.addbiblioInputFocus {
+       background-color: #FFFFE1;
+}
+
+input.indicator {
+       background-color: #FFFFFF;
+}
+
+input.indicatorFocus {
+       background-color: #FFFF00; 
+}
\ No newline at end of file

Index: includes/doc-head-close-addbiblio.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.9.2.1
diff -u -b -r1.1.2.9 -r1.1.2.9.2.1
--- includes/doc-head-close-addbiblio.inc       5 Apr 2006 14:52:52 -0000       
1.1.2.9
+++ includes/doc-head-close-addbiblio.inc       11 Jul 2006 14:03:24 -0000      
1.1.2.9.2.1
@@ -8,7 +8,6 @@
 <style type="text/css">
         <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR 
NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- 
TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' 
-->/includes/intranet.css);<!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- 
TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR 
NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
-        @import url(<!-- TMPL_VAR NAME='themelang' 
-->/includes/marc-editor.css);
 </style>
 <!-- TMPL_INCLUDE NAME="common.js.inc" -->
 </head>

Index: includes/intranet.css
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css,v
retrieving revision 1.5.2.17
retrieving revision 1.5.2.17.2.1
diff -u -b -r1.5.2.17 -r1.5.2.17.2.1
--- includes/intranet.css       13 Apr 2006 19:51:53 -0000      1.5.2.17
+++ includes/intranet.css       11 Jul 2006 14:03:24 -0000      1.5.2.17.2.1
@@ -965,3 +965,92 @@
 #topmenu label {
        font-weight: bold;
 }
+
+/* MARC EDITOR */
+
+div.tabbed {
+       margin-left:5%;
+       width:90%;
+}
+
+div.tabs {
+       float : left;
+       margin : 5px 0 0 0;
+}
+
+div.tabs a {
+       display:block;
+       font-weight : bold;
+       text-decoration : none;
+       margin : 0 0 2px 0;
+       padding: 10px 5px 10px 5px;
+}
+
+div.tabs a:hover {
+}
+
+div.tab {
+       display: block;
+       visibility:hidden;
+       position : absolute;
+       margin : 5px 0 0 20px;
+       padding : 3px;
+       width : 70%;
+       /*margin-top:110px;*/
+}
+
+/* style for tag definition (e.g. 700 - Statement of responsibility) */
+.MARCtag { 
+       clear : left;
+       font-weight : bold;
+       font-size : .8em;
+       margin-top : 5px;
+}
+
+div.tab p {
+       margin : 3px;
+}      
+
+/* style for each subfield (e.g.: Publication year), just before the biblio 
subfield */
+.labelsubfield {
+       clear : left;
+       float : left;
+       font-size : .8em;
+       font-weight : normal;
+       width : 12em;
+       margin-left : 30px;
+       display : inline;
+}
+
+#loading {
+       position: absolute;
+       top: 3em;
+       left: 3em;
+       padding: 1em;
+       font-size: 1.5em;
+       z-index: 999;
+       }
+       
+input.mandatory {
+       width : 55%;
+}
+
+div.tabs a.addbiblioTabOn {
+}
+
+div.tabs a.addbiblioTabOff {
+}
+
+input.addbiblioInput {
+       width : 55%;
+}
+
+input.addbiblioInputFocus {
+       width : 55%;
+}
+
+input.indicator {
+}
+
+input.indicatorFocus {
+}
\ No newline at end of file

Index: members/memberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.9
retrieving revision 1.3.2.9.2.1
diff -u -b -r1.3.2.9 -r1.3.2.9.2.1
--- members/memberentry.tmpl    31 Jan 2006 22:38:00 -0000      1.3.2.9
+++ members/memberentry.tmpl    11 Jul 2006 14:03:24 -0000      1.3.2.9.2.1
@@ -85,7 +85,7 @@
 <!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of 
Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" 
size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR 
NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
 </tr><!-- /TMPL_UNLESS -->
                                        
-       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Preferred Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
 
        <tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing 
Address</legend><!-- TMPL_IF NAME="ERROR_address" --><label for="streetaddress" 
class="focus"><!-- TMPL_ELSE --><label for="streetaddress"><!-- /TMPL_IF --><a 
name="address" id="address">Address:</a> </label>
 <!-- TMPL_IF NAME="ERROR_address" -->

Index: members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/moremember.tmpl,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.10.2.1
diff -u -b -r1.5.2.10 -r1.5.2.10.2.1
--- members/moremember.tmpl     8 Mar 2006 23:01:47 -0000       1.5.2.10
+++ members/moremember.tmpl     11 Jul 2006 14:03:24 -0000      1.5.2.10.2.1
@@ -125,7 +125,7 @@
 
 </p><!-- /TMPL_UNLESS --></div>
 
-<form class="inline" action="renewscript.pl" method="post">
+<form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post">
        <input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" 
-->" />
 <table>
        <caption>Items On Loan</caption>
@@ -168,7 +168,7 @@
        </table><!-- TMPL_UNLESS NAME="unvalidlibrarian"--><p><input 
type="submit" class="submit" value="Renew Checked Items" /></p><!-- 
/TMPL_UNLESS -->
 </form>
 
-<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form class="inline" 
action="renewscript.pl" method="post"><input type="hidden" name="bornum" 
value="<!-- TMPL_VAR name="bornum" -->" /><!-- TMPL_LOOP NAME="issueloop" 
--><!-- TMPL_UNLESS NAME="norenew" --><input type="hidden" 
name="renew_item_<!-- TMPL_VAR name="itemnumber" -->" value="y" /><!-- 
/TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" class="submit" 
value="Renew All" /></form><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form class="inline" 
action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /><!-- TMPL_LOOP 
NAME="issueloop" --><!-- TMPL_UNLESS NAME="norenew" --><input type="hidden" 
name="renew_item_<!-- TMPL_VAR name="itemnumber" -->" value="y" /><!-- 
/TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" class="submit" 
value="Renew All" /></form><!-- /TMPL_UNLESS -->
 
 
 

Index: parameters/aqbudget.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/aqbudget.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.4.2.1
diff -u -b -r1.2.2.4 -r1.2.2.4.2.1
--- parameters/aqbudget.tmpl    28 Sep 2005 19:22:22 -0000      1.2.2.4
+++ parameters/aqbudget.tmpl    11 Jul 2006 14:03:24 -0000      1.2.2.4.2.1
@@ -105,10 +105,6 @@
 <tr><th><label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" 
-->)</label></th><td><input type="text" id="startdate" name="startdate" 
value="<!-- TMPL_VAR NAME="startdate" -->" />&nbsp;</td></tr>
 <tr><th><label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" 
-->)</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- 
TMPL_VAR NAME="enddate" -->" /></td></tr>
 <tr><th><label for="budgetamount">Budget amount</label></th><td><input 
type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR 
NAME="budgetamount" -->" /></td></tr>
-<tr><th><label for="branch">Branch</label></th><td>    
-                       <!--TMPL_VAR Name="CGIbranch" -->
-                       <p>If budget is specifically allowed to a branch, 
select it here, otherwise leave it empty.</p></td></tr>
-<tr><th><label>Branch</label></th><td> <!--TMPL_VAR Name="CGIbranch" --> If 
budget is exclusive to a specific branch, select it here.  Otherwise leave it 
empty.</td></tr>
 </table></div>
 <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" 
-->" /><input type="button" value="<!-- TMPL_VAR NAME="header" -->" 
class="submit" onclick="Check(this.form)" /> <input type="button" 
class="cancel" value="Cancel" 
onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" 
/></form>
 <!-- /TMPL_IF -->

Index: parameters/checkmarc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.2.2.1
diff -u -b -r1.2.2.2 -r1.2.2.2.2.1
--- parameters/checkmarc.tmpl   8 Jun 2005 21:22:22 -0000       1.2.2.2
+++ parameters/checkmarc.tmpl   11 Jul 2006 14:03:24 -0000      1.2.2.2.2.1
@@ -66,6 +66,20 @@
        </tr>
 <!-- /TMPL_IF -->
 <!-- -->
+<!-- TMPL_IF name="itemtypes_empty" -->
+        <tr>
+                <td>itemtypes are empty</td>
+                <td>the itemtypes MUST<br />
+                        <ul><li>be filled</li>
+        </tr>
+<!-- TMPL_ELSE -->
+        <tr>
+                <td>OK</td>
+                <td>itemtypes defined</td>
+        </tr>
+<!-- /TMPL_IF -->
+<!-- -->
+
 <!-- TMPL_IF name="branch" -->
        <tr>
                <td>homebranch NOT mapped</td>

Index: parameters/systempreferences.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.5.2.1
diff -u -b -r1.3.2.5 -r1.3.2.5.2.1
--- parameters/systempreferences.tmpl   26 Jan 2006 21:47:09 -0000      1.3.2.5
+++ parameters/systempreferences.tmpl   11 Jul 2006 14:03:24 -0000      
1.3.2.5.2.1
@@ -198,6 +198,11 @@
                                        </a>
                                <!--/TMPL_IF-->
                        </li>
+       <!--TMPL_IF Name="Librarian"-->
+                       <li><a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" 
class="here">Intranet</a></li>
+       <!--TMPL_ELSE-->
+                       <li><a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet</a></li>
+       <!--/TMPL_IF-->
                        <li>
                                <!--TMPL_IF Name="Members"-->
                                        <a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="here">Members

Index: reports/inventory.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/inventory.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.2.1
diff -u -b -r1.1.2.2 -r1.1.2.2.2.1
--- reports/inventory.tmpl      7 Mar 2006 18:14:13 -0000       1.1.2.2
+++ reports/inventory.tmpl      11 Jul 2006 14:03:24 -0000      1.1.2.2.2.1
@@ -11,7 +11,7 @@
        <tr><th><label for="minlocation">Item Location (items.itemcallnumber) 
between:</label></th><td><input type="text" name="minlocation" id="minlocation" 
value="<!-- TMPL_VAR NAME="minlocation" -->" /> 
                        <label for="maxlocation">...and...</label>
                                <input type="text" name="maxlocation" 
id="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" /></td></tr>
-       <tr><th><label for="datelastseen">Not seen 
since:</label></th><td><input type="text" name="datelastseen" id="datelastseen" 
value="<!-- TMPL_VAR NAME="datelastseen" -->" size="10" maxlength="10" 
/></td></tr>
+       <tr><th><label for="datelastseen">Not seen since 
(yyyy-mm-dd):</label></th><td><input type="text" name="datelastseen" 
id="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" size="10" 
maxlength="10" /></td></tr>
        <tr><th><label for="pagesize">Items per Page: </label></th><td><input 
type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" 
maxlength="5" size="5" /></td></tr>
        <tr><th><label for="offset">Beginning at Page: </label></th><td><input 
type="text" name="offset" id="offset" value="<!-- TMPL_VAR NAME="offset" -->" 
size="5" maxlength="5" /></td></tr>
        </table>

Index: search.marc/result.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.4.2.1
diff -u -b -r1.5.2.4 -r1.5.2.4.2.1
--- search.marc/result.tmpl     20 Apr 2006 21:44:59 -0000      1.5.2.4
+++ search.marc/result.tmpl     11 Jul 2006 14:03:24 -0000      1.5.2.4.2.1
@@ -46,7 +46,7 @@
                                        </p></td>
                                        <td><!-- TMPL_VAR NAME="classification" 
--></td>
                        <td><!-- TMPL_VAR NAME="totitem" --></td>
-<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- 
TMPL_IF name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->) <!-- 
TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR 
NAME="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- 
/TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS 
--></td>
+<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- 
TMPL_IF name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->) <!-- 
TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR 
NAME="itemcallnumber" -->)<!-- TMPL_IF name="cnt" --> x <!-- TMPL_VAR 
name="cnt" --> <!--/TMPL_IF--><!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- 
/TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS 
--></td>
                </tr>
        <!-- /TMPL_LOOP -->
 </table></div>

Index: z3950/searchresult.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.2.2.1
diff -u -b -r1.2.2.2 -r1.2.2.2.2.1
--- z3950/searchresult.tmpl     26 Jan 2006 13:11:55 -0000      1.2.2.2
+++ z3950/searchresult.tmpl     11 Jul 2006 14:03:24 -0000      1.2.2.2.2.1
@@ -6,19 +6,19 @@
        <!-- TMPL_IF NAME="refresh" -->
                <meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR 
NAME="refresh" -->" />
        <!-- /TMPL_IF -->
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+       <!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" 
content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->"><!-- 
TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; 
charset=utf-8"><!-- /TMPL_IF -->
 <link rel="shortcut icon" href="/intranet-tmpl/npl/en/includes/favicon.ico" 
type="image/x-icon" />
 <style type="text/css"> 
-       @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+       <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR 
NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- 
TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' 
-->/includes/intranet.css);<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- 
TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR 
NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
-<link href="<!-- TMPL_VAR NAME="themelang" -->/includes/colors-bw.css" 
rel="stylesheet" type="text/css" />
 </head>
 
 <body>
 
 <div id="main-compact">
        <h2>Z3950 Search Results</h2>
-       
+       <!-- TMPL_IF NAME="numberpending" --><h3>Still <!-- TMPL_VAR 
NAME="numberpending" --> requests to go</h3><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="breeding_loop" -->
                <table>
                        <tr>
@@ -27,10 +27,9 @@
                                <th>ISBN</th>
                                <th>coming from</th>
                                <th>&nbsp;</th>
-                               <th>&nbsp;</th>
                        </tr>
                                <!-- TMPL_LOOP NAME="breeding_loop" -->
-                                       <tr bgcolor="<!-- TMPL_VAR 
NAME="toggle" -->">
+                                       <!-- TMPL_IF NAME="toggle" --><tr><!-- 
TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                                                <td><!-- TMPL_VAR NAME="title" 
--></td>
                                                <td><!-- TMPL_VAR NAME="author" 
--></td>
                                                <td><!-- TMPL_VAR NAME="isbn" 
--></td>
@@ -42,7 +41,7 @@
        <!-- TMPL_ELSE -->
                                <p>Nothing found</p>
        <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="numberpending" --><h1>Still <!-- TMPL_VAR 
NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
+       
        <script language="javascript" type="text/javascript">
                function Import(GetThisOne) {
                        opener.document.location= 
"../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR 
NAME="oldbiblionumber" -->&breedingid="+GetThisOne;

Index: includes/marc-editor.css
===================================================================
RCS file: includes/marc-editor.css
diff -N includes/marc-editor.css
--- includes/marc-editor.css    25 Apr 2005 22:03:18 -0000      1.1.2.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-div.tabbed {
-       border : 1px solid red;
-       /*position: absolute;*/
-       margin-left:5%;
-       width:90%;
-/*     display:block;*/
-}
-
-div.tabs {
-/*     border : 1px solid aqua;*/
-       float : left;
-       margin : 5px 0 0 0;
-/*     position:absolute;
-       margin-left: .5em;
-       margin-top:110px;*/
-}
-
-div.tabs a {
-       display:block;
-       background-color: #D8DEB8;
-       color: #000066;
-       font-weight : bold;
-       text-decoration : none;
-       border-bottom : 1px solid #999933;
-       border-left : 1px solid #999933;
-       border-right : 1px solid #FFFFCC;
-       border-top : 1px solid #FFFFCC;
-       margin : 0 0 2px 0;
-       padding: 10px 5px 10px 5px;
-}
-
-div.tabs a:hover {
-       background-color : #CCFF99;
-       border-left : 1px solid #000066;
-       border-bottom : 1px solid #000066;
-}
-
-div.tab {
-       background-color : #FFFFCC;
-       border : 1px solid #D8DEB8;
-       border-top : 1px solid #FFFFCC;
-       display: block;
-       visibility:hidden;
-       position : absolute;
-       margin : 5px 0 0 20px;
-       padding : 3px;
-       width : 70%;
-       /*margin-top:110px;*/
-}
-
-/* style for tag definition (e.g. 700 - Statement of responsibility) */
-.MARCtag { 
-       clear : left;
-       color : #000000;
-       background-color : #FFFFCC;
-       border-top : 7px solid #FFFFCC;
-       border-bottom : thin solid #CCCC99;
-       font-weight : bold;
-       font-size : .8em;
-       margin-top : 5px;
-}
-
-div.tab p {
-       margin : 3px;
-}      
-
-/* style for each subfield (e.g.: Publication year), just before the biblio 
subfield */
-.labelsubfield { 
-       background-color : #FFFFE1;
-/*     border : 1px solid red;*/
-       clear : left;
-       float : left;
-       font-size : .8em;
-       font-weight : normal;
-       width : 12em;
-       margin-left : 30px;
-       display : inline;
-}
-
-#loading {
-       position: absolute;
-       top: 3em;
-       left: 3em;
-       padding: 1em;
-       mozopacity: 50%;
-       background-color: #FFFFFF;
-       border: 10px solid #CCCC99;
-       font-size: 1.5em;
-       z-index: 999;
-       }
\ No newline at end of file




reply via email to

[Prev in Thread] Current Thread [Next in Thread]