commiting forgotten changes before releasing 1.3.2

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
index f0d3549..bb22ccd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl
@@ -1,5 +1,12 @@
 <TMPL_INCLUDE NAME="acquisitions-top.inc">
 
+<STYLE TYPE="text/css" MEDIA=screen>
+       table { font-family:Arial;
+       font-weight:normal;     
+       text-decoration:none;
+       font-size:12pt;}
+</STYLE>
+
 <form method="post" name="f">
 <table width=100% cellspacing=0 cellpadding=5 border=1>
 <tr background="/images/background-mem.gif">
@@ -19,14 +26,17 @@
                <td width=9% align="center"><a href="javascript:active(7)"><div id="link7">7</div></a></td>
                <td width=9% align="center"><a href="javascript:active(8)"><div id="link8">8</div></a></td>
                <td width=9% align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
-               <td width=10% align="center"><input type="hidden" name="op" value="addbiblio"><input type="button" value=">>> items" onClick='Check(this.form)'></td>
+               <td width=10% align="center"><input type="hidden" name="op" value="addbiblio">
+                                                                                               <input type="hidden" name="oldbiblionumber" value="<TMPL_VAR name="oldbiblionumber">">
+                                                                                               <input type="button" value=">>> items" onClick='Check(this.form)'>
+               </td>
        </tr>
        </table>
        </td>
 </tr>
 </table>
    <DIV name="0XX" id="0XX" style="position:absolute;left:40px;top:150px;visibility:visible;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
