From 73b6521cbf3ae5f5eff820473cf2eb0ccbd9edb9 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 27 Nov 2013 07:21:32 +0000
Subject: [PATCH] pixelegg changes from yesterday

---
 addressbook/templates/pixelegg/app.css     |  12 +++----
 addressbook/templates/pixelegg/app.less    |   5 +--
 admin/templates/default/config.tpl         |   4 +--
 etemplate/templates/default/etemplate2.css |   1 +
 filemanager/templates/default/select.xet   |   8 ++---
 filemanager/templates/pixelegg/app.css     |  19 +++++++++--
 filemanager/templates/pixelegg/app.less    | Bin 10677 -> 11037 bytes
 mail/templates/default/acl.xet             |   6 ++--
 mail/templates/pixelegg/app.css            |  37 +++++++++++++++------
 mail/templates/pixelegg/app.less           |  30 ++++++++++++++---
 timesheet/templates/default/edit.xet       |  22 ++++++------
 timesheet/templates/pixelegg/app.css       |   6 ++++
 timesheet/templates/pixelegg/app.less      |  11 ++++++
 13 files changed, 113 insertions(+), 48 deletions(-)

diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css
index 94e7d453ae..424433ff24 100755
--- a/addressbook/templates/pixelegg/app.css
+++ b/addressbook/templates/pixelegg/app.css
@@ -124,10 +124,6 @@ fieldset.emailGroup {
 .image16 img {
   height: 16px;
 }
-div#addressbook-index {
-  min-height: 700px;
-  height: auto !important;
-}
 div#addressbook-index div.et2_hbox_left {
   padding: 1em;
 }
@@ -240,7 +236,7 @@ div#addressbook-index div.et2_hbox_right button#addressbook-index_add {
   background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
-  height: 35px;
+  /*    height: auto;*/
   background-image: none !important;
   -webkit-border-radius: 3px;
   -webkit-border-top-left-radius: 20px;
@@ -251,7 +247,7 @@ div#addressbook-index div.et2_hbox_right button#addressbook-index_add {
 }
 div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before {
   content: "+";
-  font-size: 2em;
+  font-size: 1.5em;
   color: #ffc200;
 }
 div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover {
@@ -303,7 +299,7 @@ div#addressbook-index table.egwGridView_outer {
   background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
-  height: 35px;
+  /*    height: auto;*/
   background-image: none !important;
   -webkit-border-radius: 3px;
   -webkit-border-top-left-radius: 20px;
@@ -317,7 +313,7 @@ div#addressbook-index table.egwGridView_outer {
 }
 #infolog-index_infolog-index-header_right .et2_box_widget:before {
   content: "+";
-  font-size: 2em;
+  font-size: 1.5em;
   color: #ffc200;
 }
 #infolog-index_infolog-index-header_right .et2_box_widget:hover {
diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less
index 3638a69c29..cae210b52b 100755
--- a/addressbook/templates/pixelegg/app.less
+++ b/addressbook/templates/pixelegg/app.less
@@ -17,8 +17,8 @@
 // iframe
 
 div#addressbook-index{
-    min-height: 700px;
-    height: auto !important;
+//    min-height: 700px;
+//    height: auto !important;
 
     // ###########################
     // linke Box
@@ -520,6 +520,7 @@ div.addressbook.edit.general{
 }
 
 // Dialog Upload photo
