13 files changed, 57 insertions, 9 deletions
diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index 8209c1f56..27612c304 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -30,7 +30,7 @@
   color: #333333;
 }
 
-#directorylist, #addresslist
+#directorylist, #addresslist, #importbox
 {
   position: absolute;
   top: 85px;
@@ -54,6 +54,20 @@
   width: 340px;
 }
 
+#importbox
+{
+  left: 20px;
+  right: 40px;
+  height: auto;
+  bottom: auto;
+  padding-bottom: 4ex;
+}
+
+#importbox a
+{
+  color: blue;
+}
+
 #directorylist ul
 {
   list-style: none;
diff --git a/skins/default/common.css b/skins/default/common.css
index 22c65420f..c9a641fa7 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -76,7 +76,8 @@ input, textarea
 }
 
 input[type="checkbox"],
-input[type="radio"]
+input[type="radio"],
+input[type="file"]
 {
   border: 0;
   padding: 0;
@@ -99,6 +100,12 @@ input.button:hover
   color: black;
 }
 
+input.mainaction
+{
+  font-weight: bold;
+  border: 1px solid #999;
+}
+
 img
 {
   behavior: url('skins/default/pngbehavior.htc');
diff --git a/skins/default/images/buttons/adr_import_act.png b/skins/default/images/buttons/adr_import_act.png
new file mode 100644
index 000000000..c600c7121
--- /dev/null
+++ b/skins/default/images/buttons/adr_import_act.png
diff --git a/skins/default/images/buttons/adr_import_pas.png b/skins/default/images/buttons/adr_import_pas.png
new file mode 100644
index 000000000..265d1b4fd
--- /dev/null
+++ b/skins/default/images/buttons/adr_import_pas.png
diff --git a/skins/default/images/buttons/adr_import_sel.png b/skins/default/images/buttons/adr_import_sel.png
new file mode 100644
index 000000000..d78bbfdea
--- /dev/null
+++ b/skins/default/images/buttons/adr_import_sel.png
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index e52b8c737..70a796aa2 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -14,7 +14,7 @@
 
 <p><br />
 <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
-<roundcube:button command="save" type="input" class="button" label="save" />
+<roundcube:button command="save" type="input" class="button" label="save mainaction" />
 </p>
 
 </form>
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index a97f584de..6083ac66e 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -15,7 +15,7 @@
 <roundcube:button command="add" imageSel="/images/buttons/add_contact_sel.png" imageAct="/images/buttons/add_contact_act.png" imagePas="/images/buttons/add_contact_pas.png" width="32" height="32" title="newcontact" />
 <roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletecontact" />
 <roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="composeto" />
-<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="print" />
+<roundcube:button command="import" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/adr_import_act.png" imagePas="/images/buttons/adr_import_pas.png" width="32" height="32" title="importcontacts" />
 <roundcube:button command="export" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="export" />
 </div>
 
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index f3cc9279c..da8b45710 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -133,7 +133,7 @@ function rcmail_prev_sibling(elm)
 <table border="0" cellspacing="0" width="100%" summary=""><tbody>
 <tr>
 <td style="white-space: nowrap">
-<roundcube:button type="input" command="send" class="button" label="sendmessage" tabindex="8" />
+<roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="8" />
 <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" />
 </td>
 <td style="text-align:center; white-space: nowrap">
diff --git a/skins/default/templates/editcontact.html b/skins/default/templates/editcontact.html
index bff81df0f..b92f709d9 100644
--- a/skins/default/templates/editcontact.html
+++ b/skins/default/templates/editcontact.html
@@ -14,7 +14,7 @@
 
 <p><br />
 <roundcube:button command="show" type="input" class="button" label="cancel" />&nbsp;
-<roundcube:button command="save" type="input" class="button" label="save" />
+<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </p>
 
 </form>
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 04a3e8b39..94c70e615 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -25,7 +25,7 @@
 
 <p><br />
 <roundcube:button command="delete" type="input" class="button" label="delete" />&nbsp;
-<roundcube:button command="save" type="input" class="button" label="save" />
+<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </p>
 </div>
 </div>
diff --git a/skins/default/templates/importcontacts.html b/skins/default/templates/importcontacts.html
new file mode 100644
index 000000000..35a8e41f8
--- /dev/null
+++ b/skins/default/templates/importcontacts.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<link rel="stylesheet" type="text/css" href="/addresses.css" />
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+
+<div id="importbox">
+<div class="boxtitle"><roundcube:label name="importcontacts" /></div>
+
+<div style="padding-left:20px; width:48em">
+<roundcube:object name="importstep" />
+
+<p><br />
+<roundcube:object name="importnav" class="button" />
+</p>
+
+</div>
+</div>
+
+</body>
+</html>
diff --git a/skins/default/templates/login.html b/skins/default/templates/login.html
index a3089d781..9e1cc4a00 100644
--- a/skins/default/templates/login.html
+++ b/skins/default/templates/login.html
@@ -39,7 +39,7 @@
 <form name="form" action="./" method="post">
 <roundcube:object name="loginform" form="form" autocomplete="off" />
 
-<p style="text-align:center;"><input type="submit" class="button" value="<roundcube:label name='login' />" /></p>
+<p style="text-align:center;"><input type="submit" class="button mainaction" value="<roundcube:label name='login' />" /></p>
 
 </form>
 </div>
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index dfb67e05a..490d35de4 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -17,7 +17,7 @@
 <div style="padding:15px">
 <roundcube:object name="userprefs">
 
-<p><roundcube:button command="save" type="input" class="button" label="save" /></p>
+<p><roundcube:button command="save" type="input" class="button mainaction" label="save" /></p>
 </div>
 </div>