+    <table width=100%  cellspacing=0 cellpadding=2 border=0>
        <TMPL_LOOP name="0XX">
        <tr background="/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
        <TMPL_LOOP name="subfield_loop">

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio2.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio2.tmpl
deleted file mode 100644 (file)
index 39493d6..0000000
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio2.tmpl
+++ /dev/null
@@ -1,73 +0,0 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-<form method="post">
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="/images/background-mem.gif">
-       <th>MARC biblio : <TMPL_VAR name="bibid"></th>
-</tr>
-<tr>
-       <td>
-       <table width=100% border=0 colspacing=0 cellpadding=0>
-       <tr>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=9% align="center">&nbsp;</td>
-               <td width=10% align="center">
-                       <input type="hidden" name="op" value="additem">
-                       <input type="hidden" name="bibid" value="<TMPL_VAR name="bibid">">
-                       </td>
-       </tr>
-       </table>
-       </td>
-</tr>
-</table>
-<br />
-<center>
-<DIV name="10XX" id="10XX">
-<table border=1 cellspacing=0 cellpadding=5 width=100%>
-       <tr  background="/images/background-mem.gif">
-               <th>Existing items</th>
-       </tr>
-</table>
-<table border=1 cellspacing=0 cellpadding=0 width=100%>
-       <tr  background="/images/background-mem.gif">
-               <TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP>
-       </tr>
-               <TMPL_LOOP name="item_loop">
-               <tr>
-                               <TMPL_VAR name="item_value">
-               </tr>
-       </TMPL_LOOP>
-</table>
-</DIV>
-<br /><br />
-<table border=1 cellspacing=0 cellpadding=5 width=100%>
-       <tr  background="/images/background-mem.gif">
-               <th>New items</th>
-       </tr>
-</table><table width=100%  cellspacing=0 cellpadding=5 border=0>
-       <TMPL_LOOP name="item">
-       <tr>
-               <td width="3%">&nbsp;</td>
-               <td width="2%"><TMPL_VAR name="subfield"></td>
-               <td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></td>
-               <td width="40%">
-                       <TMPL_VAR name="marc_value">
-                       <input type="hidden" name="tag" value="<TMPL_VAR name="tag">">
-                       <input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
-               </td>
-       </tr>
-       </tmpl_loop>
-</table>
-<input type="submit" value=">>> Enter item">
-</center>
-</form>
-
-</body>
-</html>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
new file mode 100644 (file)
index 0000000..d506742
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl
@@ -0,0 +1,75 @@
+<TMPL_INCLUDE NAME="acquisitions-top.inc">
+<form method="post" action="additem.pl">
+<table width=100% cellspacing=0 cellpadding=5 border=1>
+<tr background="/images/background-mem.gif">
+       <th>MARC biblio : <TMPL_VAR name="bibid"></th>
+</tr>
+<tr>
+       <td>
+       <table width=100% border=0 colspacing=0 cellpadding=0>
+       <tr>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=9% align="center">&nbsp;</td>
+               <td width=10% align="center">
+                       <input type="hidden" name="op" value="<TMPL_VAR name="op">">
+                       <input type="hidden" name="bibid" value="<TMPL_VAR name="bibid">">
+                       </td>
+       </tr>
+       </table>
+       </td>
+</tr>
+</table>
+<br />
+<center>
+<DIV name="10XX" id="10XX">
+<table border=1 cellspacing=0 cellpadding=5 width=100%>
+       <tr  background="/images/background-mem.gif">
+               <th>Existing items</th>
+       </tr>
+</table>
+<table border=1 cellspacing=0 cellpadding=0 width=100%>
+       <tr  background="/images/background-mem.gif">
+               <TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP><th colspan=2>&nbsp;</th>
+       </tr>
+               <TMPL_LOOP name="item_loop">
+               <tr>
+                       <TMPL_VAR name="item_value">
+                       <td><a href="additem.pl?op=edititem&bibid=<TMPL_VAR name="bibid">&itemnum=<TMPL_VAR name="itemnum">">Edit</a></td>
+               </tr>
+               </TMPL_LOOP>
+</table>
+</DIV>
+<br /><br />
+<table border=1 cellspacing=0 cellpadding=5 width=100%>
+       <tr  background="/images/background-mem.gif">
+               <th>New Item</th>
+       </tr>
+</table><table width=100%  cellspacing=0 cellpadding=5 border=0>
+       <TMPL_LOOP name="item">
+       <tr>
+               <td width="3%">&nbsp;</td>
+               <td width="2%"><TMPL_VAR name="subfield"></td>
+               <td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"></b></TMPL_IF></td>
+               <td width="40%">
+                       <TMPL_VAR name="marc_value">
+                       <input type="hidden" name="tag" value="<TMPL_VAR name="tag">">
+                       <input type="hidden" name="subfield" value="<TMPL_VAR name="subfield">">
+               </td>
+       </tr>
+       </tmpl_loop>
+</table>
+<input type="hidden" name="itemnum" value="<TMPL_VAR name="itemnum">">
+<input type="submit" value=">>> Enter item">
+</center>
+</form>
+
+</body>
+</html>

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl
index 6f4a579..ee5a985 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl
@@ -19,10 +19,10 @@ Results <TMPL_VAR name="showoffset"> to <TMPL_VAR name="total"> displayed
 
 <TMPL_LOOP name="loop">
        <tr valign="top" bgcolor="<TMPL_VAR name="toggle">">
-       <td><a href="additem.pl?biblionumber=<TMPL_VAR name="biblionumber">"><TMPL_VAR name="title"></a></td>
+       <td><TMPL_VAR name="title"></a>
        <td><TMPL_VAR name="author"></td>
        <td><TMPL_VAR name="copyrightdate"></td>
-       <td><a href="additem.pl?biblionumber=<TMPL_VAR name="biblionumber">">Edit...</a></td>
+       <td><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">">Edit...</a></td>
        </tr>
 </TMPL_LOOP>
 </table>

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
index faee10c..a40e52e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/searchresults.tmpl
@@ -30,9 +30,9 @@
     </TMPL_IF>
     <TMPL_LOOP NAME=numbers>
        <TMPL_IF NAME=highlight>
-           <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif> 
+           <img src=/images/numbers/<TMPL_VAR NAME=number>-highlight.gif>
        <TMPL_ELSE>
-           <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a> 
+           <a href=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><img src=/images/numbers/<TMPL_VAR NAME=number>.gif border=0></a>
        </TMPL_IF>
     </TMPL_LOOP>
     <TMPL_IF NAME=displaynext>
@@ -64,7 +64,7 @@
 
     <TMPL_LOOP NAME=SEARCH_RESULTS>
       <tr>
