From 11cd550cdb3c45cd7cf76a4ad29b99de426e18ec Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 9 Feb 2010 23:50:50 -0700
Subject: [PATCH] Modest improvements to the prefs UI templates

---
 horde/templates/prefs/app.inc            | 24 +++++++++++++++---------
 horde/templates/prefs/checkbox.inc       |  8 +++++---
 horde/templates/prefs/deleteidentity.inc |  3 +--
 horde/templates/prefs/end.inc            |  4 +++-
 horde/templates/prefs/enum.inc           | 20 ++++++++++++++------
 horde/templates/prefs/link.inc           |  6 +++++-
 horde/templates/prefs/multienum.inc      | 25 +++++++++++++++++++------
 horde/templates/prefs/number.inc         |  9 +++++++--
 horde/templates/prefs/overview.inc       |  9 ++++-----
 horde/templates/prefs/password.inc       |  9 +++++++--
 horde/templates/prefs/select.inc         | 20 ++++++++++++++------
 horde/templates/prefs/text.inc           |  9 +++++++--
 horde/templates/prefs/textarea.inc       |  6 ++++--
 13 files changed, 105 insertions(+), 47 deletions(-)

diff --git a/horde/templates/prefs/app.inc b/horde/templates/prefs/app.inc
index af364149e..3d579ea71 100644
--- a/horde/templates/prefs/app.inc
+++ b/horde/templates/prefs/app.inc
@@ -1,22 +1,28 @@
-<form method="get" name="appswitch" id="appswitch" action="<?php echo $registry->get('webroot', 'horde') . '/services/prefs.php' ?>">
+<form method="get" name="appswitch" id="appswitch" action="<?php echo Horde::getServiceLink('options') ?>">
 <?php echo Horde_Util::formInput() ?>
 <div class="header">
  <span class="smallheader rightFloat">
   <?php echo Horde::label('app', _("Edit options for:")) ?>
   <select id="app" name="app" onchange="document.appswitch.submit();">
-    <option value=""><?php echo _("Choose Application:") ?></option>
+   <option value=""><?php echo _("Choose Application:") ?></option>
 <?php if (!empty($apps['horde'])): ?>
-    <option value="" disabled="disabled">- - - - - - - - -</option>
-    <option value="horde"><?php echo _("Global Options") ?></option>
-    <option value="" disabled="disabled">- - - - - - - - -</option>
+   <option value="" disabled="disabled">- - - - - - - - -</option>
+   <option value="horde"><?php echo _("Global Options") ?></option>
+   <option value="" disabled="disabled">- - - - - - - - -</option>
 <?php endif; ?>
-   <?php foreach ($apps as $key => $val): if ($key == 'horde') continue; ?>
-    <option value="<?php echo htmlspecialchars($key) ?>"><?php echo htmlspecialchars($val) ?></option>
-   <?php endforeach; ?>
+<?php foreach (array_diff($apps, array('horde')) as $key => $val): ?>
+   <option value="<?php echo htmlspecialchars($key) ?>"><?php echo htmlspecialchars($val) ?></option>
+<?php endforeach; ?>
   </select>
   <input class="button" type="submit" onclick="return document.appswitch.app.selectedIndex != 0;" value="<?php echo _("Go") ?>" />
  </span>
- <?php if ($registry->getApp() == 'horde') echo _("Global Options"); else printf(_("Options for %s"), $registry->get('name')) ?>
+ <span>
+<?php if ($registry->getApp() == 'horde'): ?>
+  <?php echo _("Global Options") ?>
+<?php else: ?>
+  <?php printf(_("Options for %s"), $GLOBALS['registry']->get('name')) ?>
+<?php endif; ?>
+ </span>
  <br class="clear" />
 </div>
 </form>
