From 2f699179880a5018e9e33d0de432555ff9396201 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 9 Feb 2015 08:32:43 +0000
Subject: [PATCH] fix css for addressbook, no more div.et2_container r51566: an
 other div to form issue, picture in addressbook index got 16px small r51568:
 cleaning up template and css

---
 addressbook/inc/class.addressbook_ui.inc.php |  11 +-
 addressbook/templates/default/app.css        |  11 +-
 addressbook/templates/default/index.xet      |  27 +----
 addressbook/templates/pixelegg/app.css       | 109 ++++++-------------
 addressbook/templates/pixelegg/app.less      |  35 +-----
 5 files changed, 55 insertions(+), 138 deletions(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 6e178ebcaf..e143a7a12c 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -312,12 +312,15 @@ class addressbook_ui extends addressbook_bo
 		if (!isset($content['nm']['col_filter']['tid'])) $content['nm']['col_filter']['tid'] = $availabletypes[0];
 		if (count($this->content_types) > 1)
 		{
-			$content['nm']['header_right'] = 'addressbook.index.right_addplus';
 			foreach($this->content_types as $tid => $data)
 			{
 				$sel_options['tid'][$tid] = $data['name'];
 			}
 		}
+		else
+		{
+			$this->tmpl->disableElement('col_filter[tid]');
+		}
 		// get the availible org-views plus the label of the contacts view of one org
 		$sel_options['org_view'] = $this->org_views;
 		if (isset($org_view)) $content['nm']['org_view'] = $org_view;
@@ -924,7 +927,7 @@ window.egw_LAB.wait(function() {
 		$list['list_name'] = $new_name;
 
 		$new_id = $this->add_list(array('list_id' => (int)$list_id), $list['list_owner'],array(),$list);
-		
+
 		egw_json_response::get()->apply('egw.message', array(
 			$new_id == $list_id ? lang('Distribution list renamed') : lang('List created'),
 			'success'
@@ -1043,7 +1046,7 @@ window.egw_LAB.wait(function() {
 					egw_session::appsession($session_name,'addressbook',$query);
 				}
 				return false;
-			
+
 			case 'document':
 				if (!$document) $document = $this->prefs['default_document'];
 				$document_merge = new addressbook_merge();
@@ -1745,7 +1748,7 @@ window.egw_LAB.wait(function() {
 		{
 			$icon = common::image('addressbook',$this->content_types[$tid]['name']);
 		}
-		
+
 		// Legacy - from when icons could be anywhere
 		if ($tid != 'n' && $this->content_types[$tid]['options']['icon'])
 		{
diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index f23494f07b..2aaf7d64a4 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -13,7 +13,7 @@ td.addressbook_sidebox_header {
 	height: 20px;
 	vertical-align: bottom;
 }
-div#addressbook-view.et2_container {
+#addressbook-view.et2_container {
 	height: 0 !important;
 }
 td.addressbook_sidebox_toolbar {
@@ -34,7 +34,7 @@ div#addressbook_view_sidebox img.photo {
 /**
  * new addressbook.edit
  */
-div#addressbook-edit.et2_container {
+#addressbook-edit.et2_container {
 }
 div.addressbook_edit_general_picture {
 	position: relative;
@@ -85,12 +85,13 @@ input.et2_radiobox {
 /**
  * Index page
  */
-div#addressbook-index img.iphoto {
+#addressbook-index img.iphoto {
 	width: 100%;
 	height: auto;
 }
-#addressbook-index_org_view {
-	margin: 5px;
+#addressbook-index_org_view, #addressbook-index_addressbook-index-right_add > div.et2_box_widget {
+	top: 0;
+	padding-top: 0;
 }
 #addressbook-edit_room {
 	float:right;
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index 1236252282..c22d0cd95d 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -8,29 +8,12 @@
 	</template>
 	<template id="addressbook.index.right_add" template="" lang="" group="0" version="1.7.001">
 		<hbox>
-			<buttononly label="Advanced search" id="search" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
-			<buttononly statustext="Add a new contact" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>
+			<menulist>
+				<menupopup align="right" label="Type" id="col_filter[tid]" options="All"/>
+			</menulist>
+			<buttononly align="right" label="Advanced search" image="advanced-search" background_image="1" id="search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'850','440','_blank','addressbook',null,true); return false;"/>
+			<buttononly align="right" statustext="Add a new contact" label="Add" id="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
 		</hbox>
-		<styles>.rightPadAdd { width: 30px; }</styles>
-	</template>
-	<template id="addressbook.index.right_addplus" template="" lang="" group="0" version="1.9.001">
-		<grid>
-			<columns>
-				<column/>
-				<column/>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<menulist>
-						<menupopup align="right" label="Type" id="col_filter[tid]" options="All"/>
-					</menulist>
-					<buttononly align="right" label="Advanced search" id="search" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.search'),'850','440','_blank','addressbook',null,true); return false;"/>
-					<buttononly align="right" statustext="Add a new contact" label="Add" id="add" onclick="egw(window).openPopup(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit'),'850','440','_blank','addressbook',null,true); return false;"/>
-				</row>
-			</rows>
-		</grid>
-		<styles>.rightPadAdd { width: 30px; }</styles>
 	</template>
 	<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
 		<grid width="100%">
diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 7a77b88fb7..9b47a0a3b0 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -27,7 +27,7 @@ td.addressbook_sidebox_header {
   height: 20px;
   vertical-align: bottom;
 }
-div#addressbook-view.et2_container {
+#addressbook-view.et2_container {
   height: 0 !important;
 }
 td.addressbook_sidebox_toolbar {
@@ -103,12 +103,14 @@ input.et2_radiobox {
 /**
  * Index page
  */
-div#addressbook-index img.iphoto {
+#addressbook-index img.iphoto {
   width: 100%;
   height: auto;
 }
-#addressbook-index_org_view {
-  margin: 5px;
+#addressbook-index_org_view,
+#addressbook-index_addressbook-index-right_add > div.et2_box_widget {
+  top: 0;
+  padding-top: 0;
 }
 #addressbook-edit_room {
   float: right;
@@ -171,13 +173,13 @@ div#addressbook-index img.iphoto {
     min-height: 390px;
     overflow: auto;
   }
-  div#addressbook-index {
+  #addressbook-index {
     /*#############################################################*/
   }
-  div#addressbook-index div.et2_hbox_left {
+  #addressbook-index div.et2_hbox_left {
     padding: 0px 17px 0 13px;
   }
-  div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view {
+  #addressbook-index div.et2_hbox_left select#addressbook-index_org_view {
     /*.box_shadow_standard_light;*/
     width: auto;
     margin: 5px 0em 5px 0px;
@@ -195,22 +197,22 @@ div#addressbook-index img.iphoto {
     -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
     box-shadow: 0px 0px 0px rgba(0, 0, 0, 0);
   }
-  div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover {
+  #addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   }
-  div#addressbook-index div.header_row_right div[id$=favorite_wrapper] {
+  #addressbook-index div.header_row_right div[id$=favorite_wrapper] {
     margin-top: 0px;
     top: 6px;
   }
-  div#addressbook-index div.et2_hbox_right {
+  #addressbook-index div.et2_hbox_right {
     padding: 0px 11px 0px 0px;
     width: auto;
     margin-right: 0em;
     margin-top: -5px;
   }
-  div#addressbook-index div.et2_hbox_right select.et2_selectbox {
+  #addressbook-index div.et2_hbox_right select.et2_selectbox {
     /*.box_shadow_standard_light;*/
     width: auto;
     margin: 5px 0em 5px 0px;
@@ -224,12 +226,12 @@ div#addressbook-index img.iphoto {
     height: 24px;
     margin-left: 5px;
   }
-  div#addressbook-index div.et2_hbox_right select.et2_selectbox:hover {
+  #addressbook-index div.et2_hbox_right select.et2_selectbox:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   }
-  div#addressbook-index div.et2_hbox_right select.et2_selectbox:focus {
+  #addressbook-index div.et2_hbox_right select.et2_selectbox:focus {
     outline: 0;
     border-width: 1px;
     border-style: solid;
@@ -238,7 +240,8 @@ div#addressbook-index img.iphoto {
     -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_search {
+  #addressbook-index div.et2_hbox_right button#addressbook-index_add,
+  #addressbook-index div.et2_hbox_right button#addressbook-index_search {
     width: 32px;
     /*border: 1px solid #0C5DA5;*/
     margin: 6px 2px;
@@ -253,13 +256,9 @@ div#addressbook-index img.iphoto {
     border-radius: 3px;
     border-top-left-radius: 10px;
     height: 24px;
-    margin-right: 0px;
-    background-image: url('../../../pixelegg/images/advanced-search.png') !important;
-    background-repeat: no-repeat;
-    padding-left: 0px;
-    font-size: 0px;
   }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_search:before {
+  #addressbook-index div.et2_hbox_right button#addressbook-index_add:before,
+  #addressbook-index div.et2_hbox_right button#addressbook-index_search:before {
     content: "";
     font-size: 2em;
     color: #0c5da5;
@@ -267,60 +266,12 @@ div#addressbook-index img.iphoto {
     padding-left: 0.1em;
     padding-right: 100em;
   }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_search:active {
+  #addressbook-index div.et2_hbox_right button#addressbook-index_add:active,
+  #addressbook-index div.et2_hbox_right button#addressbook-index_search:active {
     background-color: #1aa200;
   }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_search:hover {
-    background-color: #189800 !important;
-    color: #ffc200;
-    -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-    -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
-    -webkit-border-radius: 3px;
-    -webkit-border-top-left-radius: 10px;
-    -moz-border-radius: 3px;
-    -moz-border-radius-topleft: 10px;
-    border-radius: 3px;
-    border-top-left-radius: 10px;
-    background-image: url('../../../pixelegg/images/advanced-search.png');
-    /*.Complete_Button_text_icon_before_hover;*/
-    /*.dimension_height_m;*/
-  }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_search:focus {
-    background-color: #1aa200 !important;
-    background-image: url('../../../pixelegg/images/advanced-search.png');
-    /*                .Complete_Button_text_icon_before_active;
-                .dimension_height_m;*/
-  }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_add {
-    width: 32px;
-    /*border: 1px solid #0C5DA5;*/
-    margin: 6px 2px;
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
-    padding: -0.5em;
-    background-color: #e6e6e6 !important;
-    background-size: 16px 16px;
-    -webkit-border-radius: 3px;
-    -webkit-border-top-left-radius: 10px;
-    -moz-border-radius: 3px;
-    -moz-border-radius-topleft: 10px;
-    border-radius: 3px;
-    border-top-left-radius: 10px;
-    height: 24px;
-    margin-right: 0px;
-  }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before {
-    content: "";
-    font-size: 2em;
-    color: #0c5da5;
-    line-height: 0.6em;
-    padding-left: 0.1em;
-    padding-right: 100em;
-  }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_add:active {
-    background-color: #1aa200;
-  }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover {
+  #addressbook-index div.et2_hbox_right button#addressbook-index_add:hover,
+  #addressbook-index div.et2_hbox_right button#addressbook-index_search:hover {
     background-color: #189800 !important;
     color: #ffc200;
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -333,20 +284,24 @@ div#addressbook-index img.iphoto {
     border-radius: 3px;
     border-top-left-radius: 10px;
   }
-  div#addressbook-index div.et2_hbox_right button#addressbook-index_add:active {
+  #addressbook-index div.et2_hbox_right button#addressbook-index_add:active,
+  #addressbook-index div.et2_hbox_right button#addressbook-index_search:active {
     background-color: #1aa200 !important;
   }
-  div#addressbook-index div.filters select#infolog-index_cat_id {
+  #addressbook-index div.et2_hbox_right button#addressbook-index_add {
+    margin-right: 0px;
+  }
+  #addressbook-index div.filters select#infolog-index_cat_id {
     width: 10%;
     margin-left: 1em;
   }
