koha-cvs
[Top][All Lists]
Advanced

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

[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull full-serial


From: Paul POULAIN
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull full-serial-issues.tmpl,1.1,1.2 bull-home.tmpl,1.3,1.4 serial-issues.tmpl,1.1,1.2 statecollection.tmpl,1.6,1.7 subscription-detail.tmpl,1.9,1.10
Date: Thu, 04 Aug 2005 06:50:39 -0700

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16051/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
        bull-home.tmpl serial-issues.tmpl statecollection.tmpl 
        subscription-detail.tmpl 
Added Files:
        full-serial-issues.tmpl 
Log Message:
synch'ing 2.2 and head


Index: bull-home.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bull-home.tmpl      1 Mar 2005 13:40:52 -0000       1.3
--- bull-home.tmpl      4 Aug 2005 13:50:37 -0000       1.4
***************
*** 5,10 ****
        <table>
                <tr>
-                       <th class="bull">Title</th>
                        <th class="bull">ISSN</th>
                        <th class="bull" colspan=2>&nbsp;</th>
                </tr>
--- 5,13 ----
        <table>
                <tr>
                        <th class="bull">ISSN</th>
+                       <th class="bull">Title</th>
+                       <th class="bull">
+                               Note
+                       </td>
                        <th class="bull" colspan=2>&nbsp;</th>
                </tr>
***************
*** 12,22 ****
                        <form action="bull-home.pl" method="post">
                        <td>
!                               <input type="text" size=40 maxlength=40 
name="title" value="<!-- TMPL_VAR name="title" -->">
                        </td>
                        <td>
!                               <input type="text" size=11 maxlength=11 
name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
                        </td>
!                       <td colspan=3>
!                               <input type="submit" value="filter" 
class="button bull">
                        </td>
                </tr>
--- 15,28 ----
                        <form action="bull-home.pl" method="post">
                        <td>
!                               <input type="text" size=10 maxlength=11 
name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->" title="type ISSN here to 
filter subscription">
                        </td>
                        <td>
!                               <input type="text" size=40 maxlength=40 
name="title" value="<!-- TMPL_VAR name="title" -->" title="type a title 
-complete or partial- to filter subscription">
                        </td>
!                       <td>
!                               &nbsp;
!                       </td>
!                       <td colspan=2>
!                               <input type="submit" value="filter" 
class="button bull" title="set a filter on ISSN / title">
                        </td>
                </tr>
***************
*** 24,35 ****
                        <tr>
                                <td>
!                                       <!-- TMPL_VAR name="title" --> <!-- 
TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                                </td>
                                <td>
!                                       <!-- TMPL_VAR name="ISSN" -->
                                </td>
                                <td>
!                                       <a 
href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull">Detail</a>
!                                       <a 
href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull">Recieve</a>
                                </td>
                        </tr>
--- 30,47 ----
                        <tr>
                                <td>
!                                       <!-- TMPL_IF name="ISSN" -->
!                                               <a 
href="bull/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" 
class="button bull" title="Issues history"><!-- TMPL_VAR name="ISSN" --></a>
!                                       <!-- /TMPL_IF -->
!                                       
!                               </td>
!                               <td>
!                                       <!-- TMPL_VAR name="title" -->
                                </td>
                                <td>
!                                       <!-- TMPL_IF name="notes" -->(<!-- 
TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                                </td>
                                <td>
!                                       <a 
href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="subscription 
detail">Detail</a>
!                                       <a 
href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="receive issues for this 
subscription">Receive</a>
                                </td>
                        </tr>

Index: serial-issues.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** serial-issues.tmpl  12 Aug 2004 14:37:36 -0000      1.1
--- serial-issues.tmpl  4 Aug 2005 13:50:37 -0000       1.2
***************
*** 1,11 ****
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="catalogue">Issues for a subscription</h1>
! <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button catalogue">Biblio</a>
! <form method="post" name="f">
! <div id="bloc25">
!       <h2 class="catalogue">Subscription information</h2>
!               <p>For <b><!-- TMPL_VAR name="bibliotitle" --></b> that began 
on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
                <b>
                <!--TMPL_IF name="periodicity1" -->
--- 1,14 ----
! <!-- TMPL_INCLUDE NAME="bull-top.inc" -->
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
!       <h1 class="bull">Issues for a subscription</h1>
!       <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull">Back to subscriptions</a>
!       <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull">Back to biblio</a>
!       <a class="button bull" href="serial-issues.pl?biblionumber=<!-- 
TMPL_VAR name="biblionumber" -->&selectview=full">Complete view</a>
! 
!       <!-- TMPL_LOOP name="subscription_LOOP" -->
!       <div id="bloc25">
!               <h2 class="bull">Subscription information for <!-- TMPL_VAR 
name="bibliotitle" --></h2>
!               <p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> 
and is issued every
                <b>
                <!--TMPL_IF name="periodicity1" -->
***************
*** 25,32 ****
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity6" -->
!                               2 monthes
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity7" -->
!                               3 Monthes
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity8" -->
--- 28,35 ----
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity6" -->
!                               2 months
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity7" -->
!                               3 months
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="periodicity8" -->
***************
*** 43,87 ****
                <!-- /TMPL_IF -->
                </b>
-               on
-               <b>
                <!--TMPL_IF name="arrival1" -->
!                       Monday
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival2" -->
!                               Tuesday
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival3" -->
!                               Wednesday
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival4" -->
!                               Thursday
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival5" -->
!                               Friday
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival6" -->
!                               Saturday
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival7" -->
!                               Sunday
                <!-- /TMPL_IF -->
!               </b>
!               </p>
!               <p>(subscription for 
                        <!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR 
name="numberlength" --> issues<!-- /TMPL_IF -->
                        <!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR 
name="weeklength" --> weeks<!-- /TMPL_IF -->
                        <!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR 
name="monthlength" --> months<!-- /TMPL_IF -->
!                       )
                </p>
                <p><!-- TMPL_VAR name="notes" --></p>
! </div>
! <div id="bloc25">
!       <h2 class="catalogue">Issues summary</h2>
!       <p>
!               <!-- TMPL_VAR name="librariannote" -->
!       </p>
! </div>
! 
  </div>
  
! <!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->
\ No newline at end of file
--- 46,102 ----
                <!-- /TMPL_IF -->
                </b>
                <!--TMPL_IF name="arrival1" -->
!                       on <b>monday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival2" -->
!                       on <b>tuesday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival3" -->
!                       on <b>wednesday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival4" -->
!                       on <b>thursday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival5" -->
!                       on <b>friday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival6" -->
!                       on <b>saturday</b>
                <!-- /TMPL_IF -->
                <!--TMPL_IF name="arrival7" -->
!                       on <b>sunday</b>
                <!-- /TMPL_IF -->
!               for <b>
                        <!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR 
name="numberlength" --> issues<!-- /TMPL_IF -->
                        <!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR 
name="weeklength" --> weeks<!-- /TMPL_IF -->
                        <!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR 
name="monthlength" --> months<!-- /TMPL_IF -->
!                       </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_UNLESS Name=fullinfo -->
                <p><!-- TMPL_VAR name="notes" --></p>
!               <!-- TMPL_IF name="opacnote" -->
!                       <h3 class="bull">Issues summary</h2>
!                       <p>
!                               <!-- TMPL_VAR name="opacnote" -->
!                       </p>
!               <!-- /TMPL_IF -->
!               <!-- TMPL_IF name="recievedlist" -->
!                       <h3 class="bull">Recieved issues</h2>
!                       <p>
!                               <!-- TMPL_VAR name="recievedlist" -->
!                       </p>
!               <!-- /TMPL_IF -->
!               <!-- TMPL_IF name="missinglist" -->
!                       <h3 class="bull">Missing issues</h2>
!                       <p>
!                               <!-- TMPL_VAR name="missinglist" -->
!                       </p>
!               <!-- /TMPL_IF -->
!       </div>
!       <!-- /TMPL_UNLESS -->
! <!-- /TMPL_LOOP -->
  </div>
  
! <!-- TMPL_INCLUDE NAME="bull-bottom.inc" -->

Index: statecollection.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** statecollection.tmpl        16 Jun 2005 19:10:09 -0000      1.6
--- statecollection.tmpl        4 Aug 2005 13:50:37 -0000       1.7
***************
*** 4,8 ****
  <div id="mainbloc">
  <h1 class="bull">Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
! <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull">Subscription</a>
  
  <div id="bloc25">
--- 4,10 ----
  <div id="mainbloc">
  <h1 class="bull">Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
! <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="detail of the 
subscription">Subscription</a>
! <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- 
TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
! <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" 
-->">Back to biblio</a>
  
  <div id="bloc25">

Index: subscription-detail.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** subscription-detail.tmpl    4 Aug 2005 08:54:55 -0000       1.9
--- subscription-detail.tmpl    4 Aug 2005 13:50:37 -0000       1.10
***************
*** 3,9 ****
  <div id="mainbloc">
  <h1 class="bull">Subscription</h1>
! <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull">Edit</a>
! <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull">Issues</a>
! <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button bull">Biblio</a>
  <!-- TMPL_UNLESS name="totalissues" -->
                <a href="javascript:confirm_deletion()" class="button bull">
--- 3,11 ----
  <div id="mainbloc">
  <h1 class="bull">Subscription</h1>
! <a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="Modify 
subscription">Edit</a>
! <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR 
name="subscriptionid" -->" class="button bull" title="Recieve 
issues">Receive</a>
! <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" 
class="button bull" title="All issues on this title">Issue history</a>
! <a href="/cgi-bin/koha/bull-home.pl?biblionumber=<!-- TMPL_VAR 
name="biblionumber" -->" class="button bull" title="all subscriptions on <!-- 
TMPL_VAR name="bibliotitle" -->">Subscriptions</a>
! <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->" class="button bull" title="go to <!-- TMPL_VAR name="bibliotitle" 
-->">Back to biblio</a>
  <!-- TMPL_UNLESS name="totalissues" -->
                <a href="javascript:confirm_deletion()" class="button bull">
***************
*** 15,30 ****
        <h2 class="bull">Subscription information</h2>
                <p>Librarian identity :</td><td> <!-- TMPL_VAR name="librarian" 
--></p>
!               <p><label class="label100">Supplier </label><!-- TMPL_VAR 
name="aqbooksellername" --></p>
!               <p><label class="label100">Cost</label><!-- TMPL_VAR 
name="cost" --></p>
!               <p><label class="label100">Budget </label><!-- TMPL_VAR 
name="bookfundid" --></p>
!               <p><label class="label100">Biblio</label><i>(<!-- TMPL_VAR 
name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
!               <p><label class="label100">Notes:</label><!-- TMPL_VAR 
name="notes" --></p>
!               <p>
!                       <!-- TMPL_IF name="letter" -->
!                               <label class="label100">Issue alert with 
letter:</label><!-- TMPL_VAR name="letter" -->
!                       <!-- TMPL_ELSE -->
!                               <label class="label100">Borrowers can't 
subscribe to issue alerts</label>
!                       <!-- /TMPL_IF -->
!               </p>
  </div>
  <div id="bloc25">
--- 17,25 ----
        <h2 class="bull">Subscription information</h2>
                <p>Librarian identity :</td><td> <!-- TMPL_VAR name="librarian" 
--></p>
!               <p><label>Supplier </label><!-- TMPL_VAR 
name="aqbooksellername" --></p>
!               <p><label>Cost</label><!-- TMPL_VAR name="cost" --></p>
!               <p><label>Budget </label><!-- TMPL_VAR name="bookfundid" --></p>
!               <p><label>Biblio</label><i>(<!-- TMPL_VAR name="biblionumber" 
-->)</i> <!-- TMPL_VAR name="bibliotitle" --></p>
!               <p><label>Notes:</label><!-- TMPL_VAR name="notes" --></p>
  </div>
  <div id="bloc25">




reply via email to

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