Merged branch devel-addressbook from r443 back to trunk

5 files changed, 23 insertions, 46 deletions

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>