[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.5,1.6

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
        marctagstructure.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: marctagstructure.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** marctagstructure.tmpl       4 Feb 2005 19:26:15 -0000       1.5
--- marctagstructure.tmpl       1 Mar 2005 13:41:03 -0000       1.6
***************
*** 9,14 ****
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <script language="JavaScript" type="text/javascript">
! 
        function isNotNull(f,noalert) {
                if (f.value.length ==0) {
--- 9,17 ----
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
! <h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- 
TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- 
TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
! <script language="javascript" type="text/javascript">
!       function _(s) { return s } // dummy function for gettext
!       
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function isNotNull(f,noalert) {
                if (f.value.length ==0) {
***************
*** 17,21 ****
                return true;
        }
! 
        function toUC(f) {
                var x=f.value.toUpperCase();
--- 20,24 ----
                return true;
        }
!       
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function toUC(f) {
                var x=f.value.toUpperCase();
***************
*** 23,27 ****
                return true;
        }
! 
        function isNum(v,maybenull) {
        var n = new Number(v.value);
--- 26,30 ----
                return true;
        }
!       
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function isNum(v,maybenull) {
        var n = new Number(v.value);
***************
*** 29,38 ****
                return false;
                }
!       if (maybenull==0 && v.value=="") {
                return false;
        }
        return true;
        }
! 
        function isDate(f) {
                var t = Date.parse(f.value);
--- 32,41 ----
                return false;
                }
!       if (maybenull==0 && v.value=='') {
                return false;
        }
        return true;
        }
!       
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function isDate(f) {
                var t = Date.parse(f.value);
***************
*** 41,45 ****
                }
        }
! 
        function Check(f) {
                var ok=1;
--- 44,48 ----
                }
        }
