From f9e49a6ab260f167d94af74e47efb3b649986cee Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 27 Nov 2007 14:52:21 -0600
Subject: [PATCH] Minor changes to systempreferences markup, including
 re-adding edit link on system pref variable, very helpful if the display runs
 off the right side of the screen.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/css/staff-global.css              |  5 ++++
 .../en/modules/admin/systempreferences.tmpl   | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 6749ed01f1..63047d04f2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -637,6 +637,11 @@ fieldset.rows td label {
 	width : auto;
 }
 
+fieldset.rows label.yesno {
+	float : none;
+	width : auto;
+}
+
 fieldset.action {
 	clear : both;
 	float : none;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
index ad9051f26a..76c9aec02f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -85,9 +85,9 @@
             Add a system preference
         <!-- /TMPL_IF --></legend><ol>
             <li><label for="explanation">Explanation: </label><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></li>
-            <li><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->">
-            <!-- TMPL_ELSE --><td><label for="variable">Variable</label><input type="text" name="variable" id="variable" size="60" /><!-- /TMPL_IF --></li>
-            <li><label for="value">Value</label><!-- TMPL_IF NAME="type-free" -->
+            <li><!-- TMPL_IF NAME="searchfield" --><span class="label">Variable: </span><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+            <!-- TMPL_ELSE --><label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" /><!-- /TMPL_IF --></li>
+            <li><label for="value">Value: </label><!-- TMPL_IF NAME="type-free" -->
                     <textarea id="value" name="value" cols="<!-- TMPL_VAR NAME="fieldlength" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="type-textarea" -->
@@ -106,23 +106,24 @@
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="type-yesno" -->
                     <!-- TMPL_IF NAME="value-yes" -->
-                    <input type="radio" name="value" id="value" value="1" checked="checked"><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF -->ON
+                    <input type="radio" name="value" id="value" value="1" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF --> <label for="value" class="yesno">ON</label>
                 <!-- TMPL_IF NAME="value-no" -->	
-                    <input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->OFF<!-- /TMPL_IF -->
+                    <input type="radio" name="value" id="value-no" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" id="value-no" value="0" /><!-- /TMPL_IF --> <label for="value-no" class="yesno">OFF</label><!-- /TMPL_IF -->
                 </li>
         </ol></fieldset>
-        <fieldset class="action"><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a></fieldset>
+        <fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/admin/systempreferences.pl">Cancel</a></fieldset>
         
         <fieldset class="brief">
 		<legend>Koha internal</legend>
 		<div class="hint">Note: you should have no reasons to modify the following default values</div>
 		<ol>
-        <label for="preftype">Variable type:</label>
+        <li><label for="preftype">Variable type:</label>
 		<div class="hint"> (Choice, YesNo, Integer, Textarea, Float, Themes, Languages, or ClassSources)</div>
-		<input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40">
-        <label for="prefoptions">Variable options:</label>
+		<input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40" /></li>
+        <li><label for="prefoptions">Variable options:</label>
 		<div class="hint">(a choice list for Choice (separated by |) or cols|rows for Texarea)</div>
-		<input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" />
+		<input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" /></li>
+		</ol>
 		</fieldset>
         </form>
     <!-- /TMPL_IF -->
@@ -149,7 +150,7 @@
 		<!-- TMPL_VAR NAME="Tvalue" -->
 		</td></tr></table>
         <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="submit"  value="Yes, Delete"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete" /></form>
+        <input type="submit"  value="Yes, Delete" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete" /></form>
     
     
     <!-- /TMPL_IF -->
@@ -208,7 +209,7 @@
     <!-- TMPL_LOOP NAME="loop" -->
     <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
 
-        <td><strong><!-- TMPL_VAR NAME="variable" --></strong></td><td> <!-- TMPL_VAR NAME="explanation" --></td>
+        <td><strong><a href="<!-- TMPL_VAR NAME="edit" -->"><!-- TMPL_VAR NAME="variable" --></a></strong></td><td> <!-- TMPL_VAR NAME="explanation" --></td>
         <td><!-- TMPL_IF NAME="yesno" -->
 		<!-- TMPL_IF NAME="yes" -->ON<!-- TMPL_ELSE -->OFF<!-- /TMPL_IF -->
 		<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF --></td>
-- 
2.20.1