road to 1.3.1 : marc parameter management

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 c5195e8..a68ab71 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
@@ -1,78 +1,30 @@
 <TMPL_INCLUDE NAME="cat-top.inc">
        
-<script>
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-       function isNotNull(f,noalert) {
-               if (f.value.length ==0) {
-   return false;
-               }
-               return true;
-       }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-       function toUC(f) {
-               var x=f.value.toUpperCase();
-               f.value=x;
-               return true;
-       }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-       function isNum(v,maybenull) {
-       var n = new Number(v.value);
-       if (isNaN(n)) {
-               return false;
-               }
-       if (maybenull==0 && v.value=='') {
-               return false;
-       }
-       return true;
-       }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-       function isDate(f) {
-               var t = Date.parse(f.value);
-               if (isNaN(t)) {
-                       return false;
-               }
-       }
-       /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-       function Check(f) {
-               var ok=1;
-               var _alertString="";
-               var alertString2;
-               if (f.variable.value.length==0) {
-                       _alertString += "- variable missing\\n";
-               }
-               if (f.value.value.length==0) {
-                       _alertString += "- value missing\\n";
-               }
-               if (_alertString.length==0) {
-                       document.Aform.submit();
-               } else {
-                       alertString2 = "Form not submitted because of the following problem(s)\\n";
-                       alertString2 += "------------------------------------------------------------------------------------\\n\\n";
-                       alertString2 += _alertString;
-                       alert(alertString2);
-               }
-       }
-       </SCRIPT>
-
 <TMPL_IF name="add_form">
 <!-------------------------------------------------------------------------------------------------->
        <H1><TMPL_VAR name="action"></H1>
        <form action='<TMPL_VAR name="script_name">' name=Aform method=post>
        <input type=hidden name=op value='add_validate'>
-       <input type=hidden name=explanation value='<TMPL_VAR name="explanation">'>
        <table>
-       <tr><td>Variable</td><td><TMPL_VAR name="searchfield"></td></tr>
-       <tr><td>Value</td><td><input type=text name=value value='<TMPL_VAR name="value">'></td></tr>
-       <tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
+       <tr><th>Tag/subfield</th>
+               <th>Lib for librarians / for opac</th>
+               <th>Repeatable</th>
+               <th>Mandatory</th>
+               <th>Koha field</th>
+               <th>Tab</th>
+       </tr>
+       <TMPL_LOOP name="loop">
+               <tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
+               <td><TMPL_VAR name="tagfield"> - <TMPL_VAR name="tagsubfield"></td>
+               <td><input type=text name="liblibrarian[]" value='<TMPL_VAR name="liblibrarian">' size=40 maxlength=80><br/>
+                               <input type=text name="libopac[]" value='<TMPL_VAR name="libopac">' size=40 maxlength=80></td>
+               <td><TMPL_VAR name="repeatable"></td>
+               <td><TMPL_VAR name="mandatory"></td>
+               <td><TMPL_VAR name="kohafield"></td>
+               <td><TMPL_VAR name="tab"></td>
+       </TMPL_LOOP>
        </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>
+       <INPUT type=submit value='OK'>
        </form>
 </TMPL_IF>
 
@@ -80,52 +32,52 @@
 <!-------------------------------------------------------------------------------------------------->
 <table border=0 cellspacing=0 cellpadding=5>
        <tr valign=top bgcolor=#99cc33>
-               <td background="/images/background-mem.gif"><b>Variable</b></td>
+               <td background="/images/background-mem.gif"><b>tag</b></td>
                <td background="/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
        </tr>
-       <tr><td>Value</td><td><TMPL_VAR name="Tvalue"></td></tr>
+       <tr><td>&nbsp;</td><td><TMPL_VAR name="liblibrarian"></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='$script_name' method=post><input type=submit value=NO></form></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>
+</TMPL_IF>
+
+<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">
-<font SIZE=6><em>System preferences admin</em></font>
-<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">
+<font SIZE=6><em>MARC subfield structure admin for <TMPL_VAR name="tagfield"></em></font>
 <table border=0 cellspacing=0 cellpadding=5>
 <tr valign=top bgcolor=#99cc33>
-       <td background="/images/background-mem.gif"><b>Variable</b></td>
-       <td background="/images/background-mem.gif"><b>Value</b></td>
-       <td background="/images/background-mem.gif"><b>Explanation</b></td>
-       <td background="/images/background-mem.gif">&nbsp;</td>
-       <td background="/images/background-mem.gif">&nbsp;</td>
+       <td background="/images/background-mem.gif" width=5%><b>Subfield</b></td>
+       <td background="/images/background-mem.gif" width=50%><b>Lib</b></td>
+       <td background="/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8" title="the koha-DB field linked to this subfield">?</span></td>
+       <td background="/images/background-mem.gif" width=8%><b>Rep</b> <span style="font-size:8" title="subfield may be repeated (1=yes, 0=no)">?</span></td>
+       <td background="/images/background-mem.gif" width=8%><b>Mand</b> <span style="font-size:8" title="subfield is mandatory (1=yes, 0=no)">?</span></td>
+       <td background="/images/background-mem.gif" width=9%><b>Tab</b> <span style="font-size:8" title="subfield is shown in which tab (0-9 or item)">?</span></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">">Edit</a></td>
-       <td><a href="<TMPL_VAR name="delete">">Delete</a></td>
+<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
+       <td><TMPL_VAR name="tagsubfield"></td>
+       <td><TMPL_VAR name="liblibrarian"></td>
+       <td><TMPL_VAR name="kohafield"></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="tab"></td>
 </tr>
 </TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type=hidden name=op value=add_form>
 </table>
-       <form action='<TMPL_VAR name="script_name">' method=post>
-       <input type=hidden name=op value=add_form>
+<TMPL_VAR name="edit">
 <table width=40%>
        <tr>
                <td width=50%><TMPL_VAR name="previous"></td>
                <td width=50%><TMPL_VAR name="next"></td>
        </tr>
 </table>
-<br><input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add budget" BORDER=0 ></a><br>
-</form>
 </TMPL_IF>
 
 <TMPL_INCLUDE NAME="cat-bottom.inc">

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
index c5195e8..5b306b6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl
@@ -89,6 +89,14 @@
        <tr><td><INPUT type=submit value='YES'></form></td><td><form action='$script_name' method=post><input type=submit value=NO></form></td></tr>
 </TMPL_IF>
 
+<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">
 <font SIZE=6><em>System preferences admin</em></font>