From 0a00c730b3ddc077ee448cab9e0dfb8d8e666e86 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 12 Apr 2010 12:40:50 -0600
Subject: [PATCH] Turba prefs UI fixes

---
 turba/lib/Application.php         |  6 ++++--
 turba/templates/prefs/column.html | 36 ++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/turba/lib/Application.php b/turba/lib/Application.php
index aba907359..89c7df89c 100644
--- a/turba/lib/Application.php
+++ b/turba/lib/Application.php
@@ -231,9 +231,11 @@ class Turba_Application extends Horde_Registry_Application
 
             return Horde_Core_Prefs_Ui_Widgets::source(array(
                 'mainlabel' => _("Choose which address books to display, and in what order:"),
-                'selected' => $selected,
                 'selectlabel' => _("These addressbooks will display in this order:"),
-                'unselected' => $unselected,
+                'sources' => array(array(
+                    'selected' => $selected,
+                    'unselected' => $unselected
+                )),
                 'unselectlabel' => _("Address books that will not be displayed:")
             ));
 
diff --git a/turba/templates/prefs/column.html b/turba/templates/prefs/column.html
index 30e1ab3ed..31fa0bf37 100644
--- a/turba/templates/prefs/column.html
+++ b/turba/templates/prefs/column.html
@@ -3,29 +3,33 @@
 <if:col_list>
 
 <div id="turba-prefs-cols-container">
- <p><gettext>Click an address book to sort its columns. Drag columns to re-arrange them. Check a column to enable it.</gettext></p>
+ <div>
+  <gettext>Click an address book to sort its columns. Drag columns to re-arrange them. Check a column to enable it.</gettext>
+ </div>
 
- <div id="turba-prefs-cols-list">
-  <ul>
+ <p>
+  <div id="turba-prefs-cols-list">
+   <ul>
 <loop:col_list>
-   <li<if:col_list.first> class="active"</if:col_list.first>><a href="#" sourcename="<tag:col_list.source />"><tag:col_list.title /></a></li>
+    <li<if:col_list.first> class="active"</if:col_list.first>><a href="#" sourcename="<tag:col_list.source />"><tag:col_list.title /></a></li>
 </loop:col_list>
-  </ul>
- </div>
+   </ul>
+  </div>
 
- <div id="turba-prefs-cols-columns">
+  <div id="turba-prefs-cols-columns">
 <loop:cols>
-  <div class="turba-prefs-cols-panel" id="turba-prefs-cols-panel-<tag:cols.source />" style="display:<if:cols.first>block<else:cols.first>none</else:cols.first></if:cols.first>;">
-   <ol id="turba-prefs-<tag:cols.source />">
-<loop:cols.inputs>
-    <li id="turba-prefs-cols-<tag:cols.source />_<tag:cols.inputs.i />">
-     <input name="turba-prefs-cols-<tag:cols.source />-<tag:cols.inputs.column />" id="turba-prefs-cols-<tag:cols.source />-<tag:cols.inputs.column />" type="checkbox" class="checkbox"<if:cols.inputs.checked> checked="checked"</if:cols.inputs.checked> /><tag:cols.inputs.label />
-    </li>
+   <div class="turba-prefs-cols-panel" id="turba-prefs-cols-panel-<tag:cols.source />" style="display:<if:cols.first>block<else:cols.first>none</else:cols.first></if:cols.first>;">
+    <ol id="turba-prefs-<tag:cols.source />">
+ <loop:cols.inputs>
+     <li id="turba-prefs-cols-<tag:cols.source />_<tag:cols.inputs.i />">
+      <input name="turba-prefs-cols-<tag:cols.source />-<tag:cols.inputs.column />" id="turba-prefs-cols-<tag:cols.source />-<tag:cols.inputs.column />" type="checkbox" class="checkbox"<if:cols.inputs.checked> checked="checked"</if:cols.inputs.checked> /><tag:cols.inputs.label />
+     </li>
 </loop:cols.inputs>
-   </ol>
-  </div>
+    </ol>
+   </div>
 </loop:cols>
- </div>
+  </div>
+ </p>
 
  <br class="clear" />
 
-- 
2.11.0