Author: yonik
Date: 2006-12-25 07:37:59 -0500 (Mon, 25 Dec 2006)
New Revision: 70038
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateRole.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Default.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.cs
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.designer.cs
Log:
By Yonik <[EMAIL PROTECTED]>
* Changes for navigation by back button.
* Changes for application view (Remove logo , texts changing)
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateRole.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateRole.aspx.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateRole.aspx.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -63,7 +63,10 @@
protected void Page_Load (object sender, EventArgs e)
{
-
+ Button bt = Master.FindControl ("Back") as Button;
+ if (bt != null) {
+ bt.PostBackUrl = "Default.aspx";
+ }
}
protected void gridbtn_click (object sender, EventArgs e)
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/CreateUser.aspx.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -52,6 +52,10 @@
}
CreateUserWizard1.CreatingUser += new
LoginCancelEventHandler (CreateUserWizard1_CreatingUser);
CreateUserWizard1.CreatedUser += new EventHandler
(CreateUserWizard1_CreatedUser);
+ Button bt = Master.FindControl ("Back") as Button;
+ if (bt != null) {
+ bt.PostBackUrl = "Default.aspx";
+ }
}
public void CreateUserWizard1_CreatedUser (object sender,
EventArgs e)
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Default.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Default.aspx.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Default.aspx.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -39,7 +39,10 @@
{
protected void Page_Load (object sender, EventArgs e)
{
-
+ Button bt = Master.FindControl ("Back") as Button;
+ if (bt != null) {
+ bt.Enabled = false;
+ }
}
public string User_count
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx
2006-12-25 12:37:59 UTC (rev 70038)
@@ -108,7 +108,7 @@
</tr>
<tr>
<td width="100%" align="right">
- <asp:Button ID="success_btn" runat="server" Width="50px"
Text="OK" OnClick="success_btn_Click" />
+ <asp:Button ID="success_btn" runat="server" Text="OK"
OnClick="success_btn_Click" />
</td>
</tr>
</table>
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/EditUser.aspx.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -42,8 +42,26 @@
FillUserData (user_name);
name_lbl.Text = user_name;
}
+
+ Button bt = Master.FindControl ("Back") as Button;
+ if (bt != null) {
+ bt.PostBackUrl = "ManageUser.aspx";
+ }
}
+ protected override void OnPreRender (EventArgs e)
+ {
+ if (IsPostBack) {
+ if (MultiView1.ActiveViewIndex == 1) {
+ ((Button) Master.FindControl
("Back")).Visible = false;
+ }
+ else {
+ ((Button) Master.FindControl
("Back")).Visible = true;
+ }
+ }
+ base.OnPreRender (e);
+ }
+
void FillUserData (string user_name)
{
MembershipUser user = Membership.GetUser (user_name);
@@ -74,6 +92,5 @@
{
Server.Transfer ("ManageUser.aspx");
}
-
}
}
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageRole.aspx.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -42,6 +42,10 @@
Server.Transfer ("Error.aspx");
}
role_lbl.Text = role;
+ Button bt = Master.FindControl ("Back") as Button;
+ if (bt != null) {
+ bt.PostBackUrl = "CreateRole.aspx";
+ }
}
protected override void OnPreRender (EventArgs e)
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/ManageUser.aspx.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -46,7 +46,10 @@
protected void Page_Load (object sender, EventArgs e)
{
-
+ Button bt = Master.FindControl ("Back") as Button;
+ if (bt != null) {
+ bt.PostBackUrl = "Default.aspx";
+ }
}
protected override void OnInit (EventArgs e)
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master
2006-12-25 12:37:59 UTC (rev 70038)
@@ -39,12 +39,12 @@
<table width="100%">
<tr>
<td>
- <asp:Image runat="server" ID="Img" />
+
</td>
</tr>
<tr>
<td class="h1">
- Welcome to the Web Site Administration Tool
+ Web Site Administration Tool
</td>
</tr>
<tr>
@@ -69,7 +69,8 @@
</tr>
<tr>
<td align="right">
- <asp:Button ID="Back" runat="server" Text="Back"
style="padding-right: 1px; padding-left: 1px; font-weight: bold;
padding-bottom: 1px; margin: 1px; color: yellow; padding-top: 1px;
background-color: #6699ff" Enabled="false" OnClick="Button1_Click" />
+ <asp:Button ID="Back" runat="server" Text="Back" />
+ <%--style="padding-right: 1px; padding-left: 1px;
font-weight: bold; padding-bottom: 1px; margin: 1px; color: yellow;
padding-top: 1px; background-color: #6699ff"--%>
</td>
</tr>
</table>
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -44,23 +44,6 @@
protected void Page_Load (object sender, EventArgs e)
{
- if (!IsPostBack) {
- if (HttpContext.Current.Request.UrlReferrer !=
null) {
- Backurl =
HttpContext.Current.Request.UrlReferrer.ToString ();
- }
- }
-
- if (HttpContext.Current.Request.Url.ToString ().IndexOf
("Default.aspx") == -1) {
- Back.Enabled = true;
- }
-
- Img.ImageUrl = this.Page.ClientScript.GetWebResourceUrl
(typeof(Util), "Mainsoft.Web.Administration.resources.mainsoft.jpg");
-
}
-
- protected void Button1_Click (object sender, EventArgs e)
- {
- Response.Redirect (Backurl);
- }
}
}
Modified:
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.designer.cs
===================================================================
---
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.designer.cs
2006-12-25 09:45:38 UTC (rev 70037)
+++
trunk/mcs/class/Mainsoft.Web/Mainsoft.Web.Administration/aspnetconfig/Util.Master.designer.cs
2006-12-25 12:37:59 UTC (rev 70038)
@@ -13,7 +13,6 @@
public partial class Util {
protected System.Web.UI.HtmlControls.HtmlHead Head1;
protected System.Web.UI.HtmlControls.HtmlForm form1;
- protected System.Web.UI.WebControls.Image Img;
protected System.Web.UI.WebControls.SiteMapPath SiteMapPath1;
protected System.Web.UI.WebControls.ContentPlaceHolder Main;
protected System.Web.UI.WebControls.Button Back;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
