Author: noaml
Date: 2007-01-25 03:46:55 -0500 (Thu, 25 Jan 2007)
New Revision: 71653

Modified:
   trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/Controls/Searcher.ascx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateRole.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateUser.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Error.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageRole.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageUser.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx.designer.cs
   
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Util.Master
Log:
Merge gh20preview2 branch (revisions 70670:71411)

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/Controls/Searcher.ascx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/Controls/Searcher.ascx   
    2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/Controls/Searcher.ascx   
    2007-01-25 08:46:55 UTC (rev 71653)
@@ -1,4 +1,4 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Searcher.ascx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.Searcher" %>
+<%@ Control Language="C#" AutoEventWireup="true" EnableTheming="false" 
CodeBehind="Searcher.ascx.cs" Inherits="Mainsoft.Web.AspnetConfig.Searcher" %>
 <%@ Register tagprefix="custom" namespace="Mainsoft.Web.AspnetConfig" 
Assembly="Mainsoft.Web.AspnetConfig"  %>
 
 <table width="100%" cellpadding="0" cellspacing="0">

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateRole.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateRole.aspx
 2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateRole.aspx
 2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,7 +23,7 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="CreateRole.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.CreateRole" %>
+<%@ Page Language="C#" AutoEventWireup="true" EnableTheming="false" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="CreateRole.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.CreateRole" %>
 <%@ Register TagPrefix="custom" Assembly="Mainsoft.Web.AspnetConfig" 
Namespace="Mainsoft.Web.AspnetConfig" %>
 
 <asp:Content ID="Main" ContentPlaceHolderID="Main" runat="server">

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateUser.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateUser.aspx
 2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/CreateUser.aspx
 2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,7 +23,7 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="CreateUser.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.CreateUser" %>
+<%@ Page Language="C#" AutoEventWireup="true" EnableTheming="false" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="CreateUser.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.CreateUser" %>
 <asp:Content runat="server" ID="main" ContentPlaceHolderID="Main">
     <table style="border-right: thin solid; padding-right: 2px; border-top: 
thin solid; padding-left: 2px; padding-bottom: 2px; border-left: thin solid; 
padding-top: 2px; border-bottom: thin solid">
         <tr>
@@ -35,11 +35,120 @@
             <td width= "60%" valign="top">
                     <asp:CreateUserWizard ID="CreateUserWizard1" 
runat="server" BackColor="#F7F6F3"
                     BorderColor="#E6E2D8" BorderStyle="Solid" 
BorderWidth="1px" Font-Names="Verdana" LoginCreatedUser="false"
-                    Font-Size="0.8em" Width="353px" 
ContinueDestinationPageUrl="CreateUser.aspx" 
FinishDestinationPageUrl="CreateUser.aspx" EmailRegularExpression="[EMAIL 
PROTECTED]" >
+                    Font-Size="0.8em" Width="353px" 
ContinueDestinationPageUrl="CreateUser.aspx" 
FinishDestinationPageUrl="CreateUser.aspx" EmailRegularExpression="[EMAIL 
PROTECTED]">
                     <WizardSteps>
                         <asp:CreateUserWizardStep ID="CreateUserWizardStep1" 
