Fixed dialogue "Web Site Properties" and small correction of procedure "get/set status of the pool"

WebsitePanel/Sources/WebsitePanel.Providers.Base/Common/AppPoolState.cs

@@ -6,8 +6,10 @@ namespace WebsitePanel.Providers
     public enum AppPoolState
     {
         Unknown = 0,
-        Start = 1,
+        Starting = 1,
-        Stop = 2,
+        Started = 2,
-        Recycle = 3
+        Stopping = 3,
+        Stopped = 4,
+        Recycle = 5
     }
 }

WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebObjects/WebObjectsModuleService.cs

@@ -351,9 +351,6 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
         // AppPool
         public void ChangeAppPoolState(string siteId, AppPoolState state)
         {
-            // del
-            File.AppendAllText(@"c:\websitepanel\test.log", "ChangeAppPoolState " + siteId + " state " + state.ToString() + "\r\n");
-
             using (var srvman = GetServerManager())
             {
                 var site = srvman.Sites[siteId];
@@ -361,34 +358,44 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
                 if (site == null)
                     return;
 
-                string AppPoolName = site.ApplicationDefaults.ApplicationPoolName;
                 foreach (Application app in site.Applications)
-                    AppPoolName = app.ApplicationPoolName;
-
-                if (string.IsNullOrEmpty(AppPoolName))
-                    return;
-
-                ApplicationPool pool = srvman.ApplicationPools[AppPoolName];
-                if (pool == null) return;
-
-                //
-                switch (state)
                 {
-                    case AppPoolState.Start:
+                    string AppPoolName = app.ApplicationPoolName;
-                        pool.Start();
+
-                        pool.AutoStart = true;
+                    if (string.IsNullOrEmpty(AppPoolName))
-                        break;
+                        continue;
-                    case AppPoolState.Stop:
+
-                        pool.Stop();
+                    ApplicationPool pool = srvman.ApplicationPools[AppPoolName];
-                        pool.AutoStart = false;
+                    if (pool == null) continue;
-                        break;
+
-                    case AppPoolState.Recycle:
+                    //
-                        pool.Recycle();
+                    switch (state)
-                        pool.AutoStart = true;
+                    {
-                        break;
+                        case AppPoolState.Started:
+                        case AppPoolState.Starting:
+                            if ((pool.State != ObjectState.Started) && (pool.State != ObjectState.Starting))
+                            {
+                                pool.Start();
+                                pool.AutoStart = true;
+                            }
+                            break;
+                        case AppPoolState.Stopped:
+                        case AppPoolState.Stopping:
+                            if ((pool.State != ObjectState.Stopped) && (pool.State != ObjectState.Stopping))
+                            {
+                                pool.Stop();
+                                pool.AutoStart = false;
+                            }
+                            break;
+                        case AppPoolState.Recycle:
+                            pool.Recycle();
+                            pool.AutoStart = true;
+                            break;
+                    }
+
+                    srvman.CommitChanges();
+
                 }
-                //
-                srvman.CommitChanges();
             }
         }
 
@@ -416,16 +423,16 @@ namespace WebsitePanel.Providers.Web.Iis.WebObjects
             switch (pool.State)
             {
                 case ObjectState.Started:
-                    state = AppPoolState.Start;
+                    state = AppPoolState.Started;
                     break;
                 case ObjectState.Starting:
-                    state = AppPoolState.Start;
+                    state = AppPoolState.Starting;
                     break;
                 case ObjectState.Stopped:
-                    state = AppPoolState.Stop;
+                    state = AppPoolState.Stopped;
                     break;
                 case ObjectState.Stopping:
-                    state = AppPoolState.Stop;
+                    state = AppPoolState.Stopping;
                     break;
             }
 

WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin

@@ -31,6 +31,7 @@ Default skin template. The following skins are provided as examples only.
 <asp:ImageButton SkinID="StartMedium" runat="server" ImageUrl="Images/play_24.png" ImageAlign="AbsMiddle" Width="24" Height="24"/>
 <asp:ImageButton SkinID="StopMedium" runat="server" ImageUrl="Images/stop_24.png" ImageAlign="AbsMiddle" Width="24" Height="24"/>
 <asp:ImageButton SkinID="ContinueMedium" runat="server" ImageUrl="Images/play_24.png" ImageAlign="AbsMiddle" Width="24" Height="24"/>
+<asp:ImageButton SkinID="RecycleMedium" runat="server" ImageUrl="Images/restart_24.png" ImageAlign="AbsMiddle" Width="24" Height="24"/>
 
 <asp:ImageButton SkinID="PauseSmall" runat="server" ImageUrl="Images/pause_16.png" ImageAlign="AbsMiddle" Width="16" Height="16"/>
 <asp:ImageButton SkinID="StartSmall" runat="server" ImageUrl="Images/play_16.png" ImageAlign="AbsMiddle" Width="16" Height="16"/>

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

@@ -166,18 +166,12 @@
             <td nowrap valign="top" align="right">
                 <table cellpadding="7" width="150px">
                     <tr>
+                        <td>
+                            <asp:Label ID="lblWebsiteStatus" runat="server" meta:resourcekey="lblWebsiteStatus" Text="Website Status"></asp:Label>
+                        </td>
                         <td class="MediumBold" align="center">
                             <asp:Literal ID="litStatus" runat="server"></asp:Literal>
                         </td>
-
-                <%-- AppPool --%>
-						<td class="MediumBold" align="center">
-							App Pool : <asp:Literal ID="litAppPoolStatus" runat="server"></asp:Literal>
-						</td>
-                <%-- AppPool --%>
-
-                    </tr>
-                    <tr>
                         <td align="center">
                             <asp:ImageButton ID="cmdStart" runat="server" SkinID="StartMedium" meta:resourcekey="cmdStart"
                                 CommandName="Started" OnClick="cmdChangeState_Click" />
@@ -188,15 +182,22 @@
                             <asp:ImageButton ID="cmdStop" runat="server" SkinID="StopMedium" meta:resourcekey="cmdStop"
                                 CommandName="Stopped" OnClick="cmdChangeState_Click" />
                         </td>
-
+                    </tr>
-                <%-- AppPool --%>
+                    <tr>
-						<td align="center">
+                        <td>
-                            <asp:LinkButton ID="cmdAppPoolStart" runat="server" CommandName="Start" OnClick="cmdAppPoolChangeState_Click">Start</asp:LinkButton><br />
+                            <asp:Label ID="lblAppPoolStatus" runat="server" meta:resourcekey="lblAppPoolStatus" Text="App Pool Status"></asp:Label>
-                            <asp:LinkButton ID="cmdAppPoolStop" runat="server" CommandName="Stop" OnClick="cmdAppPoolChangeState_Click">Stop</asp:LinkButton><br />
+                        </td>
-                            <asp:LinkButton ID="cmdAppPoolRecycle" runat="server" CommandName="Recycle" OnClick="cmdAppPoolChangeState_Click">Recycle</asp:LinkButton>
+						<td class="MediumBold" align="center">
+							<asp:Literal ID="litAppPoolStatus" runat="server"></asp:Literal>
+						</td>
+						<td align="center">
+                            <asp:ImageButton ID="cmdAppPoolStart" runat="server" SkinID="StartMedium" meta:resourcekey="cmdStart"
+                                CommandName="Started" OnClick="cmdAppPoolChangeState_Click" />
+                            <asp:ImageButton ID="cmdAppPoolRecycle" runat="server" SkinID="RecycleMedium" meta:resourcekey="cmdRecycle"
+                                CommandName="Recycle" OnClick="cmdAppPoolChangeState_Click" />
+                            <asp:ImageButton ID="cmdAppPoolStop" runat="server" SkinID="StopMedium" meta:resourcekey="cmdStop"
+                                CommandName="Stopped" OnClick="cmdAppPoolChangeState_Click" />
 						</td>