+
 .uploadphoto {
     background-color: @gray-20;
     border: 2px solid black;
diff --git a/admin/templates/default/config.tpl b/admin/templates/default/config.tpl
index 65272df9c9..11aa716c02 100644
--- a/admin/templates/default/config.tpl
+++ b/admin/templates/default/config.tpl
@@ -355,8 +355,8 @@
   </tr>
   <tr>
     <td colspan="2" align="center">
-      <input type="submit" name="submit" value="{lang_submit}">
-      <input type="submit" name="cancel" value="{lang_cancel}">
+      <input type="submit" name="submit" value="{lang_submit}" class="et2_button et2_button_text">
+      <input type="submit" name="cancel" value="{lang_cancel}" class="et2_button et2_button_text">
 		  <br>
     </td>
   </tr>
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 96d881997f..b7ffba4351 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -197,6 +197,7 @@ button.et2_button_with_image {
 	padding-left: 20px;
 	background-repeat: no-repeat;
 	background-position-x:	3px;
+	background-size: 16px;
 }
 
 /**
diff --git a/filemanager/templates/default/select.xet b/filemanager/templates/default/select.xet
index 92b89d8376..94340ecd91 100644
--- a/filemanager/templates/default/select.xet
+++ b/filemanager/templates/default/select.xet
@@ -28,7 +28,7 @@
 							<column/>
 						</columns>
 						<rows>
-							<row>
+							<row class="dialog-header">
 								<hbox>
 									<html id="js"/>
 									<button label="Up" id="button[up]" image="goup"/>
@@ -70,10 +70,10 @@
 									<file id="file_upload"/>
 								</groupbox>
 							</row>
-							<row>
+							<row class="dialog-footer-toolbar">
 								<hbox align="right">
-									<button label="@label" id="button[ok]"/>
-									<buttononly label="Cancel" id="button[cancel]" onclick="window.close();"/>
+									<button label="@label" id="button[ok]" image="save" background_image="1"/>
+									<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
 								</hbox>
 							</row>
 						</rows>
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index cd6cacdb60..fc6d0b0183 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -19,7 +19,7 @@
   background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
-  height: 35px;
+  /*    height: auto;*/
   background-image: none !important;
   -webkit-border-radius: 3px;
   -webkit-border-top-left-radius: 20px;
@@ -32,7 +32,7 @@
 }
 #filemanager-index .et2_file:before {
   content: "+";
-  font-size: 2em;
+  font-size: 1.5em;
   color: #ffc200;
 }
 #filemanager-index .et2_file:before {
@@ -60,3 +60,18 @@
 }
 /*// Dialog filemanager 
 // #####################################################*/
+#filemanager-select .dialog-header .et2_button_icon {
+  height: auto;
+  width: 24px;
+}
+#filemanager-select #filemanager-select_apps {
+  background-color: #d9d9d9;
+}
+#filemanager-select #filemanager-select_apps .et2_button_icon {
+  height: auto;
+  width: 24px;
+  padding: 10px;
+}
+#filemanager-select #filemanager-select_dir {
+  border: 1px solid rgba(0, 0, 0, 0.15);
+}
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 1ab277941fdc1722c8104e96ee962f0e73467ee0..3c91e44289c8713d8a22b60c0ff80fc6989c627b 100644
GIT binary patch
delta 350
zcmaKou?oU46h(*PkhnV+bWO2Empc0aD!7K%CZ@rdl$fF-!H;nE9|ZCLj9^7Xd^~vY
z?r_h&_r+y-op+}Fl~jBK8U(jw%M~x(5u=1jP)3l71LHP4P{LhCi^e&lsVt2?;`lWP
zp|g&9r*L<YxhjvdQN5ph=pLi6Kb$Dk_4a93K)DvyG@6mpC}T-FCc?sD610ED6_=uN
zc?^v^AENFb22=xMQj0uJhu?H<65lfaLS-`a&_+%QV?!}i8@mDZ&Kh~_Z?g^?JOFsE
BV?F=?

delta 12
TcmbOmwl#P|5bNe$Y{@DBBvu6d

diff --git a/mail/templates/default/acl.xet b/mail/templates/default/acl.xet
index 1529ea8386..4b50f9827f 100755
--- a/mail/templates/default/acl.xet
+++ b/mail/templates/default/acl.xet
@@ -67,9 +67,9 @@
 				</row>
 				<row>
 					<hbox>
-						<button statustext="Saves this ACL" label="Save" id="button[save]"/>
-						<button statustext="Applies the changes made" label="Apply" id="button[apply]"/>
-						<button label="Cancel" id="button[cancel]"/>
+						<button statustext="Saves this ACL" label="Save" id="button[save]" image="save" background_image="1"/>
+						<button statustext="Applies the changes made" label="Apply" id="button[apply]" image="apply" background_image="1"/>
+						<button label="Cancel" id="button[cancel]" image="cancel" background_image="1"/>
 					</hbox>
 				</row>
 			</rows>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 012d8c941e..6dd9960634 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -9,6 +9,12 @@
  * @package mail
  * @version $Id$
  */
+#popupMainDiv {
+  padding: 5px;
+}
+#popupMainDiv .et2_grid tr td {
+  padding: 5px 0;
+}
 /*##############################################
 #            #                               #
 #            #                               #
@@ -17,7 +23,7 @@
 #            #                               #
 #            #                               #
 #            #                               #
-#            #       iframge                 #
+#            #       iframe                  #
 #            #                               #
 #            #                               #
 #            #                               #
@@ -26,27 +32,27 @@
 #            #                               #
 ##############################################
 */