runat="server">
+                            <ContentTemplate>
+                                <table border="0" style="font-size: 100%; 
width: 353px; font-family: Verdana">
+                                    <tr>
+                                        <td align="center" colspan="2" 
style="font-weight: bold; color: white; background-color: #5d7b9d;
+                                            text-align: left">
+                                            Sign Up for Your New Account</td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right">
+                                            <asp:Label ID="UserNameLabel" 
runat="server" AssociatedControlID="UserName">User Name:</asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="UserName" 
runat="server"></asp:TextBox>
+                                            <asp:RequiredFieldValidator 
ID="UserNameRequired" runat="server" ControlToValidate="UserName"
+                                                ErrorMessage="User Name is 
required." ToolTip="User Name is required." 
ValidationGroup="CreateUserWizard1">*</asp:RequiredFieldValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right">
+                                            <asp:Label ID="PasswordLabel" 
runat="server" AssociatedControlID="Password">Password:</asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="Password" 
runat="server" TextMode="Password"></asp:TextBox>
+                                            <asp:RequiredFieldValidator 
ID="PasswordRequired" runat="server" ControlToValidate="Password"
+                                                ErrorMessage="Password is 
required." ToolTip="Password is required." 
ValidationGroup="CreateUserWizard1">*</asp:RequiredFieldValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right">
+                                            <asp:Label 
ID="ConfirmPasswordLabel" runat="server" 
AssociatedControlID="ConfirmPassword">Confirm Password:</asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="ConfirmPassword" 
runat="server" TextMode="Password"></asp:TextBox>
+                                            <asp:RequiredFieldValidator 
ID="ConfirmPasswordRequired" runat="server" ControlToValidate="ConfirmPassword"
+                                                ErrorMessage="Confirm Password 
is required." ToolTip="Confirm Password is required."
+                                                
ValidationGroup="CreateUserWizard1">*</asp:RequiredFieldValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right">
+                                            <asp:Label ID="EmailLabel" 
runat="server" AssociatedControlID="Email">E-mail:</asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="Email" 
runat="server"></asp:TextBox>
+                                            <asp:RequiredFieldValidator 
ID="EmailRequired" runat="server" ControlToValidate="Email"
+                                                ErrorMessage="E-mail is 
required." ToolTip="E-mail is required." 
ValidationGroup="CreateUserWizard1">*</asp:RequiredFieldValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right">
+                                            <asp:Label ID="QuestionLabel" 
runat="server" AssociatedControlID="Question">Security 
Question:</asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="Question" 
runat="server"></asp:TextBox>
+                                            <asp:RequiredFieldValidator 
ID="QuestionRequired" runat="server" ControlToValidate="Question"
+                                                ErrorMessage="Security 
question is required." ToolTip="Security question is required."
+                                                
ValidationGroup="CreateUserWizard1">*</asp:RequiredFieldValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right">
+                                            <asp:Label ID="AnswerLabel" 
runat="server" AssociatedControlID="Answer">Security Answer:</asp:Label></td>
+                                        <td>
+                                            <asp:TextBox ID="Answer" 
runat="server"></asp:TextBox>
+                                            <asp:RequiredFieldValidator 
ID="AnswerRequired" runat="server" ControlToValidate="Answer"
+                                                ErrorMessage="Security answer 
is required." ToolTip="Security answer is required."
+                                                
ValidationGroup="CreateUserWizard1">*</asp:RequiredFieldValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="center" colspan="2">
+                                            <asp:CompareValidator 
ID="PasswordCompare" runat="server" ControlToCompare="Password"
+                                                
ControlToValidate="ConfirmPassword" Display="Dynamic" ErrorMessage="The 
Password and Confirmation Password must match."
+                                                
ValidationGroup="CreateUserWizard1"></asp:CompareValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="center" colspan="2">
+                                            <asp:RegularExpressionValidator 
ID="EmailRegExp" runat="server" ControlToValidate="Email"
+                                                Display="Dynamic" 
ErrorMessage="Please enter a different e-mail." ValidationExpression="[EMAIL 
PROTECTED]"
+                                                
ValidationGroup="CreateUserWizard1"></asp:RegularExpressionValidator>
+                                        </td>
+                                    </tr>
+                                    <tr>
+                                        <td align="center" colspan="2" 
style="color: red">
+                                            <asp:Literal ID="ErrorMessage" 
runat="server" EnableViewState="False"></asp:Literal>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </ContentTemplate>
                         </asp:CreateUserWizardStep>
                         <asp:CompleteWizardStep ID="CompleteWizardStep1" 
