2008-12-15 Miguel de Icaza <miguel@novell.com>

	* index.aspx: From Joseph Hill: add fantastic progress status to
	show while loading the page. 



svn path=/trunk/mono-tools/; revision=121571

4 files changed, 143 insertions, 5 deletions

diff --git a/webcompare/ChangeLog b/webcompare/ChangeLog
index c8663924..ace69875 100644
--- a/webcompare/ChangeLog
+++ b/webcompare/ChangeLog
@@ -1,4 +1,7 @@
 2008-12-15  Miguel de Icaza  <miguel@novell.com>
 
+	* index.aspx: From Joseph Hill: add fantastic progress status to
+	show while loading the page. 
+
 	* Add support for comparing different assemblies and versions 
 
diff --git a/webcompare/Web.config b/webcompare/Web.config
new file mode 100644
index 00000000..3b30485c
--- /dev/null
+++ b/webcompare/Web.config
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>

+<configuration>

+	<configSections>

+		<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

+			<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

+				<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+				<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">

+					<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>

+					<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+					<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+					<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>

+				</sectionGroup>

+			</sectionGroup>

+		</sectionGroup>

+	</configSections>

+	<appSettings/>

+	<connectionStrings/>

+	<system.web>

+		<!-- 

+            Set compilation debug="true" to insert debugging 

+            symbols into the compiled page. Because this 

+            affects performance, set this value to true only 

+            during development.

+        -->

+		<compilation debug="true">

+			<assemblies>

+				<add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

+				<add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

+				<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+				<add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>

+			</assemblies>

+		</compilation>

+		<!--

+            The <authentication> section enables configuration 

+            of the security authentication mode used by 

+            ASP.NET to identify an incoming user. 

+        -->

+		<authentication mode="Windows"/>

+		<!--

+            The <customErrors> section enables configuration 

+            of what to do if/when an unhandled error occurs 

+            during the execution of a request. Specifically, 

+            it enables developers to configure html error pages 

+            to be displayed in place of a error stack trace.

+

+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">

+            <error statusCode="403" redirect="NoAccess.htm" />

+            <error statusCode="404" redirect="FileNotFound.htm" />

+        </customErrors>

+        -->

+		<pages>

+			<controls>

+				<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+				<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			</controls>

+		</pages>

+		<httpHandlers>

+			<remove verb="*" path="*.asmx"/>

+			<add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false"/>

+		</httpHandlers>

+		<httpModules>

+			<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</httpModules>

+	</system.web>

+	<system.codedom>

+		<compilers>

+			<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

+				<providerOption name="CompilerVersion" value="v3.5"/>

+				<providerOption name="WarnAsError" value="false"/>

+			</compiler>

+		</compilers>

+	</system.codedom>

+	<!-- 

+        The system.webServer section is required for running ASP.NET AJAX under Internet

+        Information Services 7.0.  It is not necessary for previous version of IIS.

+    -->

+	<system.webServer>

+		<validation validateIntegratedModeConfiguration="false"/>

+		<modules>

+			<remove name="ScriptModule"/>

+			<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</modules>

+		<handlers>

+			<remove name="WebServiceHandlerFactory-Integrated"/>

+			<remove name="ScriptHandlerFactory"/>

+			<remove name="ScriptHandlerFactoryAppServices"/>

+			<remove name="ScriptResource"/>

+			<add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+			<add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>

+		</handlers>

+	</system.webServer>

+	<runtime>

+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

+			<dependentAssembly>

+				<assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>

+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>

+			</dependentAssembly>

+			<dependentAssembly>

+				<assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>

+				<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>

+			</dependentAssembly>

+		</assemblyBinding>

+	</runtime>

+</configuration>

diff --git a/webcompare/index.aspx b/webcompare/index.aspx
index 6bf8e01f..aa030b93 100644
--- a/webcompare/index.aspx
+++ b/webcompare/index.aspx
@@ -115,12 +115,30 @@ CompareContext GetCompareContext (global_asax.CompareParameters cp)
 	return cc;
 }
 
+public void ShowPleaseWait ()
+{
+	waitdiv.Visible = true;
+	
+	ClientScript.RegisterStartupScript(
+	    this.GetType(),
+	    "postpleasewait",
+	    ClientScript.GetPostBackEventReference(new PostBackOptions (waitdiv)) + ";",
+	    true);
+}
+
 public void Page_Load ()
 {
 	var cp = new global_asax.CompareParameters (Page.Request.QueryString);
+	if (!global_asax.CompareCache.ContainsKey (cp) && !IsPostBack){
+		ShowPleaseWait ();
+		return;
+	}
+
 	compare_context = GetCompareContext (cp);
 	var n = compare_context.Comparison;
 
+	waitdiv.Visible = false;
+
 	//TreeNode tn = new TreeNode ("<img src='sm.gif' border=0 align=absmiddle>" + n.name);
 	//TreeNode tn = new TreeNode (n.name);
 	//TreeNode tn = new TreeNode ("<div class='ok'></div>" + n.name);
@@ -129,6 +147,8 @@ public void Page_Load ()
 	tn.SelectAction = TreeNodeSelectAction.None;
 	tn.PopulateOnDemand = true;
 	tree.Nodes.Add (tn);
+
+	tree.Visible = true;
 }
 
 static string GetTodo (ComparisonNode cn)
@@ -339,11 +359,19 @@ void TreeNodePopulate (object sender, TreeNodeEventArgs e)
 
     <form id="form" runat="server">
     <div>
-        <asp:TreeView ID="tree" Runat="server" OnTreeNodePopulate="TreeNodePopulate"
-        EnableClientScript="true"
-        PopulateNodesFromClient="true"
-        ExpandDepth="1">
-        </asp:TreeView>
+        <asp:ScriptManager ID="ScriptManager1" runat="server"></asp:ScriptManager>
+        <asp:UpdatePanel ID="UpdatePanel1" runat="server" UpdateMode="Always">
+            <ContentTemplate>
+	        <div runat="server" id="waitdiv">
+                  <img src="wait.gif" runat="server" enableviewstate="false" /> Loading and Comparing...
+		</div>
+	        <asp:TreeView ID="tree" Runat="server" OnTreeNodePopulate="TreeNodePopulate"
+	        EnableClientScript="true"
+	        PopulateNodesFromClient="true"
+	        ExpandDepth="1">
+	        </asp:TreeView>
+            </ContentTemplate>   
+        </asp:UpdatePanel>
     </div>
     </form>
 </body>
diff --git a/webcompare/wait.gif b/webcompare/wait.gif
new file mode 100644
index 00000000..d0bce154
--- /dev/null
+++ b/webcompare/wait.gif