-div#mail-index div#mail-index_mail {
+div#mail-index {
   margin: 0 1% 0 0 !important;
 }
-div#mail-index div#mail-index_mail div#mail-index_nm tr.mail td img {
+div#mail-index div#mail-index_nm tr.mail td img {
   height: 16px;
 }
-div#mail-index div#mail-index_mail div#mail-index_mailPreview {
+div#mail-index div#mail-index_mailPreview {
   padding: 3px;
-  margin: 5px 0;
+  margin: 0;
   background-color: #bfbfbf;
 }
-div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom {
+div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersFrom {
   width: 50%;
 }
-div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersTo {
+div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersTo {
   width: 50%;
 }
-div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate {
+div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersDate {
   width: 50%;
 }
-div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
+div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubject {
   width: 100%;
 }
 .egw_fw_ui_category_content #mail-index_buttonmailcreate {
@@ -57,7 +63,7 @@ div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mai
   background-color: #0b5fa4 !important;
   color: #FFF;
   text-shadow: none;
-  height: 35px;
+  /*    height: auto;*/
   background-image: none !important;
   -webkit-border-radius: 3px;
   -webkit-border-top-left-radius: 20px;
@@ -75,7 +81,7 @@ div#mail-index div#mail-index_mail div#mail-index_mailPreview div#mail-index_mai
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:before,
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:before {
   content: "+";
-  font-size: 2em;
+  font-size: 1.5em;
   color: #ffc200;
 }
 .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:hover,
@@ -943,11 +949,15 @@ input[type=button] {
   border: 1px solid rgba(0, 0, 0, 0.15);
   opacity: 1;
   -moz-opacity: 1;
+  z-index: 100;
 }
 #mail-index_previewAttachmentArea img {
   width: 16px;
   height: 16px;
 }
+#mail-index_previewAttachmentArea td {
+  padding: 2px;
+}
 #mail-index_previewAttachmentArea.noContent {
   border: 0px !important;
 }
@@ -961,6 +971,7 @@ input[type=button] {
   overflow-y: auto;
   left: 3px;
   right: 3px;
+  z-index: 100;
 }
 .mailDisplayContainer {
   position: fixed;
@@ -1010,3 +1021,7 @@ div.mailComposeBody,
 div.mailPreviewHeaders > * {
   margin-left: 3px;
 }
+#mail-importMessage .et2_button_icon {
+  height: auto;
+  width: 24px;
+}
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 8ebc731d6f..5a6b5f8e93 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -13,7 +13,16 @@
 @import (reference) "../../../pixelegg/less/def_buttons.less";
 @import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
 