runat="server">
+                            <ContentTemplate>
+                                <table border="0" style="font-size: 100%; 
width: 353px; font-family: Verdana">
+                                    <tr>
+                                        <td align="center" colspan="2" 
style="font-weight: bold; color: white; background-color: #5d7b9d;
+                                            text-align: left">
+                                            Create User</td>
+                                    </tr>
+                                    <tr>
+                                        <td>
+                                            &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;
+                                            <br />
+                                            &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; 
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
+                                            &nbsp;&nbsp; Complete.<br />
+                                            &nbsp; &nbsp; &nbsp;Your account 
has been successfully created.</td>
+                                    </tr>
+                                    <tr>
+                                        <td align="right" colspan="2">
+                                            <asp:Button ID="ContinueButton" 
runat="server" BackColor="#FFFBFF" BorderColor="#CCCCCC"
+                                                BorderStyle="Solid" 
BorderWidth="1px" CausesValidation="False" CommandName="Continue"
+                                                Font-Names="Verdana" 
ForeColor="#284775" Text="Continue" ValidationGroup="CreateUserWizard1" />
+                                        </td>
+                                    </tr>
+                                </table>
+                            </ContentTemplate>
                         </asp:CompleteWizardStep>
                     </WizardSteps>
                     <SideBarStyle BackColor="#5D7B9D" BorderWidth="0px" 
Font-Size="0.9em" VerticalAlign="Top" />

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
    2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx
    2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,12 +23,12 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="Default.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.Default" %>
+<%@ Page Language="C#" AutoEventWireup="true" EnableTheming="false" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="Default.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.Default" %>
 <asp:Content runat="server" ContentPlaceHolderID="Main">
     <table>
         <tr>
             <td>
-                You can use the Web Site AspnetConfig Tool to manage all the 
security settings for your application. You can set up users and passwords 
(authentication), create roles (groups of users), and create permissions (rules 
for controlling access to parts of your application).
+                You can use the Web Site Administration Tool to manage all the 
security settings for your application. You can set up users and passwords 
(authentication), and create roles (groups of users). By default, user 
information is stored in a Cloudscape database in the Data folder of your Web 
project. If you want to store user information in a different database, you may 
configure a different provider in the web.config file.
                 <br /><br /><br />
             </td>
         </tr>
@@ -69,7 +69,7 @@
                     </tr>
                     <tr>
                         <td>
-                            Existing roles : <%= Roles_count %>
+                             <%= Roles_count %>
                         </td>
                     </tr>
                     <tr>

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
 2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Default.aspx.cs
 2007-01-25 08:46:55 UTC (rev 71653)
@@ -60,17 +60,22 @@
                        {
                                if (Roles.Enabled) {
                                        string[] list = Roles.GetAllRoles ();
-                                       return list.Length.ToString ();
+                                       return "Existing roles :" + 
list.Length.ToString ();
                                }
                                else
-                                       return "Roles not enabled";
+                                       return @"In order to create or manage 
roles, the roleManger key must be enabled. To enable roleManager, please modify 
your Web.config file as follows: <br />
+                                                       &nbsp; 
&lt;configuration 
xmlns=""http://schemas.microsoft.com/.NetConfiguration/v2.0""&gt; <br />
+                                                       &nbsp;&nbsp;    
&lt;system.web&gt; <br />
+                                                       &nbsp;&nbsp;&nbsp;      
&lt;roleManager enabled=""true"" /&gt; <br />
+                                                        &nbsp;&nbsp;    
&lt/system.web&gt; <br />
+                                                       &nbsp; 
&lt;/configuration&gt;";
                        }
                }
 
                protected void HyperLink1_Load (object sender, EventArgs e)
                {
                        if (!Roles.Enabled)
-                               ((HyperLink) sender).Enabled = false;
+                               ((HyperLink) sender).Visible = false;
                }
        }
 }

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx
   2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/EditUser.aspx
   2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,7 +23,7 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="EditUser.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.EditUser" %>
+<%@ Page Language="C#" AutoEventWireup="true" EnableTheming="false" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="EditUser.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.EditUser" %>
 <%@ Register TagPrefix="custom" TagName="searcher" 
Src="~/Controls/Searcher.ascx" %>
 <asp:Content runat="server" ID="main" ContentPlaceHolderID="Main">
     <asp:MultiView ID="MultiView1" runat="server" ActiveViewIndex="0">

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Error.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Error.aspx  
    2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Error.aspx  
    2007-01-25 08:46:55 UTC (rev 71653)
