Merged branch devel-addressbook from r443 back to trunk

10 files changed, 193 insertions, 198 deletions

diff --git a/skins/default/addresses.css b/skins/default/addresses.css
index 0ff1b28a9..363a63477 100644
--- a/skins/default/addresses.css
+++ b/skins/default/addresses.css
@@ -17,8 +17,8 @@
 #abookcountbar
 {
   position: absolute;
-  top: 60px;
-  left: 490px;
+  bottom: 16px;
+  left: 185px;
   width: 240px;
   height: 20px;
   text-align: left;
@@ -30,21 +30,70 @@
   color: #333333;
 }
 
-
-#addresslist
+#directorylist, #addresslist
 {
   position: absolute;
   top: 85px;
-  left: 20px;
-  width: 450px;
   bottom: 40px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
   overflow: auto;
   /* css hack for IE */
-  height: expression((parseInt(document.documentElement.clientHeight)-135)+'px');
+  height: expression((parseInt(document.documentElement.clientHeight)-135)+'px');  
+}
+
+#directorylist
+{
+  left: 20px;
+  width: 150px;
+}
+
+#addresslist
+{
+  left: 185px;
+  width: 340px;
+}
+
+#directorylist ul
+{
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+#directorylist ul
+{
+  font-size: 11px;
+  border-bottom: 1px solid #EBEBEB;
+}
+
+#directorylist ul li a
+{
+  display: block;
+  padding-left: 6px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  text-decoration: none;
+}
+
+#directorylist li.selected
+{
+  background-color: #929292;
+  border-bottom: 1px solid #898989;
+}
+
+#directorylist li.selected a
+{
+  color: #FFF;
+  font-weight: bold;
+}
+
+#directorylist li.droptarget
+{
+  background-color: #FFFFA6;
 }
 
+
 #contacts-table
 {
   width: 100%;
@@ -64,26 +113,26 @@
 {
   position: absolute;
   top: 85px;
-  left: 490px;
-  right: 40px;
+  left: 540px;
+  right: 30px;
   bottom: 40px;
   border: 1px solid #999999;
   overflow: hidden;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-80-document.getElementById('addresslist').offsetWidth)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-70-document.getElementById('addresslist').offsetWidth)+'px');
   height: expression((parseInt(document.documentElement.clientHeight)-135)+'px');
 }
 
 
 #addressviewsplitter
 {
-  background-position: 6px center;
+  background-position: 4px center;
 }
 
 #addressviewsplitter .splitterLine
 {
   margin-left: 3px;
-  width: 9px;
+  width: 6px;
 }
 
 
@@ -99,15 +148,33 @@ body.iframe,
 /* visibility: hidden; */
 }
 
+#contact-title, #groups-title
+{
+  height: 12px !important;
+/*  height: 20px; */
+  padding: 4px 5px 3px 5px;
+  border-bottom: 1px solid #999;
+  color: #333;
+  font-size: 11px;
+  font-weight: bold;
+  background-color: #EBEBEB;
+  background-image: url(images/listheader_aqua.gif);
+  white-space: nowrap;
+}
+
+#contact-title
+{
+  padding: 4px 10px 3px 10px;
+}
 
 #contact-details
 {
-  padding: 15px 20px 10px 20px;
+  padding: 15px 10px 10px 10px;
 }
 
 #contact-details table td.title
 {
-  color: #666666;
+  color: #666;
   font-weight: bold;
   text-align: right;
   padding-right: 10px;
diff --git a/skins/default/common.css b/skins/default/common.css
index b3c234f89..2ce3dffad 100755
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -127,7 +127,7 @@ img
   width: 600px;
   height: 37px;
   background: url(images/taskbar.gif) top right no-repeat;
-  padding: 10px 24px 10px 0px;
+  padding: 10px 14px 10px 0px;
   text-align: right;
   white-space: nowrap;
   z-index: 2;
@@ -251,6 +251,10 @@ a.button-logout
   background-image: url(images/listheader_aqua.gif);
 }
 
+.radios-left label
+{
+  padding-left: 0.3em;
+}
 
 /***** common table settings ******/
 
@@ -292,8 +296,6 @@ table.records-table tr.selected td
 
 table.records-table tr.focused td
 {
-  border-bottom: thin dotted;
-  border-top: thin dotted;
 }
 
 table.records-table tr.unfocused td
@@ -304,8 +306,84 @@ table.records-table tr.unfocused td
 }
 
 
+/***** mac-style quicksearch field *****/
+
+#quicksearchbar
+{
+  position: absolute;
+  top: 60px;
+  right: 30px;
+  width: 182px;
+  height: 20px;
+  text-align: right;
+  background: url('images/searchfield.gif') top left no-repeat;
+}
+
+#quicksearchbar a
+{
+  position: absolute;
+  top: 3px;
+  right: 4px;
+  text-decoration: none;
+}
+
+#quicksearchbar img
+{
+  vertical-align: middle;
+}
+
+#quicksearchbox
+{
+  position: absolute;
+  top: 2px;
+  left: 20px;
+  width: 140px;
+  font-size: 11px;
+  padding: 0px;
+  border: none;
+}
+
+
+/*\*/
+html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) { background-image: none; }
+html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) a { top: 5px; }
+html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
+/**/
+
+
 /***** roundcube webmail pre-defined classes *****/
 