-  div#addressbook-index div.filters select#infolog-index_filter {
+  #addressbook-index div.filters select#infolog-index_filter {
     width: 10%;
   }
-  div#addressbook-index div.filters select#infolog-index_filter2 {
+  #addressbook-index div.filters select#infolog-index_filter2 {
     width: 10%;
   }
-  div#addressbook-index table.egwGridView_outer {
+  #addressbook-index table.egwGridView_outer {
     width: 99%;
   }
   /*##################################################################*/
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index 350eec114e..4ad26a08a3 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -103,7 +103,7 @@ div#addressbook_view_sidebox{
 
 
 
-div#addressbook-index{
+#addressbook-index{
 //    min-height: 700px;
 //    height: auto !important;
 
@@ -157,44 +157,19 @@ div#addressbook-index{
             &:focus{.Complete_Button_select_focus;}
         }
 
-        // erweiterte Suche
-        button#addressbook-index_search{
-           .Complete_Button_add_only_plus;
-            .dimension_height_m;
-            margin-right: 0px;
-            background-image:url('../../../pixelegg/images/advanced-search.png') !important;
-            background-repeat: no-repeat;
-            padding-left: 0px;
-            font-size: 0px;
-
-            &:hover{
-                .Complete_Button_add_only_plus_hover;
-                background-image:url('../../../pixelegg/images/advanced-search.png');
-                /*.Complete_Button_text_icon_before_hover;*/
-                /*.dimension_height_m;*/
-            }
-
-            &:focus{
-                background-color: @color_positive_action_active !important;
-                background-image:url('../../../pixelegg/images/advanced-search.png');
-/*                .Complete_Button_text_icon_before_active;
-                .dimension_height_m;*/
-            }
-
-        }
-
         // hinzufügen
-        button#addressbook-index_add{
+        button#addressbook-index_add,button#addressbook-index_search{
 
             .Complete_Button_add_only_plus;
             .dimension_height_m;
-            margin-right: 0px;
 
             &:hover {.Complete_Button_add_only_plus_hover;}
             &:active {background-color: @color_positive_action_active !important;}
 
         }
-
+		button#addressbook-index_add {
+            margin-right: 0px;
+		}