[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull full-serial-issues.tmpl,NONE,1.1.2.1 bull-home.tmpl,1.2.2.1,1.2.2.2 serial-issues.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.4.2.2,1.4.2.3 subscription-detail.tmpl,1.6.2.4,1.6.2.5
Paul POULAIN
tipaul at users.sourceforge.net
Tue Aug 2 17:00:42 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139/koha-tmpl/intranet-tmpl/default/en/bull
Modified Files:
Tag: rel_2_2
bull-home.tmpl serial-issues.tmpl statecollection.tmpl
subscription-detail.tmpl
Added Files:
Tag: rel_2_2
full-serial-issues.tmpl
Log Message:
introducing history list as in OPAC
+ adding some links & renaming some link not clear enough.
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="bull-top.inc" -->
<!-- TMPL_UNLESS name="popup" -->
<h1 class="bull">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
<p>
<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Back to biblio</a>
<!-- /TMPL_UNLESS -->
<!-- TMPL_LOOP NAME="years" -->
<!-- TMPL_IF NAME="year" -->
<a class="button bull" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<a class=" button bull" href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
</p>
<!-- TMPL_LOOP NAME="years" -->
<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
<table>
<tr>
<th class="bull">Information
</th>
<th class="bull">Date
</th>
<th class="bull">Number
</th>
<th class="bull">Status
</th>
</tr>
<!-- TMPL_LOOP Name="serials" -->
<tr>
<td>
<!-- TMPL_VAR name="notes" -->
</td>
<td>
<!-- TMPL_VAR Name="planneddate" -->
</td>
<td>
<!-- TMPL_VAR Name="serialseq" -->
</td>
<td>
<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
</div>
<!--/TMPL_LOOP -->
<script language="JavaScript" type="text/javascript">
active(<!-- TMPL_VAR name="yearmin" -->);
function active(numlayer)
{
for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
ong = i;
link = "link"+i;
if (numlayer==i) {
document.getElementById(ong).style.visibility="visible";
} else {
document.getElementById(ong).style.visibility="hidden";
}
}
}
</script>
</body>
</html>
Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** bull-home.tmpl 11 Jan 2005 15:07:59 -0000 1.2.2.1
--- bull-home.tmpl 2 Aug 2005 15:00:37 -0000 1.2.2.2
***************
*** 5,10 ****
<table>
<tr>
- <th class="bull">Title</th>
<th class="bull">ISSN</th>
<th class="bull" colspan=2> </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> </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>
!
! </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.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** serial-issues.tmpl 12 Aug 2004 14:37:36 -0000 1.1
--- serial-issues.tmpl 2 Aug 2005 15:00:37 -0000 1.1.2.1
***************
*** 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.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** statecollection.tmpl 28 Jun 2005 07:35:49 -0000 1.4.2.2
--- statecollection.tmpl 2 Aug 2005 15:00:37 -0000 1.4.2.3
***************
*** 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.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** subscription-detail.tmpl 25 Mar 2005 16:50:06 -0000 1.6.2.4
--- subscription-detail.tmpl 2 Aug 2005 15:00:37 -0000 1.6.2.5
***************
*** 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">
More information about the Koha-cvs
mailing list