Dialog adjustments

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3670 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
index 4564712..128dd84 100644 (file)
--- a/msi/WiX/ShibbolethSP-iis-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-iis-dialog.wxs
@@ -45,10 +45,10 @@
                  Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' \r
                  CheckBoxValue='TRUE' TabSkip='yes' />\r
 \r
-        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='165' Width='175' Height='35' TabSkip='yes' />\r
-        <Control Id='ShibExtensionText' Type='Text' X='114' Y='180' Width='96' Height='12' \r
+        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='145' Width='175' Height='35' TabSkip='yes' />\r
+        <Control Id='ShibExtensionText' Type='Text' X='114' Y='160' Width='96' Height='12' \r
                  Text='Shibboleth File Extension:' TabSkip='yes'/>\r
-        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='177' Width='51' Height='16' \r
+        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='157' Width='51' Height='16' \r
                  Property='SHIB_FILE_EXTENSION' TabSkip='yes'>\r
           <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>\r
           <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r

diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
index 0a3981f..3470074 100644 (file)
--- a/msi/WiX/ShibbolethSP-shibd-dialog.wxs
+++ b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
@@ -27,33 +27,33 @@
         </Control>\r
 \r
         <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' \r
-                 Text='{\WixUI_Font_Title}Shibd Service' />\r
+                 Text='{\WixUI_Font_Title}Shibboleth Service Provider' />\r
 \r
         <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' \r
                  Text='!(loc.InstallDirDlgBannerBitmap)' />\r
 \r
-        <Control Id='Description64' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' \r
-                 Text='Specify which architecture to run and the port for the Shibd daemon'>\r
+        <Control Id='Description64' Type='Text' X='25' Y='23' Width='300' Height='20' Transparent='yes' NoPrefix='yes' \r
+                 Text='Control service, and specify which architecture (64-bit or 32-bit) to make active.'>\r
           <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
         </Control>\r
+        <!--\r
         <Control Id='Description32' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' Text='Specify the port for the Shibd daemon'>\r
           <Condition Action='hide' >IS64BITINSTALL = "TRUE"</Condition>\r
         </Control>\r
-\r
+        -->\r
 \r
         <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />\r
         <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />\r
 \r
+        <!--\r
         <Control Id='ShibdLine1' Type='Text' X='25' Y='60' Width='312' Height='10' \r
                  Text='Please enter the TCP port number in which the shibd daemon should run'/>\r
         <Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' \r
                  Text='NOTE: This is NOT the web server port and MUST be a valid Windows port number that is NOT in use by any other process!'/>\r
         <Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' \r
                  Text='If a copy of shibboleth2.xml already exists in the installation path, it will NOT be updated with this new port number.'/>\r
-        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='118' Y='154' Width='96' Height='14' \r
-                 Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' \r
-                 CheckBoxValue='TRUE' TabSkip='yes' />\r
-\r
+        -->\r
+        \r
         <!--\r
         <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />\r
         <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >\r
@@ -67,8 +67,17 @@
         </Control>\r
         -->\r
 \r
-        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='205' Width='140' Height='14' \r
-                 Property='INSTALL_32BIT' Text='Install 32 bit shibd and plugins' \r
+        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='80' Y='80' Width='250' Height='30' \r
+          Property='INSTALL_SHIBD_SERVICE' Text='Install Shibboleth Daemon as a service (recommended).' \r
+          CheckBoxValue='TRUE' TabSkip='yes' />\r
+\r
+        <Control Id='ShibdLine1' Type='Text' X='25' Y='140' Width='312' Height='20' \r
+          Text='By default, Shibboleth will operate as a 64-bit system. You can change this now, or after installation.'>\r
+          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
+        </Control>\r
+        \r
+        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='170' Width='250' Height='30' \r
+                 Property='INSTALL_32BIT' Text='Run as a 32-bit system instead.' \r
                  CheckBoxValue='TRUE' TabSkip='yes'>\r
           <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
         </Control>\r