!       
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function Check(f) {
                var ok=1;
***************
*** 47,57 ****
                var alertString2;
                if (f.tagfield.value.length==0) {
!                       _alertString += "- tag number 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);
--- 50,60 ----
                var alertString2;
                if (f.tagfield.value.length==0) {
!                       _alertString += "\n- " + _("tag number missing");
                }
                if (_alertString.length==0) {
                        document.Aform.submit();
                } else {
!                       alertString2  = _("Form not submitted because of the 
following problem(s)");
!                       alertString2 += 
"\n------------------------------------------------------------------------------------\n";
                        alertString2 += _alertString;
                        alert(alertString2);
***************
*** 60,135 ****
        </script>
  
! <div id="main">       
! <!-- 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" />
!       <table>
!               <tr><td>Tag</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" escape="HTML" -->" size="80" 
maxlength="100" /></td></tr>
!       <tr><td>Lib for opac</td><td><input type="text" name="libopac" 
value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" 
maxlength="100" /></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>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>
!       </table><p><input type="button" value="OK" onclick="Check(this.form)" 
class="submit" /> <input type="button" class="cancel" value="Cancel" 
onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" 
/></p>
        </form>
  <!-- /TMPL_IF -->
  
  
! <!-- TMPL_IF name="delete_confirm" -->
! <!-- -->
! <h3>Confirm Deletion of Tag <em><!-- TMPL_VAR name="searchfield" --></em></h3>
! <table>
!       <tr>
!               <td>Tag</td>
!               <td><!-- TMPL_VAR name="searchfield" --></td>
!       </tr>
!       <tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
!       </table><div class="form"><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" -->" /><input type="submit" value="Delete this Tag" 
class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" 
method="post"><input type="submit" value="Do not Delete" class="submit" 
/></form></div>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirmed" -->
! <!-- -->
! <h3>Data Deleted</h3>
! <div class="form"><form action="<!-- TMPL_VAR name="script_name" -->" 
method="post">
!       <input type="submit" value="OK" class="submit" />
        </form></div>
  <!-- /TMPL_IF -->
  
! <!-- -->
! <!-- TMPL_IF name="else" -->
! 
! <h1>MARC tag structure admin</h1>
  
! <!-- TMPL_IF NAME="searchfield" --><div id="results"><!-- TMPL_VAR 
name="searchfield" --></div><!-- /TMPL_IF -->
! <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
!       <input type="text" name="searchfield" value="" />
!       <input type="submit" name="submit" value="Search" class="submit" />
  </form>
! <table><tr>
!       <th>Tag</th>
!       <th>Lib</th>
!       <th>Repeatable</th>
!       <th>Mandatory</th>
!       <th>Authorised value</th>
!       <th>Subfields</th>
!       <th>Edit/Delete</th>
        </tr>
! <!-- TMPL_LOOP name="loop" -->
! <tr>
!       <td><!-- TMPL_VAR name="tagfield" --></td>
!       <td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR 
name="liblibrarian" --></a></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 class="edit" href="<!-- TMPL_VAR name="edit" -->">Edit</a> <a 
class="delete" href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
! </tr>
! <!-- /TMPL_LOOP -->
! </table>
! <div class="tabitem"><!-- TMPL_IF name="previous" --><!-- TMPL_VAR 
name="previous" -->&lt;&lt;Previous Tags</a><!-- TMPL_ELSE --><!-- /TMPL_IF -->
! <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR name="script_name" -->" 
method="post">
!       <input type="hidden" name="op" value="add_form" /><input type="submit" 
value="Add tag" class="submit" /></form> <!-- TMPL_IF name="next" --><!-- 
TMPL_VAR name="next" -->Next Tags &gt;&gt;</a><!-- /TMPL_IF --></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 63,174 ----
        </script>
  
! <!-- TMPL_IF NAME="add_form" -->
! <!-- ------------------------------------------------------------------------ 
-->
!       <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" 
method="post">
!               <input type="hidden" name="op" value="add_validate">
!               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->">
!       <div class="data"><table>
!               <caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- 
TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- 
TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
!       <tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" 
--></td></tr>
!       <tr><th><label for="liblibrarian">Tag Label in 
Intranet</label></th><td><input type="text" id="liblibrarian" 
name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" 
size="80" maxlength="100"></td></tr>
!       <tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input 
type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" 
escape=HTML -->" size="80" maxlength="100"></td></tr>
!       <tr><th><label for="repeatable">Repeatable</label></th><td><!-- 
TMPL_VAR NAME="repeatable" --></td></tr>
!       <tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR 
NAME="mandatory" --></td></tr>
!       <tr><th><label for="authorised_value">Authorized 
value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select 
a value here, the indicators will be limited to the authorised value 
list)</td></tr>
!       </table></div>
!               <p><input type="submit" value="Save Changes" class="submit" 
onclick="Check(this.form)" /></p>
!       <p><input type="submit" value="Cancel and Return to MARC Tag Structure" 
class="cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" 
-->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
        </form>
  <!-- /TMPL_IF -->
  
  
! <!-- TMPL_IF NAME="delete_confirm" -->
! <!-- ------------------------------------------------------------------------ 
-->
! <div class="data"><table>
! <caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" 
--></em>?</caption>
!       <tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
!       <tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" 
--></td></tr>
!       </table></div>
!       <form class="inline" 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" 
-->"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->"> <input type="submit" class="cancel" value="Yes, 
Delete this Tag"></form> <form class="inline" action="<!-- TMPL_VAR 
NAME="script_name" -->" method="post"><input type="submit" class="submit" 
value="No, Do Not Delete"></form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirmed" -->
! <!-- ------------------------------------------------------------------------ 
-->
!       <div class="details"><h3>Tag Deleted</h3>
!       <form action="<!-- TMPL_VAR NAME="script_name" -->" 
method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->">
!       <input type="submit" class="submit" value="Return to MARC Tag 
Structure">
        </form></div>
  <!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="framework_create" -->
+ <!-- ------------------------------------------------------------------------ 
-->
+       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+               <input type="hidden" name="op" value="framework_create_confirm">
+               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->">
+               Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> 
(<!-- TMPL_VAR NAME="frameworktext" -->) using
+               <select name="existingframeworkcode">
+                       <option value="">Default</option>
+               <!-- TMPL_LOOP NAME="existingframeworkloop" -->
+                       <option value="<!-- TMPL_VAR NAME="value" -->"><!-- 
TMPL_VAR NAME="frameworktext" --></option>
+               <!-- /TMPL_LOOP -->
+               </select>
+               <input type="submit" value="OK" class="button">
+       </form>
+ <!-- /TMPL_IF -->
  
! <!-- ------------------------------------------------------------------------ 
-->
! <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! <label for="frameworkcode">Select a framework: </label>
!       <select id="frameworkcode" name="frameworkcode">
!               <option value="">Default</option>
!       <!-- TMPL_LOOP NAME="frameworkloop" -->
!               <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF 
NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" 
--></option>
!       <!-- /TMPL_LOOP -->
!       </select>
!       <label for="searchfield">Search for Tag: </label>
!       <input type="text" name="searchfield" id="searchfield" value="<!-- 
TMPL_VAR NAME="searchfield" -->">
!       <input type="submit" value="Search" class="submit">
  </form>
! <p class="note">NOTE : if you change the link between a MARC subfield and a 
non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
! 
!       <table>
!       <tr>
!               <th>Tag</th>
!               <th>Lib</th>
!               <th>Repeatable</th>
!               <th>Mandatory</th>
!               <th>Authorized<br />value</th>
!               <th>Subfields</th>
!               <th>Edit</th>
!               <th>Delete</th>
!       <!-- TMPL_LOOP NAME="loop" -->
!       <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr 
class="highlight"><!-- /TMPL_IF -->
!               <td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
!               <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><strong><a href="<!-- TMPL_VAR NAME="subfield_link" 
-->">Edit Subfields</a></strong></td>
!               <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
!               <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
        </tr>
!       <!-- /TMPL_LOOP -->
!       </table>
! <div id="pages">      <!-- TMPL_IF NAME="isprevpage" -->
!                       <a class="pages" href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->">&lt;&lt; Previous</a>
!               <!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR 
NAME="script_name" -->" method="post">
!       <input type="hidden" name="op" value="add_form">
!       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
!               <input type="hidden" name="op" value="add_form">
!       <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->">
!               <input type="submit" class="submit" value="Add Tag" />
!       </form>
!               <!-- TMPL_IF NAME="nextpage" -->
!                       <a class="pages" href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->">Next &gt;&gt;</a>
!               <!-- /TMPL_IF --></div>
! </div>
! <!-- /TMPL_IF -->
! 
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->