-      <td><a href=/cgi-bin/koha/detail.pl?type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>&bib=<TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
+      <td><a href=/cgi-bin/koha/<TMPL_VAR name="script">?type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>&bib=<TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
       <td><a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME=authorhtmlescaped>&type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><TMPL_VAR NAME=author></a></td>
       <td align=center> <TMPL_VAR NAME=copyrightdate> </td>
       <td align=center> <TMPL_VAR NAME=itemcount> </td>

diff --git a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
new file mode 100644 (file)
index 0000000..ab11a86
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
@@ -0,0 +1,134 @@
+<HTML>\r
+<TITLE>WELCOME TO THE  KOHA OPAC </TITLE>\r
+\r
+\r
+<style type="text/css">\r
+<!--\r
+input{font-size:16px}\r
+-->\r
+\r
+</style>\r
+\r
+\r
+</HEAD>\r
+\r
+<BODY   onload="document.catsearch.keyword.focus()"\r
+       BGCOLOR="#339999" \r
+       text="black" \r
+       link="white" \r
+       vlink="white" \r
+       alink="#663366" \r
+       leftmargin=0 \r
+       topmargin=0\r
+       marginheight=0\r
+       marginwidth=0 >\r
+\r
+<center>\r
+<table cellspacing=0 cellpadding=0 border=0 >\r
+       \r
+  <tr valign=top >\r
+       <td background="/images/front-background-med.gif"><img src="/images/holder.gif" \r
+       width=1 height=440 align=left alt=" " hspace=0 vspace=0><table\r
+cellspacing=0 cellpadding=0 border=0 >\r
+       \r
+  <tr valign=top >\r
+       <td background=" "><img src="/images/holder.gif" width=228 height=88 \r
+       alt=" " hspace=0 vspace=0></td>\r
+       <td background=" "><img src="/images/holder.gif" width=57 height=88 \r
+       alt=" " hspace=0 vspace=0></td>\r
+       <td background=" "><img src="/images/holder.gif" width=47 height=88 \r
+       alt=" " hspace=0 vspace=0></td>\r
+       <td background=" "><img src="/images/holder.gif" width=1 height=88 \r
+       alt=" " hspace=0 vspace=0></td>\r
+       <td background=" "><img src="/images/holder.gif" width=1 height=88 \r
+       alt=" " hspace=0 vspace=0></td>\r
+  </tr>\r
+\r
+  <tr valign=top >\r
+       <td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"\r
+       width=1 height=30\r
+       alt=" " hspace=0 vspace=0><br>\r
+       <img src="/images/koha.gif" width=200 height=128\r
+       alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>\r
+\r
+       <td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272   height=38\r
+       alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>\r
+\r
+  </tr>\r
+\r
+\r
+<tr valign=top >\r
+       <td>&nbsp; &nbsp; </td>\r
+       <FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>\r
+       <input type=hidden name=type value=opac>\r
+       <td background=" " >\r
+\r
+       <input type=text size="27" name="keyword"><br>\r
+       </font>\r
+       <b>Type in the box and press the enter                  key.</b><br>\r
+       <a href="/cgi-bin/koha/catalogue-home.pl">\r
+      \r
+       <img src="/images/front-arrow.gif" width=27 height=22\r
+       alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>\r
+\r
+       <img src="/images/holder.gif" width=1 height=8\r
+       alt=" " hspace=0 vspace=0>\r
+       <p>\r
+       <TMPL_IF NAME="loggedinuser">\r
+           <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\r
+       <TMPL_ELSE>\r
+           <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>\r
+       </TMPL_IF>\r
+       </td>\r
+       </form>\r
+  </tr>\r
+\r
+\r
+ \r
+\r
+<!--\r
+  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >\r
+       <td background=" "  colspan=3><img src="/images/heading-login.gif" width=279            height=38\r
+       alt="Member Login" hspace=0 vspace=0 border=0></td>\r
+\r
+  </tr>\r
+<tr valign=top >\r
+        <td></td>\r
+       <form action="/cgi-bin/member.pl" method=get >\r
+       <td background=" " >\r
+       <font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>\r
+       <td background=" " ><input type=text size="12" name="card"></td>\r
+\r
+  </tr>\r
+\r
+  <tr valign=top><td></td>\r
+       <td></td>\r
+       <td></td>\r
+       <td background=" " >\r
+       <font size=3 face="arial narrow,arial,helvetica">Password</font></td>\r
+       <td background=" " ><input type=password size="12" name="password"><br>\r
+       <input type=submit value="OK"><br>\r
+\r
+       <img src="/images/holder.gif" width=1 height=8\r
+       alt=" " hspace=0 vspace=0></td>\r
+       </font>\r
+ </tr>\r
+\r
+  <tr valign=top >\r
+       <td></td>\r
+       <td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331                height=38\r
+       alt="Become a Website Member" hspace=0 vspace=0 border=0></a>\r
+       </td>\r
+       <td>\r
+       </td>\r
+\r
+  </tr>\r
+\r
+-->\r
+</table>\r
+\r
+</td>\r
+  </tr>\r
+</table>\r
+<p>\r
+</center>\r

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index d49966a..71ef1fe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -6,13 +6,14 @@
        <form action='<TMPL_VAR name="script_name">' name=Aform method=put>
        <input type=hidden name=op value='add_validate'>
        <table>