-
+#popupMainDiv{
+	padding: 5px;
+	.et2_grid{
+		tr{
+			td{
+			padding: 5px 0;
+			}
+		}
+	}
+}
 /*##############################################
 #            #                               #
 #            #                               #
@@ -22,7 +31,7 @@
 #            #                               #
 #            #                               #
 #            #                               #
-#            #       iframge                 #
+#            #       iframe                  #
 #            #                               #
 #            #                               #
 #            #                               #
@@ -56,7 +65,7 @@ div#mail-index{
 
     // alles
 
-    div#mail-index_mail{
+
 
         margin: 0 1% 0 0 !important;
 
@@ -124,7 +133,7 @@ div#mail-index{
         // Ansicht der Emails
         div#mail-index_mailPreview{
             padding: 3px;
-            margin: 5px 0;
+            margin: 0;
             .background-color-25-gray;
             // From
             div#mail-index_mailPreviewHeadersFrom{
@@ -170,7 +179,7 @@ div#mail-index{
         } // Ende: Ansicht der Emails
 
 
-    } // Ende alles
+
 
 } // iframe
 
@@ -1119,9 +1128,11 @@ input[type=button] {
     .border_normal;
     opacity: 1;
     -moz-opacity:1;
+    z-index: 100;
     //	filter: Alpha(opacity=100);
 
     img {width: 16px; height: 16px;}
+    td{padding: 2px;}
 
 }
 #mail-index_previewAttachmentArea.noContent {
@@ -1139,6 +1150,7 @@ input[type=button] {
     overflow-y: auto;
     left: 3px;
     right: 3px;
+    z-index: 100;
 }
 .mailDisplayContainer {
     position: fixed;
@@ -1194,4 +1206,12 @@ div.mailComposeHeaders > span:first-child {
 }
 div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-child, div.mailComposeBody, div.mailPreviewHeaders > * {
     margin-left: 3px;}
+    
+#mail-importMessage{
+	.et2_button_icon{
+        			height: auto;
+        			width: 24px;
+        		}
+	}
+	
 //
\ No newline at end of file
diff --git a/timesheet/templates/default/edit.xet b/timesheet/templates/default/edit.xet
index 3a6dbde15f..1f5c06dc78 100644
--- a/timesheet/templates/default/edit.xet
+++ b/timesheet/templates/default/edit.xet
@@ -122,13 +122,13 @@
 					<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
 					<description/>
 				</row>
-				<row class="th" height="28">
+				<row class="th dialog-header" height="28">
 					<description value="User" for="ts_owner"/>
 					<menulist span="all">
 						<menupopup id="ts_owner" no_lang="1"/>
 					</menulist>
 				</row>
-				<row class="row">
+				<row class="row dialog-header">
 					<description value="Project" for="ts_project"/>
 					<grid spacing="1" padding="1">
 						<columns>
@@ -144,7 +144,7 @@
 						</rows>
 					</grid>
 				</row>
-				<row class="row" disabled="@ts_viewtype">
+				<row class="row dialog-header" disabled="@ts_viewtype">
 					<description value="Unitprice" for="ts_unitprice"/>
 					<grid>
 						<columns>
@@ -186,18 +186,18 @@
 						</menulist>
 					</hbox>
 				</row>
-				<row>
+				<row class="dialog-footer-toolbar">
 					<hbox orient="0" span="2">
 						<hbox>
-							<button statustext="Edit this entry" label="Edit" id="button[edit]"/>
-							<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]"/>
-							<button statustext="Saves the changes made" label="Save" id="button[save]"/>
-							<button statustext="Applies the changes made" label="Apply" id="button[apply]"/>
-							<button statustext="closes the window without saving the changes" label="Cancel" id="button[cancel]" onclick="window.close();"/>
+							<button statustext="Edit this entry" label="Edit" id="button[edit]" image="edit" background_image="1"/>
+							<button statustext="Saves this entry and add a new one" label="Save &amp; New" id="button[save_new]" image="save_new" background_image="1"/>
+							<button statustext="Saves the changes made" label="Save" id="button[save]" image="save" background_image="1"/>
+							<button statustext="Applies the changes made" label="Apply" id="button[apply]" image="apply" background_image="1"/>
+							<button statustext="closes the window without saving the changes" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
 							<html id="js"/>
 						</hbox>
-						<button align="right" statustext="Delete this entry" label="Delete" id="button[delete]" onclick="return confirm('Delete this entry');"/>
-						<button align="right" statustext="Restore this entry" label="Undelete" id="button[undelete]"/>
+						<button align="right" statustext="Delete this entry" label="Delete" id="button[delete]" onclick="return confirm('Delete this entry');" image="delete" background_image="1"/>
+						<button align="right" statustext="Restore this entry" label="Undelete" id="button[undelete]" image="undelete" background_image="1"/>
 					</hbox>
 				</row>
 			</rows>
diff --git a/timesheet/templates/pixelegg/app.css b/timesheet/templates/pixelegg/app.css
index 1a5fec444a..e692877379 100755
--- a/timesheet/templates/pixelegg/app.css
+++ b/timesheet/templates/pixelegg/app.css
@@ -51,3 +51,9 @@
   height: 16px;
   width: 16px;
 }
+#timesheet-edit #timesheet-edit_tabs {
+  padding: 0 3px;
+}
+#timesheet-edit #timesheet-edit_tabs .et2_tabheader {
+  background: none;
+}
diff --git a/timesheet/templates/pixelegg/app.less b/timesheet/templates/pixelegg/app.less
index 7b6090f010..7b384f8c01 100755
--- a/timesheet/templates/pixelegg/app.less
+++ b/timesheet/templates/pixelegg/app.less
@@ -91,4 +91,15 @@
 
 } // iframe
 }
+
+// timesheet-edit
+
+#timesheet-edit{
+	#timesheet-edit_tabs{
+		padding: 0 3px;
+		.et2_tabheader{
+			background: none;
+		}
+	}
+}
 //
\ No newline at end of file