-                <%-- AppPool --%>
-
                     </tr>
                 </table>
             </td>

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

@@ -995,17 +995,17 @@ namespace WebsitePanel.Portal
         // AppPool
         private void BindAppPoolState(AppPoolState state)
         {
-            litAppPoolStatus.Text = state.ToString();
+            litAppPoolStatus.Text = GetLocalizedString("SiteState." + state.ToString());
 
-            cmdAppPoolStart.Visible = (state == AppPoolState.Stop);
+            cmdAppPoolStart.Visible = (state == AppPoolState.Stopped || state == AppPoolState.Stopping);
-            cmdAppPoolStop.Visible = (state == AppPoolState.Start);
+            cmdAppPoolStop.Visible = (state == AppPoolState.Started || state == AppPoolState.Starting);
-            cmdAppPoolRecycle.Visible = (state == AppPoolState.Start);
+            cmdAppPoolRecycle.Visible = (state == AppPoolState.Started || state == AppPoolState.Starting);
         }
 
 
         protected void cmdAppPoolChangeState_Click(object sender, EventArgs e)
         {
-            string stateName = ((LinkButton)sender).CommandName;
+            string stateName = ((ImageButton)sender).CommandName;
             AppPoolState state = (AppPoolState)Enum.Parse(typeof(AppPoolState), stateName, true);
 
             try

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

@@ -318,6 +318,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.GridView gvPointers;
         
+        /// <summary>
+        /// lblWebsiteStatus элемент управления.
+        /// </summary>
+        /// <remarks>
+        /// Автоматически создаваемое поле.
+        /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblWebsiteStatus;
+        
         /// <summary>
         /// litStatus элемент управления.
         /// </summary>
@@ -327,15 +336,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Literal litStatus;
         
-        /// <summary>
-        /// litAppPoolStatus элемент управления.
-        /// </summary>
-        /// <remarks>
-        /// Автоматически создаваемое поле.
-        /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Literal litAppPoolStatus;
-        
         /// <summary>
         /// cmdStart элемент управления.
         /// </summary>
@@ -372,6 +372,24 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.ImageButton cmdStop;
         
+        /// <summary>
+        /// lblAppPoolStatus элемент управления.
+        /// </summary>
+        /// <remarks>
+        /// Автоматически создаваемое поле.
+        /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblAppPoolStatus;
+        
+        /// <summary>
+        /// litAppPoolStatus элемент управления.
+        /// </summary>
+        /// <remarks>
+        /// Автоматически создаваемое поле.
+        /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal litAppPoolStatus;
+        
         /// <summary>
         /// cmdAppPoolStart элемент управления.
         /// </summary>
@@ -379,16 +397,7 @@ namespace WebsitePanel.Portal {
         /// Автоматически создаваемое поле.
         /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton cmdAppPoolStart;
+        protected global::System.Web.UI.WebControls.ImageButton cmdAppPoolStart;
-        
-        /// <summary>
-        /// cmdAppPoolStop элемент управления.
-        /// </summary>
-        /// <remarks>
-        /// Автоматически создаваемое поле.
-        /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton cmdAppPoolStop;
         
         /// <summary>
         /// cmdAppPoolRecycle элемент управления.
@@ -397,7 +406,16 @@ namespace WebsitePanel.Portal {
         /// Автоматически создаваемое поле.
         /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton cmdAppPoolRecycle;
+        protected global::System.Web.UI.WebControls.ImageButton cmdAppPoolRecycle;
+        
+        /// <summary>
+        /// cmdAppPoolStop элемент управления.
+        /// </summary>
+        /// <remarks>
+        /// Автоматически создаваемое поле.
+        /// Для изменения переместите объявление поля из файла конструктора в файл кода программной части.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ImageButton cmdAppPoolStop;
         
         /// <summary>
         /// dlTabs элемент управления.