[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull full-serial-issues.tmpl,NONE,1.1.2.1 serial-issues.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.2.2.2,1.2.2.3 subscription-detail.tmpl,1.2.2.1,1.2.2.2
Owen Leonard
oleonard at users.sourceforge.net
Mon Sep 19 22:46:16 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18571/koha-tmpl/intranet-tmpl/npl/en/bull
Modified Files:
Tag: rel_2_2
serial-issues.tmpl statecollection.tmpl
subscription-detail.tmpl
Added Files:
Tag: rel_2_2
full-serial-issues.tmpl
Log Message:
Synching with default template. Might have to debug full-serial-issues again after Bug 1019 is fixed.
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
<!-- TMPL_UNLESS name="popup" -->
<h1>Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
<div class="tabbed">
<form class="inline" action="/cgi-bin/koha/detail.pl" method="get">
<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
<input type="submit" class="submit" value="Back to biblio" />
</form>
<!-- /TMPL_UNLESS -->
<!-- TMPL_LOOP NAME="years" -->
<!-- TMPL_IF NAME="year" --><form class="inline" action="" method="get">
<input type="submit" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" class="submit" value="<!-- TMPL_VAR NAME="year" -->" />
</form> <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<form class="inline" action="serial-issues.pl" method="get">
<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
<input type="hidden" name="selectview" value="small" />
<input type="submit" class="submit" value="Compact view" />
</form>
</div>
<!-- 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>Information</th>
<th>Date</th>
<th>Number</th>
<th>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 -->
</div>
<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: serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/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 1 Nov 2004 22:52:53 -0000 1.1
--- serial-issues.tmpl 19 Sep 2005 20:46:14 -0000 1.1.2.1
***************
*** 1,11 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
! <div>
! <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>
! <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,27 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
!
! <div id="main">
! <h1>Issues for a subscription</h1>
! <form class="inline" action="/cgi-bin/koha/bull-home.pl" method="get">
! <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
! <input type="submit" class="submit" value="Subscription Info" />
! </form>
! <form class="inline" action="/cgi-bin/koha/detail.pl" method="get">
! <input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
! <input type="submit" class="submit" value="Bibliographic Record" />
! </form>
! <form class="inline" action="serial-issues.pl" method="get">
! <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
! <input type="hidden" name="selectview" value="full" />
! <input type="submit" class="submit" value="Detailed Issues View" />
! </form>
!
! <!-- TMPL_LOOP name="subscription_LOOP" -->
! <div class="notes">
! <h3>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h3>
! <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" -->
--- 41,48 ----
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity6" -->
! 2 months
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity7" -->
! 3 months
<!-- /TMPL_IF -->
<!--TMPL_IF name="periodicity8" -->
***************
*** 43,86 ****
<!-- /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>
! <h2 class="catalogue">Issues summary</h2>
! <p>
! <!-- TMPL_VAR name="librariannote" -->
! </p>
</div>
</div>
--- 59,118 ----
<!-- /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" -->
</div>
+ <div class="notes">
+
+ <!--TMPL_UNLESS Name="fullinfo" -->
+ <!-- TMPL_IF NAME="notes" --><p><!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="opacnote" -->
+ <h3>Issues summary</h2>
+ <p>
+ <!-- TMPL_VAR name="opacnote" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="recievedlist" -->
+ <h3>Received issues</h2>
+ <p>
+ <!-- TMPL_VAR name="recievedlist" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_IF name="missinglist" -->
+ <h3>Missing issues</h2>
+ <p>
+ <!-- TMPL_VAR name="missinglist" -->
+ </p>
+ <!-- /TMPL_IF -->
+ </div>
+ <!-- /TMPL_UNLESS -->
+ <!-- /TMPL_LOOP -->
</div>
Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** statecollection.tmpl 30 Jun 2005 20:17:20 -0000 1.2.2.2
--- statecollection.tmpl 19 Sep 2005 20:46:14 -0000 1.2.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,33 ****
<div id="main">
<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" value="Edit Subscription" class="submit" /></form>
! <div class="data">
! <form method="post" name="f" action="statecollection.pl">
! <input type="hidden" name="op" value="modsubscriptionhistory" />
! <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
! <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
! <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
! <table>
! <caption>Subscription Summary</caption>
! <tr><th><label>Librarian:</label></th><td><!-- TMPL_VAR name="user" --></td></tr>
! <tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
! <tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! <tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! <tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
! <tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- <tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
! </table>
! <p><input type="submit" value="Save changes" class="submit" /></p>
! </form>
! </div>
<div class="data">
! <form method="post" name="f" action="statecollection.pl">
<input type="hidden" name="op" value="serialchangestatus" />
<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
--- 6,15 ----
<div id="main">
<h1>Subscription for <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" value="Edit Subscription" class="submit" /></form>
! <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="post"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="View in Catalog" class="submit" /></form>
<div class="data">
! <form method="post" action="statecollection.pl">
<input type="hidden" name="op" value="serialchangestatus" />
<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
***************
*** 40,43 ****
--- 22,26 ----
<th scope="col">Expected</th>
<th scope="col">Status</th>
+ <th scope="col">Notes</th>
</tr>
<!-- TMPL_LOOP name="serialslist" -->
***************
*** 82,87 ****
--- 65,92 ----
</select>
</td>
+ <td>
+ <input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size="20" maxlength="255" />
+ </td>
</tr>
<!-- /TMPL_LOOP -->
+ <!-- TMPL_UNLESS name="hassubscriptionexpired" -->
+ <tr>
+ <td>
+ Manual issue <input type="text" name="serialseq" size="30" maxlength="100" />
+ </td>
+ <td>
+ <input type="text" name="planneddate" size="10" maxlength="15" />
+ </td>
+ <td>
+ <input type="hidden" name="serialid" value="0" />
+ <select name="status" size="1">
+ <option value="2">Arrived</option>
+ <option value="3" selected>Late</option>
+ <option value="4">Missing</option>
+ </select>
+ </td>
+ <td> </td>
+ </tr>
+ <!-- /TMPL_UNLESS -->
</table>
<p><input type="submit" value="Save changes" accesskey="w" class="submit" /></p>
***************
*** 89,94 ****
<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="submit">Renew</a> your subscription</p>
<!-- /TMPL_IF -->
! </div>
! </form>
</div>
--- 94,118 ----
<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="submit">Renew</a> your subscription</p>
<!-- /TMPL_IF -->
! </form> </div>
!
! <div class="data">
! <form method="post" action="statecollection.pl">
! <input type="hidden" name="op" value="modsubscriptionhistory" />
! <input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->" />
! <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
! <input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
! <table>
! <caption>Subscription Summary</caption>
! <tr><th><label>Librarian:</label></th><td><!-- TMPL_VAR name="user" --></td></tr>
! <tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
! <tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! <tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! <tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
! <tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- <tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
! </table>
! <p><input type="submit" value="Save changes" class="submit" /></p>
! </form>
! </div>
</div>
Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** subscription-detail.tmpl 11 Jan 2005 16:53:39 -0000 1.2.2.1
--- subscription-detail.tmpl 19 Sep 2005 20:46:14 -0000 1.2.2.2
***************
*** 6,10 ****
<div id="main">
<h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" 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 Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
<div class="data">
--- 6,18 ----
<div id="main">
<h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form>
!
! <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form>
!
! <form class="inline" action="/cgi-bin/koha/bull/statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="1" /><input type="submit" class="submit" value="Receive Issues" /></form>
!
! <form class="inline" 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 Bibliographic Record" /></form>
!
! <!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
<div class="data">
More information about the Koha-cvs
mailing list