+#rcversion
+{
+  position: absolute;
+  top: 67px;
+  left: 20px;
+  width: 160px;
+  text-align: center;
+
+  font-weight: normal;
+  font-size: x-small;
+  font-variant: small-caps;
+  
+  color: #999999;
+  /*border: 1px solid #308014;
+  background-color: #b4eeb4;*/
+}
+
+#rcmdraglayer
+{
+  width: 300px;
+  border: 1px solid #999999;
+  background-color: #F9F9F9;
+  padding-left: 8px;
+  padding-right: 8px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  font-size: 11px;
+  opacity: 0.6;
+  -moz-opacity: 0.6;
+}
+
 a.rcmContactAddress
 {
   text-decoration: none;
diff --git a/skins/default/ldapsearchform.css b/skins/default/ldapsearchform.css
deleted file mode 100644
index 9661442eb..000000000
--- a/skins/default/ldapsearchform.css
+++ /dev/null
@@ -1,54 +0,0 @@
-/***** RoundCube|Mail address book task styles *****/
-
-
-body.iframe,
-{
-  background-color: #F9F9F9;
-}
-
-#ldapsearch-title
-{
-  height: 12px !important;
-/*  height: 20px; */
-  padding: 4px 20px 3px 20px;
-  border-bottom: 1px solid #999999;
-  color: #333333;
-  font-size: 11px;
-  font-weight: bold;
-  background-color: #EBEBEB;
-  background-image: url(images/listheader_aqua.gif); 
-}
-
-#ldapsearch-details
-{
-  padding: 15px 20px 10px 20px;
-}
-
-#ldapsearch-details table td.title
-{
-  color: #666666;
-  font-weight: bold;
-  text-align: right;
-  padding-right: 10px;
-}
-
-#ldapAddressList 
-{
-  width: 100%;
-  table-layout: fixed;
-  /* css hack for IE */
-  width: expression(document.getElementById('addresslist').clientWidth);
-}
-
-#ldapAddressList table 
-{
-  border-top: 1px solid #999999;
-}
-
-#ldap-search-results div
-{
-  width: 100%;
-  color: red;
-  background-color: green;
-}
-
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 11364baa0..67f2bbb10 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -83,7 +83,7 @@
 {
   position: absolute;
   bottom: 16px;
-  right: 40px;
+  right: 30px;
   width: 300px;
   height: 20px;
   text-align: right;
@@ -110,13 +110,13 @@
   position: absolute;
   top: 85px;
   left: 200px;
-  right: 40px;
+  right: 30px;
   bottom: 40px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
   overflow: auto;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-230)+'px');
   height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
 }
 
@@ -125,12 +125,12 @@
   position: absolute;
   top: 305px;
   left: 200px;
-  right: 40px;
+  right: 30px;
   bottom: 40px;
   border: 1px solid #999999;
   background-color: #F9F9F9;
   /* css hack for IE */
-  width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
+  width: expression((parseInt(document.documentElement.clientWidth)-230)+'px');
   height: expression((parseInt(document.documentElement.clientHeight)-135-document.getElementById('mailcontframe').offsetHeight)+'px');
 }
 
@@ -186,20 +186,6 @@ html>body*#messagecontframe
   font-weight: bold;
 }
 
-#rcmdraglayer
-{
-  width: 300px;
-  border: 1px solid #999999;
-  background-color: #F9F9F9;
-  padding-left: 8px;
-  padding-right: 8px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  font-size: 11px;
-  opacity: 0.6;
-  -moz-opacity: 0.6;
-}
-
 
 /** mailbox list styles */
 
@@ -524,65 +510,6 @@ body.messagelist
   color: #CCCCCC;
 }
 
