[Koha-patches] [PATCH] Reformat Keyword to MARC mapping interface according to existing patterns

[Owen Leonard]

---
 .../prog/en/modules/admin/fieldmapping.tmpl        |   58 ++++++++++++--------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl
index fc9b2e3..3781398 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/fieldmapping.tmpl
@@ -23,7 +23,10 @@ $(document).ready(function() {
 <div id="doc3" class="yui-t2">
 	<div id="yui-main">
 		<div class="yui-b">
-			<h1>Keyword to MARC Mapping</h1>
+			<h2>Keyword to MARC Mapping</h2>
+			<!-- TMPL_UNLESS NAME="fields" -->
+			<div class="dialog message"><p>There are no mappings for this framework. </p></div>
+			<!-- /TMPL_UNLESS -->
 			<form method="get" action="/cgi-bin/koha/admin/fieldmapping.pl" id="selectframework">
 				<label for="framework">Framework :</label>
 				<select name="framework" id="framework" style="width:20em;">
@@ -34,38 +37,45 @@ $(document).ready(function() {
 					<!-- TMPL_ELSE -->
 					<option value="<!-- TMPL_VAR NAME="value" -->"><!--TMPL_VAR NAME="frameworktext" --></option>
 					<!-- /TMPL_IF -->
-					
 				<!-- /TMPL_LOOP -->
 				</select>
+			<input type="submit" value="Go" />
 			</form>
 
 
 			<form method="post" action="" id="addfield">
 				<input type="hidden" name="framework" value="<!-- TMPL_VAR NAME="framework" -->" />
-				<table>
-					<tr>
-						<th>Field</th>
-						<th>MARC Field</th>
-						<th>MARC Subfield</th>
-						<th>&nbsp;</th>
-					</tr>
-					<!-- TMPL_LOOP NAME="fields" -->
-					<tr>
-						<td><!-- TMPL_VAR NAME="field" --></td>
-						<td><!-- TMPL_VAR NAME="fieldcode" --></td>
-						<td><!-- TMPL_VAR NAME="subfieldcode" --></td>
-						<td><a href="?op=delete&amp;id=<!-- TMPL_VAR NAME="id" -->&amp;framework=<!-- TMPL_VAR NAME="framework" -->">Delete</a></td>
-					</tr>
-					<!-- /TMPL_LOOP -->
-					<tr>
-						<td><input type="text" name="fieldname" /></td>
-						<td><input type="text" name="marcfield" size="3" /></td>
-						<td><input type="text" name="marcsubfield" size="1" /></td>
-						<td><input type="submit" /></td>
-					</tr>
-				</table>
+				<fieldset class="rows">
+				<legend>Add a mapping</legend>
+				<ol>
+					<li><label for="fieldname">Field name: </label><input type="text" id="fieldname" name="fieldname" /></li>
+					<li><label for="marcfield">MARC field: </label><input type="text" id="marcfield" name="marcfield" size="3" /></li>
+					<li><label for="marcsubfield">MARC subfield: </label><input type="text" id="marcsubfield" name="marcsubfield" size="1" /></li>
+				</ol>
+				<fieldset class="action">
+					<input type="submit" value="Submit" />
+				</fieldset>
+				</fieldset>
 			</form>
 
+				<!-- TMPL_IF NAME="fields" --><table>
+								<caption>Mappings for this framework</caption>
+									<tr>
+										<th>Field</th>
+										<th>MARC Field</th>
+										<th>MARC Subfield</th>
+										<th>&nbsp;</th>
+									</tr>
+									<!-- TMPL_LOOP NAME="fields" -->
+									<tr>
+										<td><!-- TMPL_VAR NAME="field" --></td>
+										<td><!-- TMPL_VAR NAME="fieldcode" --></td>
+										<td><!-- TMPL_VAR NAME="subfieldcode" --></td>
+										<td><a href="?op=delete&amp;id=<!-- TMPL_VAR NAME="id" -->&amp;framework=<!-- TMPL_VAR NAME="framework" -->">Delete</a></td>
+									</tr>
+									<!-- /TMPL_LOOP -->
+								</table><!-- /TMPL_IF -->
+
 
 		</div>
 	</div>
-- 
1.6.3.3