From e9a9f2f6c52e41f3e85fc3ab0ee93afecd080892 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 3 Jun 2011 11:03:13 +0000
Subject: - Added addressbook advanced search

---
 skins/default/addressbook.css              |  18 ++++++++++--------
 skins/default/images/abook_toolbar.gif     | Bin 6087 -> 5753 bytes
 skins/default/images/abook_toolbar.png     | Bin 13586 -> 16395 bytes
 skins/default/templates/addressbook.html   |   5 +----
 skins/default/templates/contactadd.html    |   1 -
 skins/default/templates/contactsearch.html |  18 ++++++++++++++++++
 6 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 skins/default/templates/contactsearch.html

(limited to 'skins/default')

diff --git a/skins/default/addressbook.css b/skins/default/addressbook.css
index 06808cd76..18939b9fe 100644
--- a/skins/default/addressbook.css
+++ b/skins/default/addressbook.css
@@ -72,6 +72,14 @@
   background-position: -162px 0;
 }
 
+#abooktoolbar a.search {
+  background-position: -170px 0;
+}
+
+#abooktoolbar a.searchSel {
+  background-position: -170px -32px;
+}
+
 #abookcountbar
 {
   margin-top: 4px;
@@ -208,12 +216,6 @@ body.iframe,
   border: none;
 }
 
-#contact-details table td.title
-{
-  font-weight: bold;
-  text-align: right;
-}
-
 #contacttabs
 {
 	position: relative;
@@ -335,7 +337,7 @@ fieldset.contactfieldgroup legend
 	position: absolute;
 	top: 0;
 	left: 2px;
-	width: 90px;
+	width: 110px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -355,7 +357,7 @@ fieldset.contactfieldgroup legend
 
 .contactfieldgroup .contactfieldcontent
 {
-	padding-left: 100px;
+	padding-left: 120px;
 	min-height: 1em;
 	line-height: 1.3em;
 }
diff --git a/skins/default/images/abook_toolbar.gif b/skins/default/images/abook_toolbar.gif
index 1de95da76..2e8f4e259 100644
Binary files a/skins/default/images/abook_toolbar.gif and b/skins/default/images/abook_toolbar.gif differ
diff --git a/skins/default/images/abook_toolbar.png b/skins/default/images/abook_toolbar.png
index c761fbc9d..feb95c026 100644
Binary files a/skins/default/images/abook_toolbar.png and b/skins/default/images/abook_toolbar.png differ
diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 97cd13c2f..f9675ad74 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -25,6 +25,7 @@
 <span class="separator">&nbsp;</span>
 <roundcube:button command="import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="importcontacts" content=" " />
 <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="exportvcards" content=" " />
+<roundcube:button command="advanced-search" type="link" class="buttonPas search" classAct="button search" classSel="button searchSel" title="advsearch" content=" " />
 <roundcube:container name="toolbar" id="abooktoolbar" />
 </div>
 
@@ -41,10 +42,6 @@
     <li><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_surname"><roundcube:label name="surname" /></label></li>
     <li><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_email"><roundcube:label name="email" /></label></li>
     <li><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_all"><roundcube:label name="allfields" /></label></li>
-<!--
-    <li class="separator_below">
-    <li><roundcube:button command="advsearch" type="link" label="advsearch" style="padding-left: 0" classAct="active" /></li>
--->
   </ul>
 </div>
 
diff --git a/skins/default/templates/contactadd.html b/skins/default/templates/contactadd.html
index b5fd05609..6e0737020 100644
--- a/skins/default/templates/contactadd.html
+++ b/skins/default/templates/contactadd.html
@@ -19,7 +19,6 @@
   </div>
   <roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
   <div style="clear:both"></div>
-  
   <div id="contacttabs">
     <roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
   </div>
diff --git a/skins/default/templates/contactsearch.html b/skins/default/templates/contactsearch.html
new file mode 100644
index 000000000..23cbec4cb
--- /dev/null
+++ b/skins/default/templates/contactsearch.html
@@ -0,0 +1,18 @@
+<!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" />
+<script type="text/javascript" src="/functions.js"></script>
+</head>
+<body class="iframe">
+
+<div id="contact-title" class="boxtitle"><roundcube:label name="advsearch" /></div>
+<div id="contact-details" class="boxcontent">
+  <roundcube:object name="searchform" id="advsearchform" size=30 />
+  <p><roundcube:button command="save" type="input" class="button mainaction" label="search" /></p>
+</div>
+<script type="text/javascript">rcube_init_tabs('advsearchform')</script>
+
+</body>
+</html>
-- 
cgit v1.2.3