From f1cba99aa98791d322064b56a9a85462a7d48c0b Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Thu, 8 Sep 2022 14:25:07 -0600
Subject: [PATCH] Importexport: Some CSS improvements, avoid an error in import
 iCal

---
 .../inc/class.calendar_wizard_import_ical.inc.php     |  8 ++++----
 importexport/templates/default/app.css                |  4 ++++
 importexport/templates/pixelegg/app.css               | 11 +++++++----
 importexport/templates/pixelegg/app.less              |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/calendar/inc/class.calendar_wizard_import_ical.inc.php b/calendar/inc/class.calendar_wizard_import_ical.inc.php
index 22f450411b..63fefe5ce1 100644
--- a/calendar/inc/class.calendar_wizard_import_ical.inc.php
+++ b/calendar/inc/class.calendar_wizard_import_ical.inc.php
@@ -115,14 +115,14 @@ class calendar_wizard_import_ical
 		{
 			$content['text'] = $this->steps['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'];
 			}
 
 			// Include calendar-owner widget
-			$response = Api\Json\Response::get();
-			$response->includeScript(Api\Egw::link('/calendar/js/et2_widget_owner.js'));
-			Api\Framework::includeJS('','et2_widget_owner');
+			Api\Framework::includeJS('/calendar/js/app.min.js');
+			Api\Framework::includeCSS('calendar', 'calendar');
 			$preserv = $content;
 			unset ($preserv['button']);
 			return $this->step_templates[$content['step']];
diff --git a/importexport/templates/default/app.css b/importexport/templates/default/app.css
index 156e753c24..8a796b47f5 100644
--- a/importexport/templates/default/app.css
+++ b/importexport/templates/default/app.css
@@ -33,4 +33,8 @@ div.preview .content {
   bottom: 0px;
   width: 100%;
   margin-left: 50%;
+}
+
+.wizard_content > div > table {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/importexport/templates/pixelegg/app.css b/importexport/templates/pixelegg/app.css
index 230ceeee60..939004b1f6 100755
--- a/importexport/templates/pixelegg/app.css
+++ b/importexport/templates/pixelegg/app.css
@@ -45,6 +45,9 @@ div.preview .content {
   width: 100%;
   margin-left: 50%;
 }
+.wizard_content > div > table {
+  width: 100%;
+}
 /*     Dialog Import Export      */
 #importexport-export_dialog {
   margin: 1em;
@@ -60,7 +63,7 @@ div.preview .content {
   width: 400px;
 }
 #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) {
   background: #f2f2f2;
@@ -70,7 +73,7 @@ div.preview .content {
 }
 /* Tab Auswahl*/
 #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) {
   background: #f2f2f2;
@@ -80,7 +83,7 @@ div.preview .content {
 }
 /* Tab Optionen*/
 #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) {
   background: #f2f2f2;
@@ -97,7 +100,7 @@ div.preview .content {
 .wizard_content #importexport-wizardbox_importexport-wizard_choosename,
 .wizard_content #importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file,
 .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;}*/
 }
 .wizard_content #importexport-wizardbox_importexport-wizard_chooseapp table.et2_grid,
diff --git a/importexport/templates/pixelegg/app.less b/importexport/templates/pixelegg/app.less
index f9220d4188..432dc83f2b 100755
--- a/importexport/templates/pixelegg/app.less
+++ b/importexport/templates/pixelegg/app.less
@@ -82,7 +82,7 @@
      #importexport-wizardbox_importexport-wizard_basic_import_csv-sample_file,
      #importexport-wizardbox_addressbook-importexport_wizard_vcard_charset{
 
-         margin: 15em 0 0 10em;
+     margin: 10em 2em 0 2em;
 
          table.et2_grid{font-size: 15px;}
          /*#importexport-wizardbox_msg{font-size: 2em;}*/