Visual and structural changes to help complete upgrade of template to 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl
index b71daca..c7b510e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl
@@ -8,53 +8,41 @@
 
 <div id="main">
 <!-- TMPL_IF NAME="add_form" -->
-<!-- ------------------------------------------------------------------------ -->
-       <h1>
-       <!-- TMPL_IF NAME="use-heading-flags-p" -->
+
+       <h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
        <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
-       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
-       </h1>
+       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
        <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" -->">
-       <table>
+       <input type="hidden" name="op" value="add_validate" />
+       <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
        <!-- TMPL_LOOP NAME="loop" -->
-               <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
-               <td>
-                       <h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-                       <h3>MARC constraints</h3>
-                       <p>
-                               <label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> repeatable 
-                               <!-- TMPL_VAR NAME="mandatory" --> mandatory
-                       </p>
-                       <p>
-                               <label>&nbsp;</label>
-                               <label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a: '200c','200d','200e'...)
-                       </p>
-                       <p><label>&nbsp;</label><label>Koha link:</label> <!-- TMPL_VAR NAME="kohafield" --></p>
-                       <h3>Editor constaints</h3>
-                       <p> <label>&nbsp;</label>
-                               <label>Text for librarian</label>
-                               <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
-                       </p>
-                       <p>
-                               <label>&nbsp;</label>
-                               <label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
-                       </p>
-                       <p><label>&nbsp;</label><label>Managed in tab</label> <!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
-                       <p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
-                       <p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
-                       <p>
-                               <label>&nbsp;</label><label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
-                               or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
-                               or plugin: <!-- TMPL_VAR NAME="value_builder" -->
-                               or link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple:200b)
-                       </p>
-               </td>
-               </tr>
+       <div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+       <table>
+       <caption>MARC constraints</caption>
+       <tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+       <tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
+       <tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
+       <tr><th><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label></th><td><!-- TMPL_VAR NAME="kohafield" --></td></tr>
+                       </table>
+       <table>
+       <caption>Editor constaints</caption>
+       <tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
+       <tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
+       <tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
+       <tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden: </label></th><td><!-- TMPL_VAR NAME="hidden" --> (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</td></tr>
+       <tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
+<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
+<ul>
+       <li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
+       <li>Thesaurus: <!-- TMPL_VAR NAME="authtypes" --></li>
+       <li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
+       <li>Link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
+</ul>
+</td></tr>      
+               </table>
+               </div>
        <!-- /TMPL_LOOP -->
-       </table>
-       <input type="submit" value="OK">
+       <input type="submit" class="submit" value="Save Changes" />
        <p>Note: in the last column, you can choose:
        <ul><li>An "authorised value": it refers to a list of authorised values 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>
@@ -65,7 +53,7 @@
 <!-- /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>Subfield</b></td>
@@ -76,35 +64,35 @@
        <tr>
                <td>
                        <form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
-                               <input type="hidden" name="op" value="delete_confirmed">
-                               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
-                               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-                               <input type="submit" value="YES">
+                               <input type="hidden" name="op" value="delete_confirmed" />
+                               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+                               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+                               <input type="submit" class="cancel" value="YES" />
                        </form>
                </td>
                <td>
                        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
-                               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-                               <input type="submit" value="NO">
+                               <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                               <input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+                               <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+                               <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+                               <input type="submit" class="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="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
-       <input type="submit" value="OK">
+       <input type="submit" class="submit" value="OK" />
        </form>
 <!-- /TMPL_IF -->
 
-<!-- ------------------------------------------------------------------------ -->
+
 <!-- TMPL_IF NAME="else" -->
 <h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
 <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
@@ -147,13 +135,13 @@
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->"><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="marctagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="submit" value="Return to Marc Structure" /></form>
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="marctagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" class="submit" value="Return to Marc Structure" /></form>
 <!-- TMPL_IF NAME="previous" -->
        <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
        </a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="next" -->
        <!-- TMPL_VAR NAME="next" -->
-               <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
+               <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
        </a>
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->