holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some more layout fixes for calendar-edit

Browse Source
This commit is contained in:
Ralf Becker 2014-02-05 11:14:44 +00:00
parent 4c2e29f960
commit 8e35567e6a
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1492,6 +1492,8 @@ class calendar_uiforms extends calendar_ui
$readonlys['tabs'] = array( $readonlys['tabs'] = array(
'custom' => !count($this->bo->config['customfields']), 'custom' => !count($this->bo->config['customfields']),
'participants' => $this->accountsel->account_selection == 'none', '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 if (!isset($GLOBALS['egw_info']['user']['apps']['felamimail'])) // no mail without mail-app
{ {

17
calendar/templates/pixelegg/app.css
View File

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @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 { .calendar_inputFullWidth input {
width: 100%; width: 100%;
} }
@ -924,23 +924,20 @@ div#calendar-edit .et2_tabs {
div#calendar-edit .et2_tabcntr { div#calendar-edit .et2_tabcntr {
overflow-y: auto; 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 { div#calendar-edit #calendar-edit_calendar-edit-general {
display: block; display: block;
float: left; float: left;
width: 100%; width: 100%;
} }
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid { div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid {
line-height: 30px;
width: 60% !important; width: 60% !important;
/* button#calendar-edit_freetime {background-image: url('images/add.png') !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 { div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid td {
padding: 4px; padding: 4px;
} }
@ -965,7 +962,6 @@ div#calendar-edit #calendar-edit_calendar-edit-general .et2_selectbox .ui-multis
text-indent: -20px; text-indent: -20px;
} }
div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category { div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category {
min-height: 310px;
border: 1px solid; border: 1px solid;
border-color: #b4b4b4; border-color: #b4b4b4;
-webkit-border-radius: 3px; -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 { div#calendar-edit #calendar-edit_calendar-edit-recurrence tbody {
display: table; display: table;
width: 100%; width: 100%;
line-height: 30px;
} }
div#calendar-edit #calendar-edit_calendar-edit-custom tbody { div#calendar-edit #calendar-edit_calendar-edit-custom tbody {
display: table; display: table;

24
calendar/templates/pixelegg/app.less
View File

@ -420,19 +420,6 @@ div#calendar-edit{
.et2_tabcntr { .et2_tabcntr {
overflow-y: auto; 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%; width: 100%;
table.et2_grid{ table.et2_grid{
line-height: 30px;
#calendar-edit_start{
margin-top: 5px;
margin-right: 5px;
}
width: 60% !important; width: 60% !important;
td { td {
@ -476,8 +470,6 @@ div#calendar-edit{
//selectbox //selectbox
#calendar-edit_category{ #calendar-edit_category{
min-height: 310px;
border: 1px solid; border: 1px solid;
border-color: @gray_30; border-color: @gray_30;
.border_radius_button_normal; .border_radius_button_normal;
@ -581,7 +573,7 @@ div#calendar-edit{
tbody{ tbody{
display: table; display: table;
width: 100%; width: 100%;
line-height: 30px;
} }
} }