-       <tr><th>Tag/subfield</th>
+       <tr><th>Field</th>
                <th>Lib for librarians / for opac</th>
-               <th>Repeatable</th>
-               <th>Mandatory</th>
+               <th>Repet</th>
+               <th>Mand</th>
                <th>Koha field</th>
                <th>Tab</th>
-               <th>Authorised value</th>
+               <th>Authorised value or<br/>
+                               Thesaurus category</th>
        </tr>
        <TMPL_LOOP name="loop">
                <tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
@@ -23,10 +24,19 @@
                <td><TMPL_VAR name="mandatory"></td>
                <td><TMPL_VAR name="kohafield"></td>
                <td><TMPL_VAR name="tab"></td>
-               <td><TMPL_VAR name="authorised_value"></td>
+               <td><TMPL_VAR name="authorised_value"><br/>
+                               or <TMPL_VAR name="thesaurus_category"><br/>
+                               or <TMPL_VAR name="value_builder"></td>
        </TMPL_LOOP>
        </table>
+       <a href="marc_subfields_structure.pl?op=add_form&tagfield=<TMPL_VAR name="more_tag">&more_subfields=<TMPL_VAR name="more_subfields">">More</a>
        <INPUT type=submit value='OK'>
+       <p>Note : in the last column, you can choose :
+       <ul><li>An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table</li>
+       <li>A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table</li>
+       <li>A "value builder" : values builders are perl programm that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly</li>
+       </ul>
+       </p>
        </form>
 </TMPL_IF>
 
@@ -68,7 +78,9 @@ ensure that both DB are synchronized, thus you can change from MARC to KOHA inte
        <td background="/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="/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="/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="/images/background-mem.gif" width=8%>
+       <td background="/images/background-mem.gif" width=8%><b>Thesaurus</b> <span style="font-size:8;color:red" title="Thesaurus linked to this subfield">?</span></td>
+       <td background="/images/background-mem.gif" width=8%><b>Val build</b> <span style="font-size:8;color:red" title="Value builder">?</span></td>
+       <td background="/images/background-mem.gif" width=8%>&nbsp;</td>
 <TMPL_LOOP name="loop">
 <tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
        <td><TMPL_VAR name="tagsubfield"></td>
@@ -78,6 +90,8 @@ ensure that both DB are synchronized, thus you can change from MARC to KOHA inte
        <td><TMPL_IF name="mandatory">Yes<TMPL_ELSE>No</TMPL_IF></td>
        <td><TMPL_VAR name="tab"></td>
        <td><TMPL_VAR name="authorised_value"></td>
+       <td><TMPL_VAR name="thesaurus_category"></td>
+       <td><TMPL_VAR name="value_builder"></td>
        <td><a href="<TMPL_VAR name="delete">">delete</a></td>
 </tr>
 </TMPL_LOOP>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
index f1784cf..0c72bf3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
@@ -54,26 +54,20 @@
 <TMPL_IF name="add_form">
 <!-------------------------------------------------------------------------------------------------->
        <H1><TMPL_VAR name="action"></H1>