diff --git a/horde/templates/prefs/checkbox.inc b/horde/templates/prefs/checkbox.inc
index 425db4af5..9ff62d112 100644
--- a/horde/templates/prefs/checkbox.inc
+++ b/horde/templates/prefs/checkbox.inc
@@ -1,3 +1,5 @@
-<input type="checkbox" class="checkbox" id="<?php echo $pref ?>" name="<?php echo $pref ?>"<?php echo $prefs->getValue($pref) ? ' checked="checked"' : '' ?> />
-<?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?>
-<br />
+<div>
+ <input type="checkbox" class="checkbox" id="<?php echo $pref ?>" name="<?php echo $pref ?>"<?php echo $prefs->getValue($pref) ? ' checked="checked"' : '' ?> />
+ <?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
diff --git a/horde/templates/prefs/deleteidentity.inc b/horde/templates/prefs/deleteidentity.inc
index df1b23a11..6fca6350a 100644
--- a/horde/templates/prefs/deleteidentity.inc
+++ b/horde/templates/prefs/deleteidentity.inc
@@ -3,8 +3,7 @@
 <!--
 function deleteIdentity()
 {
-    var index = document.prefs.identity.selectedIndex;
-    var id = document.prefs.identity.options[index].value;
+    var id = document.prefs.identity.options[document.prefs.identity.selectedIndex].value;
     if (id >= 0) {
         document.location.href = "<?php echo str_replace('&amp;', '&', Horde_Util::addParameter(Horde::selfUrl(true), array('actionID' => 'delete_identity', 'id' => ''))) ?>" + id;
     }
diff --git a/horde/templates/prefs/end.inc b/horde/templates/prefs/end.inc
index 1bb1ff3e5..9cd9c34c3 100644
--- a/horde/templates/prefs/end.inc
+++ b/horde/templates/prefs/end.inc
@@ -3,7 +3,9 @@
   <input type="submit" class="button" value="<?php echo _("Save Options") ?>" />&nbsp;
   <input type="reset" class="button" value="<?php echo _("Undo Changes") ?>" />&nbsp;
 <?php endif; ?>
-  <?php if (count($prefGroups) > 1): ?><input type="button" id="prefs_return" class="button" value="<?php echo _("Return to Options") ?>" onclick="document.prefs.actionID.value=0; document.prefs.group.value=''; document.prefs.submit();" /><?php endif; ?>
+<?php if (count($prefGroups) > 1): ?>
+  <input type="button" id="prefs_return" class="button" value="<?php echo _("Return to Options") ?>" onclick="document.prefs.actionID.value=0; document.prefs.group.value=''; document.prefs.submit();" />
+<?php endif; ?>
  </p>
 </div>
 </form>
diff --git a/horde/templates/prefs/enum.inc b/horde/templates/prefs/enum.inc
index 217ec4bc2..e6c253a83 100644
--- a/horde/templates/prefs/enum.inc
+++ b/horde/templates/prefs/enum.inc
@@ -1,7 +1,15 @@
-<?php echo Horde::label(htmlspecialchars($pref), $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
-<select id="<?php echo htmlspecialchars($pref) ?>" name="<?php echo htmlspecialchars($pref) ?>">
-<?php $esc = !empty($_prefs[$pref]['escaped']); $curval = $prefs->getValue($pref); foreach ($_prefs[$pref]['enum'] as $key => $val): ?>
-<option<?php echo $curval == $key ? ' selected="selected"' : '' ?> value="<?php echo $esc ? $key : htmlspecialchars($key) ?>"><?php echo $esc ? $val : htmlspecialchars($val) ?></option>
+<?php
+    $esc = !empty($_prefs[$pref]['escaped']);
+    $curval = $prefs->getValue($pref);
+?>
+<div>
+ <?php echo Horde::label(htmlspecialchars($pref), $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
+<div>
+ <select id="<?php echo htmlspecialchars($pref) ?>" name="<?php echo htmlspecialchars($pref) ?>">
+<?php foreach ($_prefs[$pref]['enum'] as $key => $val): ?>
+  <option<?php echo ($curval == $key) ? ' selected="selected"' : '' ?> value="<?php echo $esc ? $key : htmlspecialchars($key) ?>"><?php echo $esc ? $val : htmlspecialchars($val) ?></option>
 <?php endforeach ?>
-</select>
-<br />
+ </select>
+</div>
diff --git a/horde/templates/prefs/link.inc b/horde/templates/prefs/link.inc
index c449e203a..918c02f77 100644
--- a/horde/templates/prefs/link.inc
+++ b/horde/templates/prefs/link.inc
@@ -1 +1,5 @@
-<a href="<?php echo (isset($_prefs[$pref]['url'])) ? Horde::applicationUrl($_prefs[$pref]['url']) : $_prefs[$pref]['xurl'] ?>"<?php if (!empty($_prefs[$pref]['target'])) echo ' target="' . htmlspecialchars($_prefs[$pref]['target']) . '"' ?>><?php if (isset($_prefs[$pref]['img'])) echo Horde::img($_prefs[$pref]['img'], $_prefs[$pref]['desc'], 'hspace="3"') ?><strong><?php echo $_prefs[$pref]['desc'] ?></strong></a>&nbsp;<?php echo $helplink ?><br />
+<div>
+ <a href="<?php echo isset($_prefs[$pref]['url']) ? Horde::applicationUrl($_prefs[$pref]['url']) : $_prefs[$pref]['xurl'] ?>"<?php echo !empty($_prefs[$pref]['target']) ? ' target="' . htmlspecialchars($_prefs[$pref]['target']) . '"' : '' ?>>
+ <?php if (isset($_prefs[$pref]['img'])) echo Horde::img($_prefs[$pref]['img'], $_prefs[$pref]['desc'], 'hspace="3"') ?><strong><?php echo $_prefs[$pref]['desc'] ?></strong></a>
+ <?php echo $helplink ?>
+</div>
diff --git a/horde/templates/prefs/multienum.inc b/horde/templates/prefs/multienum.inc
index 010c2b7b8..eb15473f6 100644
--- a/horde/templates/prefs/multienum.inc
+++ b/horde/templates/prefs/multienum.inc
@@ -1,7 +1,20 @@
-<?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
-<select id="<?php echo $pref ?>" multiple="multiple" size="<?php echo min(4, count($_prefs[$pref]['enum'])) ?>" name="<?php echo $pref ?>[]">
-<?php $selected = @unserialize($prefs->getValue($pref)); if (!$selected) $selected = array(); if (empty($_prefs[$pref]['enum'])) $_prefs[$pref]['enum'] = Horde_Util::nonInputVar($pref . '_options'); foreach ($_prefs[$pref]['enum'] as $key => $val): ?>
-<option<?php echo in_array($key, $selected) ? ' selected="selected" ' : '' ?> value="<?php echo htmlspecialchars($key) ?>"><?php echo htmlspecialchars($val) ?></option>
+<?php
+    if (!$selected = @unserialize($prefs->getValue($pref))) {
+        $selected = array();
+    }
+
+    if (empty($_prefs[$pref]['enum'])) {
+        $_prefs[$pref]['enum'] = Horde_Util::nonInputVar($pref . '_options');
+    }
+?>
+<div>
+ <?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
+<div>
+ <select id="<?php echo $pref ?>" multiple="multiple" size="<?php echo min(4, count($_prefs[$pref]['enum'])) ?>" name="<?php echo $pref ?>[]">
+<?php foreach ($_prefs[$pref]['enum'] as $key => $val): ?>
+  <option<?php echo in_array($key, $selected) ? ' selected="selected" ' : '' ?> value="<?php echo htmlspecialchars($key) ?>"><?php echo htmlspecialchars($val) ?></option>
 <?php endforeach ?>
-</select>
-<br />
+ </select>
+</div>
diff --git a/horde/templates/prefs/number.inc b/horde/templates/prefs/number.inc
index 375f1ebad..78b3882e8 100644
--- a/horde/templates/prefs/number.inc
+++ b/horde/templates/prefs/number.inc
@@ -1,2 +1,7 @@
-<input type="text" id="<?php echo $pref ?>" name="<?php echo $pref ?>" size="3" maxlength="3" value="<?php echo htmlspecialchars($prefs->getValue($pref)) ?>" />
-<?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
+<div>
+ <?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
+<div>
+ <input type="text" id="<?php echo $pref ?>" name="<?php echo $pref ?>" size="3" maxlength="3" value="<?php echo htmlspecialchars($prefs->getValue($pref)) ?>" />
+</div>
diff --git a/horde/templates/prefs/overview.inc b/horde/templates/prefs/overview.inc
index 2084e99b2..df5590606 100644
--- a/horde/templates/prefs/overview.inc
+++ b/horde/templates/prefs/overview.inc
@@ -3,14 +3,13 @@
  <div style="width:<?php echo $span - 1 ?>%">
   <div>
    <h2><?php echo htmlspecialchars($key) ?></h2>
-
    <dl>
-   <?php foreach ($column as $group => $gvals): ?>
-    <?php if (Horde_Prefs_Ui::groupIsEditable($group, $prefGroups)): ?>
+<?php foreach ($column as $group => $gvals): ?>
+<?php if (Horde_Prefs_Ui::groupIsEditable($group, $prefGroups)): ?>
      <dt><?php echo Horde::widget(Horde_Util::addParameter(Horde::selfUrl(), array('app' => $GLOBALS['app'], 'group' => $group)), $gvals['label'], '', '', '', $gvals['label']) ?></dt>
      <dd><?php echo htmlspecialchars($gvals['desc']) ?></dd>
-    <?php endif; ?>
-   <?php endforeach; ?>
+<?php endif; ?>
+<?php endforeach; ?>
    </dl>
   </div>
  </div>
diff --git a/horde/templates/prefs/password.inc b/horde/templates/prefs/password.inc
index a6a94034e..1a2645d1a 100644
--- a/horde/templates/prefs/password.inc
+++ b/horde/templates/prefs/password.inc
@@ -1,2 +1,7 @@
-<?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
-<input type="password" id="<?php echo $pref ?>" name="<?php echo $pref ?>" size="30" maxlength="60" value="<?php echo htmlspecialchars($prefs->getValue($pref)) ?>" /><br />
+<div>
+ <?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
+<div>
+ <input type="password" id="<?php echo $pref ?>" name="<?php echo $pref ?>" size="30" maxlength="60" value="<?php echo htmlspecialchars($prefs->getValue($pref)) ?>" />
+</div>
diff --git a/horde/templates/prefs/select.inc b/horde/templates/prefs/select.inc
index 65441d5a4..5bc90af2e 100644
--- a/horde/templates/prefs/select.inc
+++ b/horde/templates/prefs/select.inc
@@ -1,7 +1,15 @@
-<?php echo Horde::label(htmlspecialchars($pref), $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
-<select id="<?php echo htmlspecialchars($pref) ?>" name="<?php echo htmlspecialchars($pref) ?>">
-<?php $esc = !empty($_prefs[$pref]['escaped']); $curval = $prefs->getValue($pref); $select_var = Horde_Util::nonInputVar($pref . '_options'); foreach ($select_var as $select_key => $select_val): ?>
- <option value="<?php echo $esc ? $select_key : htmlspecialchars($select_key) ?>"<?php if ($select_key == $curval) echo ' selected="selected"' ?>><?php echo $esc ? $select_val : htmlspecialchars($select_val) ?></option>
+<?php
+    $esc = !empty($_prefs[$pref]['escaped']);
+    $curval = $prefs->getValue($pref);
+?>
+<div>
+ <?php echo Horde::label(htmlspecialchars($pref), $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
+<div>
+ <select id="<?php echo htmlspecialchars($pref) ?>" name="<?php echo htmlspecialchars($pref) ?>">
+<?php foreach (Horde_Util::nonInputVar($pref . '_options') as $select_key => $select_val): ?>
+  <option value="<?php echo $esc ? $select_key : htmlspecialchars($select_key) ?>"<?php if ($select_key == $curval) echo ' selected="selected"' ?>><?php echo $esc ? $select_val : htmlspecialchars($select_val) ?></option>
 <?php endforeach; ?>
-</select>
-<br />
+ </select>
+</div>
diff --git a/horde/templates/prefs/text.inc b/horde/templates/prefs/text.inc
index 79f7fd6ec..a0d99ab40 100644
--- a/horde/templates/prefs/text.inc
+++ b/horde/templates/prefs/text.inc
@@ -1,2 +1,7 @@
-<?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
-<input id="<?php echo $pref ?>" name="<?php echo $pref ?>" size="30" maxlength="60" value="<?php echo htmlspecialchars($prefs->getValue($pref)) ?>" /><br />
+<div>
+ <?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>
+ <?php echo $helplink ?>
+</div>
+<div>
+ <input id="<?php echo $pref ?>" name="<?php echo $pref ?>" size="30" maxlength="60" value="<?php echo htmlspecialchars($prefs->getValue($pref)) ?>" />
+</div>
diff --git a/horde/templates/prefs/textarea.inc b/horde/templates/prefs/textarea.inc
index 0f995614e..84a28dfcc 100644
--- a/horde/templates/prefs/textarea.inc
+++ b/horde/templates/prefs/textarea.inc
@@ -1,4 +1,6 @@
-<?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?>&nbsp;<?php echo $helplink ?><br />
+<div>
+ <?php echo Horde::label($pref, $_prefs[$pref]['desc']) ?> <?php echo $helplink ?>
+</div>
 <div class="fixed">
-<textarea id="<?php echo $pref ?>" name="<?php echo $pref ?>" rows="6" cols="80" class="fixed"><?php echo htmlspecialchars($prefs->getValue($pref)) ?></textarea><br />
+ <textarea id="<?php echo $pref ?>" name="<?php echo $pref ?>" rows="4" cols="80" class="fixed"><?php echo htmlspecialchars($prefs->getValue($pref)) ?></textarea>
 </div>
-- 
2.11.0