Commit after merge

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/SqlEditDatabase.ascx.resx

@@ -136,9 +136,5 @@
     <value>Users</value>
   </data>
     <data name="lblDBInternalServer.Text" xml:space="preserve">
-    <value>Internal DB Server:</value>
-  </data>
-  <data name="lblDBExternalServer.Text" xml:space="preserve">
-    <value>External DB Server:</value>
   </data>
 </root>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebsitesSSL.ascx.resx

@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="btnCSR.Text" xml:space="preserve">
     <value>Generate CSR</value>
@@ -160,7 +160,7 @@
     <value>Enter a password for the PFX</value>
   </data>
   <data name="InstallCSRCertificate.Text" xml:space="preserve">
-    <value>Paste your certificate form your CA into to the text area below and click on “Complete Installation” button.</value>
+    <value>Paste your certificate from your CA into to the text area below and click on “Install Certificate” button.</value>
   </data>
   <data name="InstallCSRDescription.Text" xml:space="preserve">
     <value>A CSR for your Website was generated successfully and is shown below. Copy the text below and paste it to a CA to request the certificate.</value>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx

@@ -25,11 +25,9 @@ function confirmation()
 			</td>
 		</tr>
         <tr>
-			<td class="SubHead" style="width: 150px;"><asp:Label ID="lblDBInternalServer" runat="server" meta:resourcekey="lblDBInternalServer" Text="Internal Server:"></asp:Label></td>
 			<td class="Normal"><asp:Literal ID="litDBInternalServer" runat="server"></asp:Literal></td>
         </tr>
         <tr>		
-			<td class="SubHead" style="width: 150px;"><asp:Label ID="lblDBExternalServer" runat="server" meta:resourcekey="lblDBExternalServer" Text="External Server:"></asp:Label></td>
 			<td class="Normal"><asp:Literal ID="litDBExternalServer" runat="server"></asp:Literal></td>
         </tr>
 	</table>
@@ -41,7 +39,7 @@ function confirmation()
     <asp:Panel ID="UsersPanel" runat="server" Height="0" style="overflow:hidden;">
 	    <table cellspacing="0" cellpadding="3" width="100%">
 		    <tr>
-			    <td>
+			    <td colspan="2">
 				    <asp:CheckBoxList ID="dlUsers" runat="server" CssClass="NormalBold" DataTextField="Name" DataValueField="Name"
 					    RepeatColumns="2" CellPadding="3"></asp:CheckBoxList>
 			    </td>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs

@@ -170,6 +170,7 @@ namespace WebsitePanel.Portal
                         // bind item to controls
                         usernameControl.Text = item.Name;
                         usernameControl.EditMode = true;
+
                         foreach (string user in item.Users)
                         {
                             ListItem li = dlUsers.Items.FindByValue(user);

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs

@@ -1,9 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:2.0.50727.3074
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -39,43 +40,11 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.UsernameControl usernameControl;
         
-        /// <summary>
-        /// lblDBInternalServer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblDBInternalServer;
-        
         /// <summary>
         /// litDBInternalServer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
         protected global::System.Web.UI.WebControls.Literal litDBInternalServer;
-        
-        /// <summary>
-        /// lblDBExternalServer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblDBExternalServer;
-        
-        /// <summary>
         /// litDBExternalServer control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
         protected global::System.Web.UI.WebControls.Literal litDBExternalServer;
-        
-        /// <summary>
         /// secUsers control.
         /// </summary>
         /// <remarks>