diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 82a174cce8..9420d97be1 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1492,6 +1492,8 @@ class calendar_uiforms extends calendar_ui $readonlys['tabs'] = array( 'custom' => !count($this->bo->config['customfields']), 'participants' => $this->accountsel->account_selection == 'none', + 'history' => !$event['id'], + 'alarms' => $readonlys['tabs']['alarms'], ); if (!isset($GLOBALS['egw_info']['user']['apps']['felamimail'])) // no mail without mail-app { diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index b4f667ae3c..dbdcd1ee0c 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -11,7 +11,7 @@ * @package calendar * @version $Id$ */ -/* $Id: app.css 45378 2014-01-24 16:04:11Z hnategh $ */ +/* $Id: app.css 45548 2014-02-05 10:04:13Z ralfbecker $ */ .calendar_inputFullWidth input { width: 100%; } @@ -924,23 +924,20 @@ div#calendar-edit .et2_tabs { div#calendar-edit .et2_tabcntr { overflow-y: auto; } -div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(even) { - /*background: @color_even;*/ - line-height: 20px; -} -div#calendar-edit .et2_tabcntr table.et2_grid tr:nth-child(odd) { - /*background: @color_odd;*/ - line-height: 44px; -} div#calendar-edit #calendar-edit_calendar-edit-general { display: block; float: left; width: 100%; } div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid { + line-height: 30px; width: 60% !important; /* button#calendar-edit_freetime {background-image: url('images/add.png') !important;}*/ } +div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-edit_start { + margin-top: 5px; + margin-right: 5px; +} div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td { padding: 4px; } @@ -965,7 +962,6 @@ div#calendar-edit #calendar-edit_calendar-edit-general .et2_selectbox .ui-multis text-indent: -20px; } div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category { - min-height: 310px; border: 1px solid; border-color: #b4b4b4; -webkit-border-radius: 3px; @@ -1046,6 +1042,7 @@ div#calendar-edit #calendar-edit_calendar-edit-participants .et2_label { div#calendar-edit #calendar-edit_calendar-edit-recurrence tbody { display: table; width: 100%; + line-height: 30px; } div#calendar-edit #calendar-edit_calendar-edit-custom tbody { display: table; diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 121c922578..82903daa15 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -420,19 +420,6 @@ div#calendar-edit{ .et2_tabcntr { overflow-y: auto; - - table.et2_grid { - // Listendarstellung - tr:nth-child(even) { - /*background: @color_even;*/ - line-height: 20px; - } - tr:nth-child(odd) { - /*background: @color_odd;*/ - line-height: 44px; - } - } - } @@ -446,6 +433,13 @@ div#calendar-edit{ width: 100%; table.et2_grid{ + line-height: 30px; + + #calendar-edit_start{ + margin-top: 5px; + margin-right: 5px; + } + width: 60% !important; td { @@ -476,8 +470,6 @@ div#calendar-edit{ //selectbox #calendar-edit_category{ - min-height: 310px; - border: 1px solid; border-color: @gray_30; .border_radius_button_normal; @@ -581,7 +573,7 @@ div#calendar-edit{ tbody{ display: table; width: 100%; - + line-height: 30px; } }