[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.25,1.26 currency.tmpl,1.12,1.13 marctagstructure.tmpl,1.31,1.32 systempreferences.tmpl,1.33,1.34
Paul POULAIN
tipaul at users.sourceforge.net
Thu Aug 4 16:05:21 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19613/koha-tmpl/intranet-tmpl/default/en/parameters
Modified Files:
branches.tmpl currency.tmpl marctagstructure.tmpl
systempreferences.tmpl
Log Message:
synch'ing 2.2 and head
Index: branches.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** branches.tmpl 30 Nov 2004 17:42:30 -0000 1.25
--- branches.tmpl 4 Aug 2005 14:05:19 -0000 1.26
***************
*** 4,13 ****
<h1>
- <!-- TMPL_IF NAME="use-heading-flags-p" -->
<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
- <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
</h1>
--- 4,11 ----
***************
*** 87,99 ****
<!-- TMPL_IF NAME="else" -->
<h1>
- <!-- TMPL_IF NAME="use-heading-flags-p" -->
<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
- <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
</h1>
! <font color="red"><!-- TMPL_VAR NAME="message" --></font>
<table border="1" cellpadding="5" cellspacing="0">
<tr>
--- 85,117 ----
<!-- TMPL_IF NAME="else" -->
<h1>
<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
</h1>
! <font color="red">
! <!-- TMPL_IF name="MESSAGE1" -->
! NEW Cannot change branch record: You must specify a Branchname and a Branchcode
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="MESSAGE2" -->
! NEW Branch record changed
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="MESSAGE3" -->
! NEW Branch record deleted
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="MESSAGE4" -->
! NEW Cannot change branch record: You must specify a Branchname and a Branchcode
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="MESSAGE5" -->
! NEW Category record changed
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="MESSAGE6" -->
! NEW The category has been deleted
! <!-- /TMPL_IF -->
! <!-- TMPL_IF name="MESSAGE7" -->
! Branch cannot be deleted because there are items using that branch
! <!-- /TMPL_IF -->
! </font>
<table border="1" cellpadding="5" cellspacing="0">
<tr>
Index: currency.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** currency.tmpl 14 Aug 2004 09:32:40 -0000 1.12
--- currency.tmpl 4 Aug 2005 14:05:19 -0000 1.13
***************
*** 150,162 ****
<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Currencies admin</h1>
- <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
- <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
- <input type="submit" value="Filter" class="button parameters">
- </form>
-
- <!-- TMPL_IF NAME="searchfield" -->
- You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
- <!-- /TMPL_IF -->
-
<table>
<tr>
--- 150,153 ----
Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** marctagstructure.tmpl 12 Jul 2005 14:12:44 -0000 1.31
--- marctagstructure.tmpl 4 Aug 2005 14:05:19 -0000 1.32
***************
*** 66,70 ****
<input type="hidden" name="op" value="add_validate">
<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! <p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
--- 66,75 ----
<input type="hidden" name="op" value="add_validate">
<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! <p><label>Tag<label><!-- TMPL_IF Name="searchfield" -->
! <!-- TMPL_VAR NAME="searchfield" -->
! <!-- TMPL_ELSE -->
! <input type="text" name="tagfield" value="" escape=HTML -->
! <!-- /TMPL_IF -->
! </p>
<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
***************
*** 125,130 ****
<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
<input type="submit" value="OK" class="button">
! <p>
! <i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF --> OnChange="javascript:document.f.submit()">
</p>
</form>
--- 130,138 ----
<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
<input type="submit" value="OK" class="button">
! <p><!-- TMPL_IF Name="select_display"-->
! <i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
! <!-- TMPL_ELSE -->
! <i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" OnChange="javascript:document.f.submit()">
! <!--/TMPL_IF -->
</p>
</form>
Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** systempreferences.tmpl 20 Jun 2005 13:12:12 -0000 1.33
--- systempreferences.tmpl 4 Aug 2005 14:05:19 -0000 1.34
***************
*** 140,201 ****
<tr>
<td>
! <!-- TMPL_IF name="Admin" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="Acquisitions" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="Authorities" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="Catalogue" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="Circulation" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="Members" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="OPAC" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a>
! <!-- /TMPL_IF -->
! </td>
! <td>
! <!-- TMPL_IF name="Others" -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others</a>
! <!-- TMPL_ELSE -->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others</a>
! <!-- /TMPL_IF -->
</td>
</tr>
</table>
- <!-- TMPL_VAR NAME="searchfield" -->
<table border="0" cellspacing="0" cellpadding="2">
<tr valign="top" bgcolor="#99cc33">
--- 140,216 ----
<tr>
<td>
! <!--TMPL_IF Name="Admin"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="Acquisitions"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="Authorities"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="Catalogue"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="Circulation"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="Members"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="OPAC"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! </a>
! <!--/TMPL_IF-->
! </td>
! <td>
! <!--TMPL_IF Name="Others"-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others
! </a>
! <!--TMPL_ELSE-->
! <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! </a>
! <!--/TMPL_IF-->
</td>
</tr>
</table>
<table border="0" cellspacing="0" cellpadding="2">
<tr valign="top" bgcolor="#99cc33">
More information about the Koha-cvs
mailing list