CA-379225: Swap the pages of the Export wizard so that VM selection c…

…omes first Signed-off-by: Konstantina Chremmou <[email protected]>
xenserver · Dec 1, 2023 · ad7e7c8 · ad7e7c8
1 parent 35e4c81
commit ad7e7c8
Show file tree

Hide file tree

Showing 12 changed files with 956 additions and 735 deletions.
diff --git a/XenAdmin/Help/HelpManager.resx b/XenAdmin/Help/HelpManager.resx
@@ -435,9 +435,12 @@
   <data name="EventsPane" xml:space="preserve">
     <value>troubleshooting-eventlog</value>
   </data>
-  <data name="ExportApplianceWizard_AppliancePane" xml:space="preserve">
+  <data name="ExportApplianceWizard_ApplianceOvfPane" xml:space="preserve">
     <value>vms-export-ovf</value>
   </data>
+  <data name="ExportApplianceWizard_ApplianceXvaPane" xml:space="preserve">
+    <value>vms-export</value>
+  </data>
   <data name="ExportApplianceWizard_ExportEulaPane" xml:space="preserve">
     <value>vms-export-ovf</value>
   </data>
@@ -448,19 +451,16 @@
     <value>vms-export</value>
   </data>
   <data name="ExportApplianceWizard_ExportOptionsPane" xml:space="preserve">
-    <value>vms-exportimport-about</value>
+    <value>vms-export-ovf</value>
   </data>
   <data name="ExportApplianceWizard_RbacExportOvfPane" xml:space="preserve">
     <value>vms-export-ovf</value>
   </data>
   <data name="ExportApplianceWizard_RbacExportXvaPane" xml:space="preserve">
     <value>vms-export</value>
   </data>
-  <data name="ExportApplianceWizard_SelectVMsOvfPane" xml:space="preserve">
-    <value>vms-export-ovf</value>
-  </data>
-  <data name="ExportApplianceWizard_SelectVMsXvaPane" xml:space="preserve">
-    <value>vms-export</value>
+  <data name="ExportApplianceWizard_SelectVMsPane" xml:space="preserve">
+    <value>vms-exportimport</value>
   </data>
   <data name="ExportVMDialog" xml:space="preserve">
     <value>vms-export</value>

diff --git a/XenAdmin/Wizards/ExportWizard/ExportAppliancePage.Designer.cs b/XenAdmin/Wizards/ExportWizard/ExportAppliancePage.Designer.cs