EditWebSite form marge changes

WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css

@@ -54,9 +54,9 @@ legend {font-weight:700; color:#428bca; padding:0 4px;}
 legend span.NormalBold {display:inline;}
 .Tabs {width:100%;}
 .Separator {display:none;}
-.Tabs span {display:table; table-layout:fixed; width:100%; table-layout:fixed;}
+.Tabs span {display:table; table-layout:fixed; min-width:100%; table-layout:fixed;}
 .Tabs span span {display:table-cell; width:15%; text-align:center; padding:0;}
-.Tabs a {display:block; padding:10px 0; text-decoration:none; border-bottom:1px solid #ddd;}
+.Tabs a {display:block; padding:10px 5px; text-decoration:none; border-bottom:1px solid #ddd;}
 .Tabs a:Hover {background:#eee; text-decoration:none;}
 .Tabs a.ActiveTab {border:1px solid #ddd; border-bottom:none; color:#555; margin-bottom:-1px;}
 .Tabs a.ActiveTab:hover {background:none;}

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx

@@ -66,7 +66,7 @@
                                 </asp:DropDownList>
                             </div>
                         </fieldset>
-                    </asp:PlaceHolder>
+                    </asp:PlaceHolder> 
                     <asp:PlaceHolder runat="server" ID="ChooseDatabaseUserPanel">
                         <fieldset>
                             <legend>
@@ -120,6 +120,7 @@
                         <td>
                             <asp:Panel ID="sharedIP" runat="server">
                                 <asp:Localize ID="locSharedIPAddress" runat="server" meta:resourcekey="locSharedIPAddress" Text="IP address: Shared" />
+                                <asp:Label ID="lblSharedIP" runat="server"/>
                                 &nbsp;&nbsp;&nbsp;
                                 <asp:LinkButton ID="cmdSwitchToDedicatedIP" meta:resourcekey="cmdSwitchToDedicatedIP" runat="server" Text="Switch to dedicated IP" OnClick="cmdSwitchToDedicatedIP_Click"></asp:LinkButton>
                             </asp:Panel>

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

@@ -69,7 +69,7 @@ namespace WebsitePanel.Portal
 			new Tab { Id = "webman", ResourceKey = "Tab.WebManagement", Quota = Quotas.WEB_REMOTEMANAGEMENT, ViewId = "tabWebManagement" },
             new Tab { Id = "SSL", ResourceKey = "Tab.SSL", Quota = Quotas.WEB_SSL, ViewId = "SSL" },
 		};
-
+        protected string SharedIdAddres { get; set; }
 		private int PackageId
 		{
 			get { return (int)ViewState["PackageId"]; }
@@ -198,6 +198,16 @@ namespace WebsitePanel.Portal
             {
                 litIPAddress.Text = site.SiteIPAddress;
             }
+            else
+            {
+                IPAddressInfo[] ipsGeneral = ES.Services.Servers.GetIPAddresses(IPAddressPool.General, PanelRequest.ServerId);
+                bool generalIPExists = ipsGeneral.Any() && !string.IsNullOrEmpty(ipsGeneral[0].ExternalIP);
+                if (generalIPExists)
+                {
+                    lblSharedIP.Text = string.Format("({0})", ipsGeneral[0].ExternalIP); 
+                }
+                lblSharedIP.Visible = generalIPExists;
+            }
 
             dedicatedIP.Visible = site.IsDedicatedIP;
             sharedIP.Visible = !site.IsDedicatedIP;
@@ -312,7 +322,7 @@ namespace WebsitePanel.Portal
             // AppPool
             AppPoolState appPoolState = ES.Services.WebServers.GetAppPoolState(PanelRequest.ItemID);
             BindAppPoolState(appPoolState);
-
+            
 			// bind pointers
 			BindPointers();
 

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

@@ -1,37 +1,9 @@
-// Copyright (c) 2015, Outercurve Foundation.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must  retain  the  above copyright notice, this
-//   list of conditions and the following disclaimer.
-//
-// - Redistributions in binary form  must  reproduce the  above  copyright  notice,
-//   this list of conditions  and  the  following  disclaimer in  the documentation
-//   and/or other materials provided with the distribution.
-//
-// - Neither  the  name  of  the  Outercurve Foundation  nor   the   names  of  its
-//   contributors may be used to endorse or  promote  products  derived  from  this
-//   software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,  BUT  NOT  LIMITED TO, THE IMPLIED
-// WARRANTIES  OF  MERCHANTABILITY   AND  FITNESS  FOR  A  PARTICULAR  PURPOSE  ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL,  SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO,  PROCUREMENT  OF  SUBSTITUTE  GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)  HOWEVER  CAUSED AND ON
-// ANY  THEORY  OF  LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE)  ARISING  IN  ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
+//     the code is regenerated.  
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -238,6 +210,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Localize locSharedIPAddress;
         
+        /// <summary>
+        /// lblSharedIP 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 lblSharedIP;
+        
         /// <summary>
         /// cmdSwitchToDedicatedIP control.
         /// </summary>