extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Importexport: Some CSS improvements, avoid an error in import iCal

Browse Source
This commit is contained in:
nathan 2022-09-08 14:25:07 -06:00
parent 9db38979ef
commit f1cba99aa9
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_wizard_import_ical.inc.php
View File

@ -115,14 +115,14 @@ class calendar_wizard_import_ical
{ {
$content['text'] = $this->steps['wizard_step60']; $content['text'] = $this->steps['wizard_step60'];
$content['step'] = 'wizard_step60'; $content['step'] = 'wizard_step60';
if(!array_key_exists('cal_owner', $content) && $content['plugin_options']) { if(!array_key_exists('cal_owner', $content) && $content['plugin_options'])
{
$content['cal_owner'] = $content['plugin_options']['cal_owner']; $content['cal_owner'] = $content['plugin_options']['cal_owner'];
} }
// Include calendar-owner widget // Include calendar-owner widget
$response = Api\Json\Response::get(); Api\Framework::includeJS('/calendar/js/app.min.js');
$response->includeScript(Api\Egw::link('/calendar/js/et2_widget_owner.js')); Api\Framework::includeCSS('calendar', 'calendar');
Api\Framework::includeJS('','et2_widget_owner');
$preserv = $content; $preserv = $content;
unset ($preserv['button']); unset ($preserv['button']);
return $this->step_templates[$content['step']]; return $this->step_templates[$content['step']];

4
importexport/templates/default/app.css
View File

@ -34,3 +34,7 @@ div.preview .content {
width: 100%; width: 100%;
margin-left: 50%; margin-left: 50%;
} }
.wizard_content > div > table {
width: 100%;
}

11
importexport/templates/pixelegg/app.css
View File

@ -45,6 +45,9 @@ div.preview .content {
width: 100%; width: 100%;
margin-left: 50%; margin-left: 50%;
} }
.wizard_content > div > table {
width: 100%;
}
/* Dialog Import Export */ /* Dialog Import Export */
#importexport-export_dialog { #importexport-export_dialog {
margin: 1em; margin: 1em;
@ -60,7 +63,7 @@ div.preview .content {
width: 400px; width: 400px;
} }
#importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(even) { #importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(even) {
background: #ffffff; background: #FFFFFF;
} }
#importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(odd) { #importexport-export_dialog_importexport-export_dialog-general_tab_content table.et2_grid tr:nth-child(odd) {
background: #f2f2f2; background: #f2f2f2;
@ -70,7 +73,7 @@ div.preview .content {
} }
/* Tab Auswahl*/ /* Tab Auswahl*/
#importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(even) { #importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(even) {
background: #ffffff; background: #FFFFFF;
} }
#importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(odd) { #importexport-export_dialog_importexport-export_dialog-selection_tab table.et2_grid tr:nth-child(odd) {
background: #f2f2f2; background: #f2f2f2;
@ -80,7 +83,7 @@ div.preview .content {
} }
/* Tab Optionen*/ /* Tab Optionen*/
#importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(even) { #importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(even) {
background: #ffffff; background: #FFFFFF;
} }
#importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(odd) { #importexport-export_dialog_importexport-export_dialog-options_tab table.et2_grid tr:nth-child(odd) {
background: #f2f2f2; background: #f2f2f2;
@ -97,7 +100,7 @@ div.preview .content {
.wizard_content #importexport-wizardbox_importexport-wizard_choosename, .wizard_content #importexport-wizardbox_importexport-wizard_choosename,
.wizard_content #importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file, .wizard_content #importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file,
.wizard_content #importexport-wizardbox_addressbook-importexport_wizard_vcard_charset { .wizard_content #importexport-wizardbox_addressbook-importexport_wizard_vcard_charset {
margin: 15em 0 0 10em; margin: 10em 2em 0 2em;
/*#importexport-wizardbox_msg{font-size: 2em;}*/ /*#importexport-wizardbox_msg{font-size: 2em;}*/
} }
.wizard_content #importexport-wizardbox_importexport-wizard_chooseapp table.et2_grid, .wizard_content #importexport-wizardbox_importexport-wizard_chooseapp table.et2_grid,

2
importexport/templates/pixelegg/app.less
View File

@ -82,7 +82,7 @@
#importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file, #importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file,
#importexport-wizardbox_addressbook-importexport_wizard_vcard_charset{ #importexport-wizardbox_addressbook-importexport_wizard_vcard_charset{
margin: 15em 0 0 10em; margin: 10em 2em 0 2em;
table.et2_grid{font-size: 15px;} table.et2_grid{font-size: 15px;}
/*#importexport-wizardbox_msg{font-size: 2em;}*/ /*#importexport-wizardbox_msg{font-size: 2em;}*/