Merge

WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Virtualization2012/VirtualizationServerController2012.cs

@@ -557,7 +557,7 @@ namespace WebsitePanel.EnterpriseServer
                 try
                 {
                     // asynchronous process starts here
-                    CreateServerAsyncWorker worker = new CreateServerAsyncWorker();
+                    CreateServerAsyncWorker2012 worker = new CreateServerAsyncWorker2012();
 
                     worker.TaskId = vm.CurrentTaskId; // async task ID
                     worker.ThreadUserId = SecurityContext.User.UserId;

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/HyperV2012R2_Settings.ascx

@@ -92,16 +92,6 @@
                     Text="*" meta:resourcekey="DvdLibraryPathValidator" Display="Dynamic" SetFocusOnError="true" />
             </td>
 	    </tr>
-        <tr>
-		    <td class="SubHead" style="width:200px;">
-		        <asp:Localize ID="locReplicaPath" runat="server" meta:resourcekey="locReplicaPath" Text="Path to Replications:"></asp:Localize>
-		    </td>
-		    <td>
-                <asp:TextBox Width="300px" CssClass="NormalTextBox" Runat="server" ID="txtReplicaPath"></asp:TextBox>
-                <asp:RequiredFieldValidator ID="ReplicaPathValidator" runat="server" ControlToValidate="txtReplicaPath"
-                    Text="*" meta:resourcekey="ReplicaPathValidator" Display="Dynamic" SetFocusOnError="true" />
-            </td>
-	    </tr>
 	 </table>
 </fieldset>
 <br />
@@ -188,10 +178,20 @@
             <tr id="IsReplicaServerRow" runat="server">
             <td class="SubHead" style="padding-left: 20px;" colspan="2">
                 <table cellpadding="2" cellspacing="0" style="margin: 10px;">
+                    <tr>
+                        <td style="width: 200px;">
+                            <asp:Localize ID="locReplicaPath" runat="server" meta:resourcekey="locReplicaPath" Text="Path to Replications:"></asp:Localize>
+                        </td>
+                        <td>
+                            <asp:TextBox Width="300px" CssClass="NormalTextBox" runat="server" ID="txtReplicaPath"></asp:TextBox>
+                            <asp:RequiredFieldValidator ID="ReplicaPathValidator" runat="server" ControlToValidate="txtReplicaPath"
+                                Text="*" meta:resourcekey="ReplicaPathValidator" Display="Dynamic" SetFocusOnError="true" />
+                        </td>
+                    </tr>
                     <tr>
                         <td style="width: 200px">
                             <asp:Localize ID="locCertThumbnail" runat="server" meta:resourcekey="locCertThumbnail" Text="SSL Certificate Thumbnail:"></asp:Localize>
-                           </td>
+                        </td>
                         <td> 
                             <asp:DropDownList ID="ddlCertThumbnail" runat="server" Width="500px"></asp:DropDownList>
                             <asp:TextBox Width="400px" CssClass="NormalTextBox" runat="server" ID="txtCertThumbnail"></asp:TextBox>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/HyperV2012R2_Settings.ascx.designer.cs

@@ -228,33 +228,6 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator DvdLibraryPathValidator;
         
-        /// <summary>
-        /// locReplicaPath 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.Localize locReplicaPath;
-        
-        /// <summary>
-        /// txtReplicaPath 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.TextBox txtReplicaPath;
-        
-        /// <summary>
-        /// ReplicaPathValidator 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.RequiredFieldValidator ReplicaPathValidator;
-        
         /// <summary>
         /// locProcessorSettings control.
         /// </summary>
@@ -426,6 +399,33 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTableRow IsReplicaServerRow;
         
+        /// <summary>
+        /// locReplicaPath 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.Localize locReplicaPath;
+        
+        /// <summary>
+        /// txtReplicaPath 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.TextBox txtReplicaPath;
+        
+        /// <summary>
+        /// ReplicaPathValidator 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.RequiredFieldValidator ReplicaPathValidator;
+        
         /// <summary>
         /// locCertThumbnail control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx

@@ -34,10 +34,6 @@
 
 	    <div class="Content">
 		    <div class="Center">
-			    <div class="Title">
-                    <asp:Image ID="imgIcon" SkinID="Servers48" runat="server" />
-                    <wsp:FormTitle ID="locTitle" runat="server" meta:resourcekey="locTitle" Text="Replication" />
-                </div>
                 <div class="FormBody">
                     <wsp:ServerTabs ID="tabs" runat="server" SelectedTab="vps_replication" />
                     <wsp:SimpleMessageBox ID="messageBox" runat="server" />
@@ -45,9 +41,9 @@
                     <asp:ValidationSummary ID="validatorsSummary" runat="server"
                         ValidationGroup="Vps" ShowMessageBox="True" ShowSummary="False" />
 
-                    <wsp:CollapsiblePanel ID="secReplicationDetails" runat="server" Visible="False"
+                    <%--<wsp:CollapsiblePanel ID="secReplicationDetails" runat="server" Visible="False"
-                        TargetControlID="ReplicationDetailsPanel" meta:ResourceKey="secReplicationDetails" Text="Health"></wsp:CollapsiblePanel>
+                        TargetControlID="ReplicationDetailsPanel" meta:ResourceKey="secReplicationDetails" Text="Health"></wsp:CollapsiblePanel> Height="0" Style="overflow: hidden; padding: 10px; width: 750px;"--%>
-                    <asp:Panel ID="ReplicationDetailsPanel" runat="server" Height="0" Style="overflow: hidden; padding: 10px; width: 750px;">
+                    <asp:Panel ID="ReplicationDetailsPanel" runat="server" Visible="False" Style="padding: 10px;">
                         <asp:Localize ID="locHealth" runat="server" meta:resourcekey="locHealth" Text="Health:"></asp:Localize>
                         <asp:Label ID="labHealth" runat="server"></asp:Label>
                         <asp:Button ID="btnDetailInfo" runat="server" CausesValidation="false" CssClass="ActionButtonRename"

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx.cs

@@ -179,7 +179,7 @@ namespace WebsitePanel.Portal.VPS2012
                 }
 
                 // Details
