4 files changed, 54 insertions, 47 deletions
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 9dee6236a..ca01b5ae7 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -6,12 +6,12 @@
   position: absolute;
   top: 50px;
   left: 220px;
-  right: 60px;
+  right: 40px;
   height: 22px;
   border-bottom: 1px solid #999999;
   white-space: nowrap;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-280)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-260)+'px');
 }
 
 span.tablink,
@@ -87,16 +87,42 @@ span.tablink-selected a
   background-color: #FFFFA6;
 }
 
-#identities-table
+#identities-list
 {
-  width: 600px;
+  bottom: 60px;
+  width: 420px;
   border: 1px solid #999999;
+}
+
+#listbuttons
+{
+  position: absolute;
+  left: 20px;
+  bottom: 18px;
+}
+
+#identities-table
+{
+  width: 420px;
+  table-layout: fixed;
   background-color: #F9F9F9;
 }
 
 #identities-table tbody td
 {
   cursor: default;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+#identities-table thead td.name
+{
+  width: 55%;
+}
+
+#identities-table thead td.email
+{
+  width: 45%;
 }
 
 #identity-frame
@@ -108,9 +134,16 @@ span.tablink-selected a
 
 #identity-details
 {
-  margin-top: 30px;
-  width: 600px;
+  position: absolute;
+  top: 95px;
+  left: 450px;
+  right: 40px;
+  bottom: 60px;
   border: 1px solid #999999;
+  overflow: auto;
+  /* css hack for IE */
+  width: expression((parseInt(document.documentElement.clientWidth)-490)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-160)+'px');
 }
 
 #identity-details table td.title
diff --git a/skins/default/templates/addidentity.html b/skins/default/templates/addidentity.html
deleted file mode 100644
index 8162d1cdd..000000000
--- a/skins/default/templates/addidentity.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!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="/settings.css" />
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-
-<div id="identities-list">
-<roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
-
-<p><roundcube:button command="add" type="input" label="newidentity" class="button" /></p>
-
-<div id="identity-details">
-<div id="identity-title"><roundcube:label name="newidentity" /></div>
-
-<div style="padding:15px;">
-<roundcube:object name="identityform" size="40" />
-
-<p><br />
-<roundcube:button command="save" type="input" class="button" label="save" />
-</p>
-</div>
-</div>
-</div>
-
-<roundcube:include file="/includes/settingscripts.html" />
-
-</body>
-</html>
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index 94c70e615..874465511 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -14,22 +14,24 @@
 
 <div id="identities-list">
 <roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
+</div>
 
-<p><roundcube:button command="add" type="input" label="newidentity" class="button" /></p>
+<p id="listbuttons">
+<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
+</p>
 
 <div id="identity-details">
-<div id="identity-title"><roundcube:label name="edititem" /></div>
+<div id="identity-title"><roundcube:object name="steptitle" /></div>
 
 <div style="padding:15px;">
 <roundcube:object name="identityform" size="40" />
 
 <p><br />
-<roundcube:button command="delete" type="input" class="button" label="delete" />&nbsp;
+<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'&&config:multiple_identities:true" style="margin-right:0.5em" />
 <roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </p>
 </div>
 </div>
-</div>
 
 <roundcube:include file="/includes/settingscripts.html" />
 
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index f9f3436ef..1dc42d0ea 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -13,8 +13,16 @@
 
 <div id="identities-list">
 <roundcube:object name="identitiesList" id="identities-table" class="records-table" cellspacing="0" summary="Identities list" editIcon="" />
+</div>
+
+<p id="listbuttons">
+<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
+</p>
 
-<p><roundcube:button command="add" type="input" label="newidentity" class="button" /></p>
+<div id="identity-details">
+  <div style="margin:10px auto; text-align:center">
+  <img src="/images/rcube_watermark.png" width="245" height="245" alt="RoundCube" />
+  </div>
 </div>
 
 <roundcube:include file="/includes/settingscripts.html" />