@@ -24,12 +24,12 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
 
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Error.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.Error" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Error.aspx.cs" 
Theme="" StylesheetTheme="" Inherits="Mainsoft.Web.AspnetConfig.Error" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 
 <html xmlns="http://www.w3.org/1999/xhtml"; >
 <head runat="server">
-    <title>Untitled Page</title>
+    <title>ASP.Net Web Application Administration</title>
 </head>
 <body>
     <form id="form1" runat="server">

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageRole.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageRole.aspx
 2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageRole.aspx
 2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,7 +23,7 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="ManageRole.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.MenageRole" %>
+<%@ Page Language="C#" AutoEventWireup="true" EnableTheming="false" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="ManageRole.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.MenageRole" %>
 <%@ Register tagprefix="custom" namespace="Mainsoft.Web.AspnetConfig" 
Assembly="Mainsoft.Web.AspnetConfig"  %>
 <asp:Content runat="server" ID="main" ContentPlaceHolderID="Main">
     <table class="maintable">

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageUser.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageUser.aspx
 2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/ManageUser.aspx
 2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,7 +23,7 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="ManageUser.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.ManageUser" %>
+<%@ Page Language="C#" AutoEventWireup="true" EnableTheming="false" 
MasterPageFile="~/aspnetconfig/Util.Master" CodeBehind="ManageUser.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.ManageUser" %>
 <%@ Register tagprefix="custom" namespace="Mainsoft.Web.AspnetConfig" 
Assembly="Mainsoft.Web.AspnetConfig"  %>
 <%@ Register TagPrefix="custom" TagName="searcher" 
Src="~/Controls/Searcher.ascx" %>
 

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx
 2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx
 2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,12 +23,12 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SecurError.aspx.cs" 
Inherits="Mainsoft.Web.AspnetConfig.SecurError" %>
+<%@ Page Language="C#" AutoEventWireup="true" Theme="" StylesheetTheme="" 
CodeBehind="SecurError.aspx.cs" Inherits="Mainsoft.Web.AspnetConfig.SecurError" 
%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 
 <html xmlns="http://www.w3.org/1999/xhtml"; >
 <head runat="server">
-    <title>Error Page</title>
+    <title>ASP.Net Web Application Administration</title>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -36,9 +36,6 @@
         Error occurred on this request! <br />
         This tool cannot be remotely accessed!
     </div>
-    <div>
-        <asp:HyperLink ID="HyperLink1" runat="server" 
NavigateUrl="~/Default.aspx">Administration utility home page</asp:HyperLink>
-    </div>
     </form>
 </body>
 </html>

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx.designer.cs
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx.designer.cs
     2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/SecurError.aspx.designer.cs
     2007-01-25 08:46:55 UTC (rev 71653)
@@ -12,6 +12,5 @@
     
     public partial class SecurError {
         protected System.Web.UI.HtmlControls.HtmlForm form1;
-        protected System.Web.UI.WebControls.HyperLink HyperLink1;
     }
 }

Modified: 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Util.Master
===================================================================
--- 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Util.Master 
    2007-01-25 08:36:22 UTC (rev 71652)
+++ 
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.AspnetConfig/aspnetconfig/Util.Master 
    2007-01-25 08:46:55 UTC (rev 71653)
@@ -23,7 +23,7 @@
 // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --%>
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Util.master.cs" 
Inherits="Mainsoft.Web.AspnetConfig.Util" %>
+<%@ Master Language="C#" AutoEventWireup="true" EnableTheming="false" 
CodeBehind="Util.master.cs" Inherits="Mainsoft.Web.AspnetConfig.Util" %>
 <%@ Register TagPrefix="Custom" Namespace="Mainsoft.Web.AspnetConfig" 
Assembly="Mainsoft.Web.AspnetConfig" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -31,7 +31,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"; >
 <head id="Head1" runat="server">
     <link href="<%= Page.ClientScript.GetWebResourceUrl (typeof(Util), 
"Mainsoft.Web.AspnetConfig.aspnetconfig.Mainsoft.Web.AspnetConfig.css") %>" 
rel="stylesheet" type="text/css" />
-    <title>Configuration Utility</title>
+    <title>ASP.Net Web Application Administration</title>
 </head>
 <body>
     <form id="form1" runat="server">

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to