bugfix for: http://websitepanel.codeplex.com/workitem/339

Disable the Microsoft feed does not work

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

@@ -191,10 +191,10 @@
 			</td>
 		</tr>
 
-        <tr>
+<%--        <tr>
 				<td class="SubHead" style="width:200px;">Enable Microsoft feed</td>
 				<td class="Normal">
-                    <asp:CheckBox ID="wpiMicrosoftFeed" runat="server" Text="Yes" />
+                    <asp:CheckBox ID="wpiMicrosoftFeed" runat="server" Text="Yes"  Visible="false" />
                 </td>
 			</tr>
 			
@@ -204,7 +204,9 @@
                     <asp:CheckBox ID="wpiHeliconTechFeed" runat="server" Text="Yes" />
                 </td>
             </tr>
-    </table>
+--%>    
+
+</table>
     <uc6:EditFeedsList ID="wpiEditFeedsList" runat="server" DisplayNames="false" />
 </fieldset>
 <br />

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs

@@ -130,8 +130,8 @@ namespace WebsitePanel.Portal.ProviderControls
 			
 
             // WPI
-            wpiMicrosoftFeed.Checked = Utils.ParseBool(settings["FeedEnableMicrosoft"], true);
+            //wpiMicrosoftFeed.Checked = Utils.ParseBool(settings["FeedEnableMicrosoft"], true);
-            wpiHeliconTechFeed.Checked = Utils.ParseBool(settings["FeedEnableHelicon"], true);
+            //wpiHeliconTechFeed.Checked = Utils.ParseBool(settings["FeedEnableHelicon"], true);
             wpiEditFeedsList.Value = settings["FeedUrls"];
 
 
@@ -249,8 +249,8 @@ namespace WebsitePanel.Portal.ProviderControls
 
 			
 
-            settings["FeedEnableMicrosoft"] = wpiMicrosoftFeed.Checked.ToString();
+            //settings["FeedEnableMicrosoft"] = wpiMicrosoftFeed.Checked.ToString();
-            settings["FeedEnableHelicon"] = wpiHeliconTechFeed.Checked.ToString();
+            //settings["FeedEnableHelicon"] = wpiHeliconTechFeed.Checked.ToString();
             settings["FeedUrls"] = wpiEditFeedsList.Value;
             settings["GalleryAppsFilter"] = GetAppsCatalogFilter();
 

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

@@ -1,32 +1,3 @@
-// Copyright (c) 2012, 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.
@@ -311,24 +282,6 @@ namespace WebsitePanel.Portal.ProviderControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.LinkButton FilterDialogButton;
         
-        /// <summary>
-        /// wpiMicrosoftFeed 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.CheckBox wpiMicrosoftFeed;
-        
-        /// <summary>
-        /// wpiHeliconTechFeed 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.CheckBox wpiHeliconTechFeed;
-        
         /// <summary>
         /// wpiEditFeedsList control.
         /// </summary>

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx

@@ -44,24 +44,24 @@
     <wsp:CollapsiblePanel id="lclWpiSettings" runat="server"
 		TargetControlID="WpiPanel" meta:resourcekey="lclWpiSettings" Text="WebPlatformInstaller Settings"/>
 	<asp:Panel ID="WpiPanel" runat="server" Height="0" style="overflow:hidden;">
-     <table>
+       <asp:CheckBox ID="wpiMicrosoftFeed" runat="server" Text="Yes" Visible="false"/>
+       <asp:CheckBox ID="wpiHeliconTechFeed" runat="server" Text="Yes" Visible="false" />
+<%--     <table> 
 			<tr>
 				<td class="SubHead" style="width:200px;">Enable Microsoft feed</td>
 				<td class="Normal">
-                    <asp:CheckBox ID="wpiMicrosoftFeed" runat="server" Text="Yes" />
+                    <asp:CheckBox ID="wpiMicrosoftFeed" runat="server" Text="Yes" Visible="false"/>
                 </td>
 			</tr>
 			
             <tr>
 		        <td class="SubHead" style="width:200px;">Enable HeliconTech feed</td>
                 <td class="Normal">
-                    <asp:CheckBox ID="wpiHeliconTechFeed" runat="server" Text="Yes" />
+                    <asp:CheckBox ID="wpiHeliconTechFeed" runat="server" Text="Yes" Visible="false" />
                 </td>
             </tr>
-
-
 	  </table>
-
+--%>
         <uc1:EditFeedsList ID="wpiEditFeedsList" runat="server" DisplayNames="false" />
 	</asp:Panel>
 </div>

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

@@ -1,32 +1,3 @@
-// Copyright (c) 2012, 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.

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx

@@ -10,12 +10,13 @@
 <div class="FormBody">
 
     <uc1:SimpleMessageBox ID="messageBox" runat="server" />
-    <asp:CheckBox ID="chIgnoreDependencies" runat="server"  
-        Text="Ignore these dependencies"  Visible="false" AutoPostBack="True" 
-        oncheckedchanged="chIgnoreDependencies_CheckedChanged" />
      		
     <uc1:WebApplicationGalleryHeader ID="appHeader" runat="server" />
     
+    <asp:CheckBox ID="chIgnoreDependencies" runat="server"  
+        Text="Ignore dependency fail and install selected product anyway."  Visible="false" AutoPostBack="True" 
+        oncheckedchanged="chIgnoreDependencies_CheckedChanged" />
+	
 </div>
 <div class="FormFooter">
     <asp:Button ID="btnInstall" runat="server" meta:resourcekey="btnInstall" Text="Install" CssClass="Button1" OnClick="btnInstall_Click" OnClientClick="ShowProgressDialog('Installing application...');"/>

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

@@ -30,15 +30,6 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.UserControls.SimpleMessageBox messageBox;
         
-        /// <summary>
-        /// chIgnoreDependencies 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.CheckBox chIgnoreDependencies;
-        
         /// <summary>
         /// appHeader control.
         /// </summary>
@@ -48,6 +39,15 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::WebsitePanel.Portal.WebApplicationGalleryHeader appHeader;
         
+        /// <summary>
+        /// chIgnoreDependencies 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.CheckBox chIgnoreDependencies;
+        
         /// <summary>
         /// btnInstall control.
         /// </summary>