From 4c2e29f96030431e382726f49e1b78f295494cbf Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 5 Feb 2014 10:04:13 +0000
Subject: [PATCH] more styling of calendar edit

---
 calendar/templates/default/app.css   |  6 +++
 calendar/templates/default/edit.xet  |  4 +-
 calendar/templates/pixelegg/app.css  |  7 ++-
 calendar/templates/pixelegg/app.less | 70 ++++++++++++++--------------
 phpgwapi/js/jsapi/egw.js             |  2 +-
 5 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 1f83f2e6ea..29947f8c54 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -561,3 +561,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	font-weight: bold;
 	text-align: center;
 }
+
+#calendar-edit_action {
+	width: 10em;
+	padding-left: 10px;
+	margin-left: 5px;
+}
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 06f5eb41f6..47071462f4 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -60,7 +60,7 @@
 		</hbox>
 	</template>
 	<template id="calendar.edit.description" template="" lang="" group="0" version="1.0.1.001">
-		<textbox multiline="true" id="description" rows="12" cols="70" width="99%" height="200"/>
+		<textbox multiline="true" id="description" rows="12" cols="70" width="99%" height="290"/>
 	</template>
 	<template id="calendar.edit.participants" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%" height="210" overflow="auto" id="participants">
@@ -321,7 +321,7 @@
 					</hbox>
 				</row>
 				<row>
-					<tabbox id="tabs" height="210" span="all">
+					<tabbox id="tabs" height="300" span="all">
 						<tabs>
 							<tab id="general" label="General" statustext="Location, Start- and Endtimes, ..."/>
 							<tab id="description" label="Description" statustext="Full description"/>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 0e47a73633..b4f667ae3c 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -558,6 +558,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   font-weight: bold;
   text-align: center;
 }
+#calendar-edit_action {
+  width: 10em;
+  padding-left: 10px;
+  margin-left: 5px;
+}
 /*generell*/
 .egw_fw_content_browser_iframe img[src$="svg"] {
   background-color: #828282 !important;
@@ -891,8 +896,6 @@ div.calendar {
 #                                           #
 ##############################################*/
 div#calendar-edit {
-  width: 99%;
-  padding: 5px;
   /*###########################################*/
   /*###########################################*/
   /*Tab Beschreibung*/
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index ed2bf2e048..121c922578 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -49,7 +49,7 @@ img.sideboxstar {
 
     &:hover{.Complete_Button_Icon_hover ;}
     &:active{
-        .Complete_Button_Icon_active ; 
+        .Complete_Button_Icon_active ;
         background-color: @color_positive_action_active !important;}
 }
 
@@ -404,8 +404,6 @@ div.calendar { position: relative; }
 
 
 div#calendar-edit{
-    width: 99%;
-    padding: 5px;
     label.et2_label{
         /*padding: 0 2px;*/
     }
@@ -416,7 +414,7 @@ div#calendar-edit{
     .et2_tabheader{
         background-color: transparent;
     }
-      // Size for tabs  
+      // Size for tabs
     .et2_tabs {min-height: 325px;}
 
 
@@ -468,38 +466,38 @@ div#calendar-edit{
             }
 
         }
-        
-        
+
+
         // Kategorien
         .et2_hbox_right {overflow-y: auto;}
-        
+
         .et2_selectbox .ui-multiselect-checkboxes {min-height: 290px;}
         .et2_selectbox .ui-multiselect-checkboxes li {text-indent: -20px;}
-        
+
         //selectbox
         #calendar-edit_category{
             min-height: 310px;
-           
+
             border: 1px solid;
             border-color: @gray_30;
             .border_radius_button_normal;
-            
-            
+
+
 
             li{
                 .ui-state-hover{
                     font-weight: normal !important;
                     .box_shadow_standard_light_hover;
-                    
-                    
-                    
-                    
-                    
+
+
+
+
+
                 }
             }
         }
-        
-       
+
+
 
     }
 
@@ -535,13 +533,13 @@ div#calendar-edit{
                 &:hover {.Complete_Button_Icon_hover;}
                 &active {.Complete_Button_Icon_active;}
             }
-            
+
             // Quantity
             input#calendar-edit_quantity {
                 width: 30px;
                 position: relative;
                 top: 4px;
-                
+
             }
 
             // Ressourcen
@@ -552,7 +550,7 @@ div#calendar-edit{
                 select {margin-right: 3px;}
             }
 
-            
+
             // Rolle
 
             select#calendar-edit_role {margin-top: 6px;}
@@ -570,10 +568,10 @@ div#calendar-edit{
             //			}
 
         }
-        
+
         // Table
         .et2_label {padding: 0 5px 0 0;}
-        
+
     }
 
     /*###########################################*/
@@ -608,7 +606,7 @@ div#calendar-edit{
 
             .et2_link_to {width: auto !important; margin: 1em;}
         }
-        
+
         .et2_file {margin-left: 100px; width: 357px;}
         span.et2_label {padding:  1em;}
     }
@@ -636,19 +634,19 @@ div#calendar-edit{
 
         }
     }
-    
+
     /*###########################################*/
     /*// Toolbar*/
-    
+
     tr.dialog-footer-toolbar{
-        
+
         label.et2_label {top: 0px !important;}
-        
+
     }
-    
-    
-    
-    
+
+
+
+
 }
 //###################################################################
 //# generell
@@ -960,12 +958,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     top: 0px;
     background-color: @gray_10;
     .rounded (2px);
-    
+
     img[src$="svg"]  {
             .gradient_vertical (@gray_50, @gray_50) !important;
         }
-    
-    
+
+
 }
 .calendar_calEventIcons img{
     .dimension_height_s;
@@ -1079,7 +1077,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     width: 99.5%;
     border: 1px solid gray;
     padding-right: 3px;
-    
+
     img{.dimension_height_s;}
 }
 
diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 4ac8a52f55..fa2c172f67 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -225,7 +225,7 @@
 					{
 						// Resize popup when et2 load is done
 						jQuery(node).one("load",function() {
-							window.resizeTo(jQuery(document).width()+10,jQuery(document).height()+70);
+							window.resizeTo(jQuery(document).width()+20,jQuery(document).height()+70);
 						});
 					}
 					var et2 = new etemplate2(node, window.egw_appName+".etemplate_new.ajax_process_content.etemplate");