-#quicksearchbar
-{
-  position: absolute;
-  top: 60px;
-  right: 40px;
-  width: 182px;
-  height: 20px;
-  text-align: right;
-  background: url('images/searchfield.gif') top left no-repeat;
-}
-
-#quicksearchbar a
-{
-  position: absolute;
-  top: 3px;
-  right: 4px;
-  text-decoration: none;
-}
-
-#quicksearchbar img
-{
-  vertical-align: middle;
-}
-
-#quicksearchbox
-{
-  position: absolute;
-  top: 2px;
-  left: 20px;
-  width: 140px;
-  font-size: 11px;
-  padding: 0px;
-  border: none;
-}
-
-
-/*\*/
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) { background-image: none; }
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) a { top: 5px; }
-html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearchbox { width: 180px; top:0px; right: 1px; left: auto; }
-/**/
-
-
-#rcversion
-{
-  position: absolute;
-  top: 67px;
-  left: 20px;
-  width: 160px;
-  text-align: center;
-
-  font-weight: normal;
-  font-size: x-small;
-  font-variant: small-caps;
-  
-  color: #999999;
-  /*border: 1px solid #308014;
-  background-color: #b4eeb4;*/
-}
 
 #quotadisplay
 {
@@ -604,9 +531,9 @@ html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearch
 #messageframe
 {
   position: absolute;
-  top: 95px;
+  top: 85px;
   left: 200px;
-  right: 40px;
+  right: 30px;
   bottom: 40px;
   border: 1px solid #cccccc;
   background-color: #FFFFFF;
diff --git a/skins/default/print.css b/skins/default/print.css
index 5f0dbddc3..a36f87a1f 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -108,7 +108,7 @@ div.message-part div.pre
   margin: 0;
   padding: 0;
   white-space: pre;
-  font-size: 9pt;
+  font-family: monospace;
 }
 
 div.message-part blockquote
diff --git a/skins/default/templates/addcontact.html b/skins/default/templates/addcontact.html
index d4fc9cc59..e52b8c737 100644
--- a/skins/default/templates/addcontact.html
+++ b/skins/default/templates/addcontact.html
@@ -17,6 +17,7 @@
 <roundcube:button command="save" type="input" class="button" label="save" />
 </p>
 
+</form>
 </div>
 
 
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index e5b5a104b..c70b00c92 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -17,15 +17,15 @@
 <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="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" />
-<roundcube:button command="ldappublicsearch" imageSel="/images/buttons/contacts_sel.png" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="ldapsearch" />
 </div>
 
-<div id="abookcountbar">
-<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstpage" />
-<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
-&nbsp;<roundcube:object name="recordsCountDisplay" />&nbsp;
-<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
-<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastpage" />
+<div id="quicksearchbar">
+<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
+</div>
+
+<div id="directorylist">
+<div id="groups-title"><roundcube:label name="groups" /></div>
+<roundcube:object name="directorylist" id="directories-list" />
 </div>
 
 <div id="addresslist">
@@ -41,5 +41,13 @@
 <roundcube:object name="addressframe" id="contact-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
 </div>
 
+<div id="abookcountbar">
+<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstpage" />
+<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
+&nbsp;<roundcube:object name="recordsCountDisplay" />&nbsp;
+<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
+<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastpage" />
+</div>
+
 </body>
 </html>
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 3c8348843..63d5b2c2b 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -97,19 +97,18 @@ function rcmail_toggle_display(id)
 <td style="width:100%; height:98%; vertical-align:top;">
 <roundcube:object name="composeBody" id="compose-body" form="form" cols="80" rows="20" wrap="virtual" tabindex="7" />
 
-<table border="0" cellspacing="0" width="100%" summary=""><tbody><tr>
-
+<table border="0" cellspacing="0" width="100%" summary=""><tbody>
+<tr>
 <td>
 <roundcube:button type="input" command="send" class="button" label="sendmessage" />
 <roundcube:button type="input" command="list" class="button" label="cancel" />
 </td>
 <td align="right">
-<roundcube:label name="charset" />:&nbsp;<roundcube:object name="charsetSelector" tabindex="8" />
+ <roundcube:label name="editortype" />:&nbsp;
+ <span class="radios-left"><roundcube:object name="editorSelector" tabindex="9" /></span>
 </td>
-<td align="right">
- <roundcube:label name="editortype" />:&nbsp;</td>
-<roundcube:object name="editorSelector" tabindex="9" />
-</tr></tbody></table>
+</tr>
+</tbody></table>
 
 </td>
 
diff --git a/skins/default/templates/ldappublicsearch.html b/skins/default/templates/ldappublicsearch.html
deleted file mode 100644
index d9714cb85..000000000
--- a/skins/default/templates/ldappublicsearch.html
+++ /dev/null
@@ -1,31 +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>
-<link rel="stylesheet" type="text/css" href="/common.css" />
-<link rel="stylesheet" type="text/css" href="/ldapsearchform.css" />
-</head>
-<body class="iframe">
-
-<div id="ldapsearch-title"><roundcube:label name="ldappublicsearchform" /></div>
-
-<div id="ldapsearch-details">
-<roundcube:object name="ldappublicsearch" size="40" />
-<p>
-<roundcube:button command="ldappublicsearch" type="input" class="button" label="ldappublicsearch" />
-<input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
-<br /></p>
-</div>
-
-
-<div id="ldapsearch-results">
-<roundcube:object name="ldappublicaddresslist"
-  id="ldappublicaddresslist"
-  cellspacing="0"
-  summary="LDAP email address list" />
-</div>
-
-<roundcube:include file="/includes/ldapscripts.html" />
-
-</body>
-</html>
diff --git a/skins/default/templates/showcontact.html b/skins/default/templates/showcontact.html
index 53bc08b5c..79304578c 100644
--- a/skins/default/templates/showcontact.html
+++ b/skins/default/templates/showcontact.html
@@ -12,7 +12,7 @@
 <div id="contact-details">
 <roundcube:object name="contactdetails" />
 
-<p><br /><roundcube:button command="edit" type="input" class="button" label="editcontact" /></p>
+<p><br /><roundcube:button command="edit" type="input" class="button" label="editcontact" condition="!ENV:readonly" /></p>
 </div>
 
 </body>