[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters branches.tmpl,1.21,1.22 marc_subfields_structure.tmpl,1.25,1.26 systempreferences.tmpl,1.24,1.25
Paul POULAIN
tipaul at users.sourceforge.net
Tue Mar 16 14:39:53 CET 2004
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32430/koha-tmpl/intranet-tmpl/default/en/parameters
Modified Files:
branches.tmpl marc_subfields_structure.tmpl
systempreferences.tmpl
Log Message:
synch'ing with 2.0 branch
Index: branches.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** branches.tmpl 11 Mar 2004 05:42:56 -0000 1.21
--- branches.tmpl 16 Mar 2004 13:39:50 -0000 1.22
***************
*** 124,128 ****
<br><!-- TMPL_VAR NAME="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branchphone" -->
! <br>Ph: <!-- TMPL_VAR NAME="branchphone" escape="HTML" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branchfax" -->
<br>Fax: <!-- TMPL_VAR NAME="branchfax" escape="HTML" --><!-- /TMPL_IF -->
--- 124,128 ----
<br><!-- TMPL_VAR NAME="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branchphone" -->
! <br>Phone: <!-- TMPL_VAR NAME="branchphone" escape="HTML" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="branchfax" -->
<br>Fax: <!-- TMPL_VAR NAME="branchfax" escape="HTML" --><!-- /TMPL_IF -->
Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** marc_subfields_structure.tmpl 20 Feb 2004 02:49:28 -0000 1.25
--- marc_subfields_structure.tmpl 16 Mar 2004 13:39:51 -0000 1.26
***************
*** 16,19 ****
--- 16,20 ----
<th>Koha field</th>
<th>Tab</th>
+ <th>See also (in searches)</th>
<th>Authorised value or<br/>
Thesaurus category</th>
***************
*** 28,31 ****
--- 29,33 ----
<td><!-- TMPL_VAR name="kohafield" --></td>
<td><!-- TMPL_VAR name="tab" --></td>
+ <td><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20 maxlength=80></td>
<td><!-- TMPL_VAR name="authorised_value" --><br/>
or <!-- TMPL_VAR name="thesaurus_category" --><br/>
***************
*** 80,83 ****
--- 82,86 ----
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Mand</b> <span style="font-size:8;color:red" title="subfield is mandatory (1=yes, 0=no)">?</span></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Tab</b> <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></td>
+ <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>See also</b> <span style="font-size:8;color:red" title="if subfields entered here, searches on this field will also be done on seealso subfields (syntax 200a,300e)">?</span></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Auth value</b> <span style="font-size:8;color:red" title="values authorised for this subfield">?</span></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Thesaurus</b> <span style="font-size:8;color:red" title="Thesaurus linked to this subfield">?</span></td>
***************
*** 92,95 ****
--- 95,99 ----
<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
<td><!-- TMPL_VAR name="tab" --></td>
+ <td><!-- TMPL_VAR name="seealso" --></td>
<td><!-- TMPL_VAR name="authorised_value" --></td>
<td><!-- TMPL_VAR name="thesaurus_category" --></td>
Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** systempreferences.tmpl 11 Mar 2004 05:47:29 -0000 1.24
--- systempreferences.tmpl 16 Mar 2004 13:39:51 -0000 1.25
***************
*** 1,7 ****
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
! <script>
! function _(s) { return s } // dummy function for gettext
! /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
if (f.value.length ==0) {
--- 1,7 ----
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
! <script language="JavaScript" type="text/javascript">
! function _(s) { return s } // dummy function for gettext
! //
function isNotNull(f,noalert) {
if (f.value.length ==0) {
***************
*** 10,14 ****
return true;
}
! /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
var x=f.value.toUpperCase();
--- 10,14 ----
return true;
}
! //
function toUC(f) {
var x=f.value.toUpperCase();
***************
*** 16,20 ****
return true;
}
! /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
--- 16,20 ----
return true;
}
! //
function isNum(v,maybenull) {
var n = new Number(v.value);
***************
*** 27,31 ****
return true;
}
! /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
var t = Date.parse(f.value);
--- 27,31 ----
return true;
}
! //
function isDate(f) {
var t = Date.parse(f.value);
***************
*** 34,38 ****
}
}
! /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
var ok=1;
--- 34,38 ----
}
}
! //
function Check(f) {
var ok=1;
***************
*** 54,77 ****
}
}
! </SCRIPT>
<!-- TMPL_IF name="add_form" -->
! <!------------------------------------------------------------------------------------------------>
<!-- TMPL_IF NAME=modify -->
<h1>Modify a system preference</h1>
<!-- TMPL_ELSE -->
! <H1>Add a system preference</H1>
<!-- /TMPL_IF -->
! <form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
! <input type=hidden name=op value='add_validate'>
<table>
! <!-- TMPL_IF NAME=searchfield -->
! <tr><td>Variable</td><td><!-- TMPL_VAR name="searchfield" --><input type=hidden name=variable value='<!-- TMPL_VAR NAME=searchfield -->'></td></tr>
<!-- TMPL_ELSE -->
! <tr><td>Variable</td><td><input type=text name=variable></td></tr>
<!-- /TMPL_IF -->
! <tr><td>Value</td><td><input type=text name=value value="<!-- TMPL_VAR name="value" escape=HTML -->"></td></tr>
! <tr><td>Explanation</td><td><input type=text name=explanation size=80 value="<!-- TMPL_VAR name="explanation" escape=HTML -->"></td></tr>
! <tr><td> </td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
</table>
</form>
--- 54,77 ----
}
}
! </script>
<!-- TMPL_IF name="add_form" -->
!
<!-- TMPL_IF NAME=modify -->
<h1>Modify a system preference</h1>
<!-- TMPL_ELSE -->
! <h1>Add a system preference</h1>
<!-- /TMPL_IF -->
! <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
! <input type="hidden" name="op" value="add_validate">
<table>
! <!-- TMPL_IF NAME="searchfield" -->
! <tr><td>Variable</td><td><!-- TMPL_VAR name="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td></tr>
<!-- TMPL_ELSE -->
! <tr><td>Variable</td><td><input type="text" name="variable" size="60"></td></tr>
<!-- /TMPL_IF -->
! <tr><td>Value</td><td><input type="text" name="value" value="<!-- TMPL_VAR name="value" escape="HTML" -->" size="60"></td></tr>
! <tr><td>Explanation</td><td><input type="text" name="explanation" size="60" value="<!-- TMPL_VAR name="explanation" escape="HTML" -->"></td></tr>
! <tr><td> </td><td><INPUT type="button" value="OK" onclick="Check(this.form)"></td></tr>
</table>
</form>
***************
*** 79,100 ****
<!-- TMPL_IF name="add_validate" -->
! <!------------------------------------------------------------------------------------------------>
Data recorded
! <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
! <input type=submit value=OK>
</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_confirm" -->
! <!------------------------------------------------------------------------------------------------>
! <table border=0 cellspacing=0 cellpadding=2>
! <tr valign=top bgcolor="#99cc33">
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
</tr>
<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
! <form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<!-- TMPL_VAR name="searchfield" -->'>
! <tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
! <tr><td><INPUT type=submit value='YES'></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO></form></td></tr>
</table>
--- 79,100 ----
<!-- TMPL_IF name="add_validate" -->
!
Data recorded
! <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! <input type="submit" value="OK">
</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_confirm" -->
!
! <table border="0" cellspacing="0" cellpadding="2">
! <tr valign="top" bgcolor="#99cc33">
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
</tr>
<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
! <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
! <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
! <tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
</table>
***************
*** 102,150 ****
<!-- TMPL_IF name="delete_confirmed" -->
! <!------------------------------------------------------------------------------------------------>
Data deleted
! <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
! <input type=submit value=OK>
</form>
<!-- /TMPL_IF -->
- <!------------------------------------------------------------------------------------------------>
<!-- TMPL_IF name="else" -->
<h1>System preferences admin</h1>
! <form action=/cgi-bin/koha/admin/systempreferences.pl method=post>
! <input type=text name=searchfield value="">
! <input type=reset name=reset value="clr">
</form>
<!-- TMPL_VAR name="searchfield" -->
! <table border=0 cellspacing=0 cellpadding=2>
! <tr valign=top bgcolor="#99cc33">
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Value</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Explanation</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"> </td>
! <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"> </td>
<!-- TMPL_LOOP name="loop" -->
! </tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
<td><!-- TMPL_VAR name="variable" --></td>
<td><!-- TMPL_VAR name="value" --></td>
<td><!-- TMPL_VAR name="explanation" --></td>
! <td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width=32 hspace=0 vspace=0 border=0><br>Edit</a></td>
! <td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0><br>Delete</a></td>
</tr>
<!-- /TMPL_LOOP -->
! <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
! <input type=hidden name=op value=add_form>
</table>
! <table width=40%>
<tr>
! <td width=50%><!-- TMPL_VAR name="previous" --></td>
! <td width=50%><!-- TMPL_VAR name="next" --></td>
</tr>
</table>
</form>
! <form action=<!-- TMPL_VAR name="script_name" --> method=post>
! <input type='hidden' name='op' value='add_form'>
! <input type=submit class="button" value='Add System preference'>
</form>
--- 102,149 ----
<!-- TMPL_IF name="delete_confirmed" -->
!
Data deleted
! <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! <input type="submit" value="OK">
</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="else" -->
<h1>System preferences admin</h1>
! <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
! <input type="text" name="searchfield" value="">
! <input type="reset" name="reset" value="clr">
</form>
<!-- TMPL_VAR name="searchfield" -->
! <table border="0" cellspacing="0" cellpadding="2">
! <tr valign="top" bgcolor="#99cc33">
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Variable</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Value</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Explanation</b></td>
<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"> </td>
! <td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"> </td></tr>
<!-- TMPL_LOOP name="loop" -->
! <tr valign="top" bgcolor="<!-- TMPL_VAR name="bgcolor" -->">
<td><!-- TMPL_VAR name="variable" --></td>
<td><!-- TMPL_VAR name="value" --></td>
<td><!-- TMPL_VAR name="explanation" --></td>
! <td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0"><br>Edit</a></td>
! <td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"><br>Delete</a></td>
</tr>
<!-- /TMPL_LOOP -->
! <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! <input type="hidden" name="op" value="add_form">
</table>
! <table width="40%">
<tr>
! <td width="50%"><!-- TMPL_VAR name="previous" --></td>
! <td width="50%"><!-- TMPL_VAR name="next" --></td>
</tr>
</table>
</form>
! <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! <input type="hidden" name="op" value="add_form">
! <input type="submit" class="button" value="Add System preference">
</form>
More information about the Koha-cvs
mailing list