-       <form action='<TMPL_VAR name="script_name">' name=Aform method=post>
+       <form action='<TMPL_VAR name="script_name">' name="Aform" method="post">
        <input type=hidden name=op value='add_validate'>
        <table>
        <tr><td>Variable</td><td><TMPL_VAR name="searchfield"></td></tr>
-       <tr><td>Lib for librarians</td><td><input type=text name=liblibrarian value='<TMPL_VAR name="liblibrarian">' size=40 maxlength=80></td></tr>
-       <tr><td>Lib for opac</td><td><input type=text name=libopac value='<TMPL_VAR name="libopac">' size=40 maxlength=80></td></tr>
+       <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value='<TMPL_VAR name="liblibrarian">' size=40 maxlength=80></td></tr>
+       <tr><td>Lib for opac</td><td><input type="text" name="libopac" value='<TMPL_VAR name="libopac">' size=40 maxlength=80></td></tr>
        <tr><td>Repeatable</td><td><TMPL_VAR name="repeatable"></td></tr>
        <tr><td>Mandatory</td><td><TMPL_VAR name="mandatory"></td></tr>
-       <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
+       <tr><td>Authorised value</td><td><TMPL_VAR name="authorised_value"> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
+       <tr><td>&nbsp;</td><td><INPUT type="button" value='OK' onClick='Check(this.form)'></td></tr>
        </table>
        </form>
 </TMPL_IF>
 
-<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">
 <!-------------------------------------------------------------------------------------------------->
@@ -110,6 +104,7 @@
        <td background="/images/background-mem.gif"><b>Lib</b></td>
        <td background="/images/background-mem.gif"><b>Repeatable</b></td>
        <td background="/images/background-mem.gif"><b>Mandatory</b></td>
+       <td background="/images/background-mem.gif"><b>Authorised<br />value</b></td>
        <td background="/images/background-mem.gif"><b>Subfields</b></td>
        <td background="/images/background-mem.gif">&nbsp;</td>
        <td background="/images/background-mem.gif">&nbsp;</td>
@@ -119,6 +114,7 @@
        <td><TMPL_VAR name="liblibrarian"></td>
        <td><TMPL_IF name="repeatable">Yes<TMPL_ELSE>No</TMPL_IF></td>
        <td><TMPL_IF name="mandatory">Yes<TMPL_ELSE>No</TMPL_IF></td>
+       <td><TMPL_VAR name="authorised_value"></td>
        <td><a href="<TMPL_VAR name="subfield_link">">subfields</a></td>
        <td><a href="<TMPL_VAR name="edit">">Edit</a></td>
        <td><a href="<TMPL_VAR name="delete">">Delete</a></td>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
index d22add3..fb1c952 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl
@@ -44,15 +44,21 @@
        </tr>
        <tr>
                <td>Authority lib</td>
-               <td><input type=text name="stdlib" value='<TMPL_VAR name="stdlib">' maxlength="80" size="80"></td>
+               <td><TMPL_VAR name="father"><input type=text name="stdlib" value='<TMPL_VAR name="stdlib">' maxlength="80" size="80"></td>
        </tr>
        <tr>
                <td>Other lib</td>
-               <td><input type=text name="freelib" value='<TMPL_VAR name="freelib">' maxlength="80" size="80"></td>
+               <td><TMPL_VAR name="father"><input type=text name="freelib" value='<TMPL_VAR name="freelib">' maxlength="80" size="80"></td>
        </tr>
        <tr>
                <td>&nbsp;</td>
                <td><input type="hidden" name="id" value="<TMPL_VAR name="id">">
+                       <input type="hidden" name="father" value="<TMPL_VAR name="father">">
+                       <input type="hidden" name="branch" value="<TMPL_VAR name="branch">">
+                       <input type="hidden" name="toponly" value="<TMPL_VAR name="toponly">">
+                       <input type="hidden" name="search_category" value="<TMPL_VAR name="search_category">">
+                       <input type="hidden" name="searchstring" value="<TMPL_VAR name="searchstring">">
+                       <input type="hidden" name="offset" value="<TMPL_VAR name="offset">">
                        <INPUT type="submit" value='OK'></td>
        </tr>
        </table>
@@ -85,7 +91,7 @@
        <b>Dig</b> : see datas depending from this one<br />
        <b>Related</b> : see other forms of this authority entry</p>
 </ul>
