[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull bull-home.t
|
From: |
Paul POULAIN |
|
Subject: |
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull bull-home.tmpl,1.2,1.3 result.tmpl,1.4,1.5 subscription-detail.tmpl,1.6,1.7 |
|
Date: |
Tue, 01 Mar 2005 05:41:59 -0800 |
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/en/bull
Modified Files:
bull-home.tmpl result.tmpl subscription-detail.tmpl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits
done here
Index: bull-home.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bull-home.tmpl 5 Aug 2004 16:35:43 -0000 1.2
--- bull-home.tmpl 1 Mar 2005 13:40:52 -0000 1.3
***************
*** 24,28 ****
<tr>
<td>
! <!-- TMPL_VAR name="title" -->
</td>
<td>
--- 24,28 ----
<tr>
<td>
! <!-- TMPL_VAR name="title" --> <!--
TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
</td>
<td>
Index: result.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** result.tmpl 2 Dec 2004 16:42:15 -0000 1.4
--- result.tmpl 1 Mar 2005 13:40:52 -0000 1.5
***************
*** 5,9 ****
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search>
<img
src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
</a>
--- 5,9 ----
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a
href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev"
-->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!--
TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!--
TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
<img
src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
</a>
***************
*** 13,21 ****
<img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number
-->-highlight.gif">
<!-- TMPL_ELSE -->
! <a href=search.pl?startfrom=<!--
TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif"
border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
--- 13,21 ----
<img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number
-->-highlight.gif">
<!-- TMPL_ELSE -->
! <a
href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!--
TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR
name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR
NAME="resultsperpage" -->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif"
border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a
href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext"
-->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!--
TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!--
TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
***************
*** 48,52 ****
</td>
<td <!-- TMPL_IF name="even"
-->class="hilighted"<!-- /TMPL_IF -->>
! <a class="transparent" href="#"
onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR
name="title" -->') ">Get it!</a>
</td>
</tr>
--- 48,52 ----
</td>
<td <!-- TMPL_IF name="even"
-->class="hilighted"<!-- /TMPL_IF -->>
! <a class="transparent" href="#"
onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR
name="title" escape="URL" -->') ">Get it!</a>
</td>
</tr>
***************
*** 57,61 ****
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME=numbers -->
--- 57,61 ----
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=subscription-bib-search.pl?startfrom=<!--
TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!--
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!--
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME=numbers -->
***************
*** 63,71 ****
<img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number
-->-highlight.gif">
<!-- TMPL_ELSE -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR
NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term"
-->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif"
border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR
NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR
NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP
-->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
--- 63,71 ----
<img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number
-->-highlight.gif">
<!-- TMPL_ELSE -->
! <a
href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!--
TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR
name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR
NAME="resultsperpage" -->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif"
border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=subscription-bib-search.pl?startfrom=<!--
TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!--
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!--
/TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage"
-->&type=intranet&op=do_search><img
src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
Index: subscription-detail.tmpl
===================================================================
RCS file:
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** subscription-detail.tmpl 2 Nov 2004 16:29:13 -0000 1.6
--- subscription-detail.tmpl 1 Mar 2005 13:40:52 -0000 1.7
***************
*** 6,9 ****
--- 6,12 ----
<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="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR
name="subscriptionid" -->&op=del" class="button bull">Delete subscription</a>
+ <!-- /TMPL_UNLESS -->
<form method="post" name="f">
<div id="bloc25">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull bull-home.tmpl,1.2,1.3 result.tmpl,1.4,1.5 subscription-detail.tmpl,1.6,1.7,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/authorities auth_finder.pl,1.5,1.6 authorities-home.pl,1.8,1.9
- Next by Date:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/export marc.tmpl,1.6,1.7
- Previous by thread:
[Koha-cvs] CVS: koha/authorities auth_finder.pl,1.5,1.6 authorities-home.pl,1.8,1.9
- Next by thread:
[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/export marc.tmpl,1.6,1.7
- Index(es):