Moving HTML markup from the script to the template

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
index 7a6029b..292d07c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
@@ -146,9 +146,9 @@
                <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" -->" class="button">subfields</a></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"></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"></a></td>
+               <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
+               <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+               <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
        </tr>
        <!-- /TMPL_LOOP -->
        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
index 435bdc8..97acccb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl
@@ -61,12 +61,11 @@
 
 <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>Tag</td><td><!-- TMPL_IF NAME="searchfield" --><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR name="searchfield" --><!-- TMPL_ELSE --><input type="text" name="tagfield" size="3" maxlength="3" /><!-- /TMPL_IF --></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>
@@ -123,13 +122,21 @@
        <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>
+       <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">subfields</a></td>
+       <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->">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 class="tabitem">          <!-- TMPL_IF NAME="isprevpage" -->
+                       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
+               <!-- /TMPL_IF -->
+<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" -->
+                       <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="Next Page &gt;&gt;" class="submit" /></form>
+               <!-- /TMPL_IF --></div>
+<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->