From ba8b42634d76ff2a9f6cb9748e1667f55bfe4ba2 Mon Sep 17 00:00:00 2001 From: Dick Porter Date: Tue, 16 Dec 2008 11:47:21 +0000 Subject: [PATCH] MoMA.master: Remove the login header link, add a 'login' page to the non-logged-in state and a 'my account' page to the logged-in state. MoMA.css: Remove the login header style as it's no longer needed. Add style for detailsview controls. MyAccount.aspx, MyAccount.aspx.cs: New page showing submissions from the current user, and giving password change and logout options. Password.aspx, Password.aspx.cs: Split out from the Login page. Login.aspx, Login.aspx.cs: Split out password changing. Override the ReturnURL for the Verify page only. svn path=/trunk/moma-tool/; revision=121586 --- web_service/Login.aspx | 3 +- web_service/Login.aspx.cs | 9 ++- web_service/MoMA.css | 31 ++++++-- web_service/MoMA.master | 8 +-- web_service/MyAccount.aspx | 103 +++++++++++++++++++++++++++ web_service/MyAccount.aspx.cs | 130 ++++++++++++++++++++++++++++++++++ web_service/Password.aspx | 17 +++++ web_service/Password.aspx.cs | 20 ++++++ 8 files changed, 306 insertions(+), 15 deletions(-) create mode 100644 web_service/MyAccount.aspx create mode 100644 web_service/MyAccount.aspx.cs create mode 100644 web_service/Password.aspx create mode 100644 web_service/Password.aspx.cs diff --git a/web_service/Login.aspx b/web_service/Login.aspx index 0179c03..1e4d77f 100644 --- a/web_service/Login.aspx +++ b/web_service/Login.aspx @@ -20,8 +20,7 @@ - - + You are already logged in! diff --git a/web_service/Login.aspx.cs b/web_service/Login.aspx.cs index 86bdf46..6929e11 100644 --- a/web_service/Login.aspx.cs +++ b/web_service/Login.aspx.cs @@ -43,9 +43,12 @@ public partial class Login : System.Web.UI.Page } protected void Login1_LoggedIn(object sender, EventArgs e) { - /* Override the ReturnURL. When I figure out how to disable it - * for specific pages like Verify, it can be restored for the others. + /* Override the ReturnURL for specific pages like Verify. */ - Response.Redirect("~/Overview.aspx"); + string return_url = Request.QueryString["ReturnUrl"]; + if (return_url == null || return_url.Contains("Verify.aspx")) + { + Response.Redirect("~/Overview.aspx"); + } } } diff --git a/web_service/MoMA.css b/web_service/MoMA.css index 8eadbe9..3dd1d59 100644 --- a/web_service/MoMA.css +++ b/web_service/MoMA.css @@ -2,12 +2,6 @@ { } -#header .login -{ - float: right; - color: #a1bfe2; -} - .content { /* Make this the context box for the main body content */ @@ -70,3 +64,28 @@ { background-color: #e5e5e5; } + +.dv_field_header +{ + background-color: #e5e5e5; + height: 23px; +} + +.dv_field_header th +{ + border: 1px solid #bbbbbb; + padding-left: 5px; + text-align: left; + white-space: nowrap; +} + +.dv_field_header a +{ + color: Black; + display: block; /* allow click anywhere in the header, not just the link text */ +} + +.dv_row_alternating +{ + background-color: #f9f9f9; +} \ No newline at end of file diff --git a/web_service/MoMA.master b/web_service/MoMA.master index 6d682c1..7517f72 100644 --- a/web_service/MoMA.master +++ b/web_service/MoMA.master @@ -35,22 +35,22 @@