From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names

---
 program/steps/addressbook/import.inc |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index 33e4732..80bae66 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -308,10 +308,11 @@
         $out = $OUTPUT->button(array('command' => 'list', 'prop' => $target, 'label' => 'done') + $attrib);
     }
     else {
-        $out = $OUTPUT->button(array('command' => 'list', 'label' => 'cancel') + $attrib);
-        $out .= '&nbsp;';
+        $cancel = $OUTPUT->button(array('command' => 'list', 'label' => 'cancel') + $attrib);
         $attrib['class'] = trim($attrib['class'] . ' mainaction');
-        $out .= $OUTPUT->button(array('command' => 'import', 'label' => 'import') + $attrib);
+        $out  = $OUTPUT->button(array('command' => 'import', 'label' => 'import') + $attrib);
+        $out .= '&nbsp;';
+        $out .= $cancel;
     }
 
     return $out;
@@ -323,7 +324,7 @@
 function rcmail_import_group_id($group_name, $CONTACTS, $create, &$import_groups)
 {
     $group_id = 0;
-    foreach ($import_groups as $key => $group) {
+    foreach ($import_groups as $group) {
         if (strtolower($group['name']) == strtolower($group_name)) {
             $group_id = $group['ID'];
             break;

--
Gitblit v1.9.1