-<form action=/cgi-bin/koha/admin/thesaurus.pl method=post>
+<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
        <TMPL_VAR name="tab_list">
        <input type="checkbox" name="toponly" value="1" <TMPL_IF name="toponly">checked</TMPL_IF>>Top hierarchy only
        <input type="text" name="searchstring" value="<TMPL_VAR name="searchstring">">
@@ -126,6 +132,8 @@
 <form action='<TMPL_VAR name="script_name">' method=post>
 <input type="hidden" name="op" value="add_form">
 <input type="hidden" name="category" value="<TMPL_VAR name="category">">
+<input type="hidden" name="branch" value="<TMPL_VAR name="branch">">
+<input type="hidden" name="father" value="<TMPL_VAR name="father">">
 <br><input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add budget" BORDER=0 ></a><br>
 </form>
 </TMPL_IF>

diff --git a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
new file mode 100644 (file)
index 0000000..8fd63d5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
@@ -0,0 +1,36 @@
+       <html>
+       <head>
+       <title>thesaurus value builder</title>
+       </head>
+       <body>
+       <form name="f_pop" action="thesaurus_popup.pl" method="post">
+       <textarea name="result" rows=10 cols=60><TMPL_VAR name="result"></textarea></br>
+       <p><input type="text" name="search_string" value="<TMPL_VAR name="search_string">">
+       <input type="hidden" name="category" value="<TMPL_VAR name="category">">
+       <input type="hidden" name="index" value="<TMPL_VAR name="index">">
+       <input type="hidden" name="op" value="search">
+       <input type="submit" value="Search"></p>
+       </form>
+<TMPL_IF name="search_string">
+       <form name="f2_pop" action="thesaurus_popup.pl" method="post">
+       <TMPL_VAR name="select_list">
+       <input type="hidden" name="category" value="<TMPL_VAR name="category">">
+       <input type="hidden" name="index" value="<TMPL_VAR name="index">">
+       <input type="hidden" name="op" value="select">
+       <input type="hidden" name="result" value="<TMPL_VAR name="result">">
+       <input type="submit" name="OK" value="OK">
+       </form>
+</TMPL_IF>
+               <form name="f3_pop" onSubmit="javascript:report()">
+               <input type="hidden" name="category" value="<TMPL_VAR name="category">">
+               <input type="submit" value="END">
+               </form>
+               <script>
+               function report() {
+                       opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.result.value;
+                       self.close();
+                       return false;
+               }
+               </script>
+               </body>
+               </html>

diff --git a/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl
new file mode 100644 (file)
index 0000000..3bd4000
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_700-4.tmpl
@@ -0,0 +1,34 @@
+<html>
+<head>
+<title>UNIMARC constructeur champ 700-4</title>
+</head>
+<body>
+<p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
+<form name="f_pop" onSubmit="javascript:report()">
+<table>
+       <tr>
+               <td>Code date publication </td><td><select name="f1" size="1">
+               <option value="075 - postface" <TMPL_IF name="f1_075">SELECTED</TMPL_IF>>postface</option>
+                       <option value="651 - dir. de publication" <TMPL_IF name="f1_651">SELECTED</TMPL_IF>>dir. de publication</option>
+                       <option value="440 - illustrateur" <TMPL_IF name="f1_440">SELECTED</TMPL_IF>>illustrateur</option>
+                       <option value="080 - préface, notes" <TMPL_IF name="f1_080">SELECTED</TMPL_IF>>préface, notes</option>
+                       <option value="730 - traducteur" <TMPL_IF name="f1_730">SELECTED</TMPL_IF>>traducteur</option>
+                       </select>
+               </td>
+       </tr>
+       <tr><td colspan=2><input type="submit" value="OK"></td></tr>
+</table>
+</form>
+<script>
+       function report() {
+               x = document.f_pop.f1.value.split(' - ');
+               opener.document.f.field_value[<TMPL_VAR name="index">].value= x[0];
+               if (<TMPL_VAR name="index2">>0) {
+                       opener.document.f.field_value[<TMPL_VAR name="index2">].value= x[1];
+               }
+               self.close();
+               return false;
+       }
+</script>
+</body>
+</html>