-                secReplicationDetails.Visible = ReplicationDetailsPanel.Visible = vmReplica != null;
+                /*secReplicationDetails.Visible = */ ReplicationDetailsPanel.Visible = vmReplica != null;
 
                 // Pause buttons
                 if (vm.ReplicationState == ReplicationState.Suspended)
@@ -209,7 +209,8 @@ namespace WebsitePanel.Portal.VPS2012
             labDetailsHealthDetails.Text = vmReplicaInfo.HealthDetails;
 
             // statistic
-            StatisticCollapsiblePanel.Text += ToReadableString(vmReplicaInfo.ToTime - vmReplicaInfo.FromTime);
+            StatisticCollapsiblePanel.Text = GetLocalizedString("secStatisticPanel.Text") +
+                                             ToReadableString(vmReplicaInfo.ToTime - vmReplicaInfo.FromTime);
             labFromTime.Text = vmReplicaInfo.FromTime.ToString(DateFormat);
             labToTime.Text = vmReplicaInfo.ToTime.ToString(DateFormat);
             labAverageSize.Text = vmReplicaInfo.AverageSize;

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/VPS2012/VpsDetailsReplications.ascx.designer.cs

@@ -21,24 +21,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::WebsitePanel.Portal.EnableAsyncTasksSupport asyncTasks;
         
-        /// <summary>
-        /// imgIcon 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.Image imgIcon;
-        
-        /// <summary>
-        /// locTitle control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.VPS2012.UserControls.FormTitle locTitle;
-        
         /// <summary>
         /// tabs control.
         /// </summary>
@@ -66,15 +48,6 @@ namespace WebsitePanel.Portal.VPS2012 {
         /// </remarks>
         protected global::System.Web.UI.WebControls.ValidationSummary validatorsSummary;
         
-        /// <summary>
-        /// secReplicationDetails control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::WebsitePanel.Portal.CollapsiblePanel secReplicationDetails;
-        
         /// <summary>
         /// ReplicationDetailsPanel control.
         /// </summary>