From 250e8fef5a8029994e3f5f9339cf6232eef39ee2 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 1 Dec 2012 21:02:35 +0000 Subject: [PATCH] Submitting more visual work to dev, live --- Site5/Master-v5.master.cs | 17 +++++++------- .../Pages/v5/Finance/RequestCashAdvance.aspx | 2 +- .../v5/Finance/RequestCashAdvance.aspx.cs | 9 ++++++++ Site5/Style/style-v5.css | 22 +++++++++++++++++-- 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/Site5/Master-v5.master.cs b/Site5/Master-v5.master.cs index 9bdb338c..e42f7a06 100644 --- a/Site5/Master-v5.master.cs +++ b/Site5/Master-v5.master.cs @@ -16,12 +16,8 @@ namespace Activizr { public partial class MasterV5 : MasterV5Base { - protected void Page_Load(object sender, EventArgs e) + protected void Page_Init (object sender, EventArgs e) { - // Event subscriptions - - this.LanguageSelector.LanguageChanged += new EventHandler(LanguageSelector_LanguageChanged); - // Security stuff // Current authentication @@ -37,6 +33,13 @@ namespace Activizr _currentUser = Person.FromIdentity(currentUserId); _authority = _currentUser.GetAuthority(); _currentOrganization = Organization.FromIdentity(currentOrganizationId); + } + + protected void Page_Load(object sender, EventArgs e) + { + // Event subscriptions + + this.LanguageSelector.LanguageChanged += new EventHandler(LanguageSelector_LanguageChanged); // Titles and other page elements @@ -330,10 +333,6 @@ namespace Activizr } - protected void Page_Init(object sender, EventArgs e) - { - } - protected void LinkLogout_Click(object sender, EventArgs e) { FormsAuthentication.SignOut(); diff --git a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx index 0fa741db..17e6026d 100644 --- a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx +++ b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx @@ -6,7 +6,7 @@
-  
+  
 
 
 
diff --git a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs index c215e6c2..2cb94479 100644 --- a/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs +++ b/Site5/Pages/v5/Finance/RequestCashAdvance.aspx.cs @@ -12,5 +12,14 @@ public partial class Pages_v5_Finance_RequestCashAdvance : PageV5Base this.PageTitle = Resources.Pages.Finance.RequestCashAdvance_PageTitle; this.PageIcon = "iconshock-walletmoney"; this.InfoBoxLiteral = Resources.Pages.Finance.RequestCashAdvance_Info; + + if (!Page.IsPostBack) + { + this.TextBank.Text = this.CurrentUser.BankName; + this.TextClearing.Text = this.CurrentUser.BankClearing; + this.TextAccount.Text = this.CurrentUser.BankAccount; + this.TextAmount.Text = 0.ToString("N2"); + this.TextAmount.Focus(); + } } } \ No newline at end of file diff --git a/Site5/Style/style-v5.css b/Site5/Style/style-v5.css index d9e3b08d..015171a6 100644 --- a/Site5/Style/style-v5.css +++ b/Site5/Style/style-v5.css @@ -427,7 +427,7 @@ span.loginalphabetasign } -.buttonAccentColor:hover { +.buttonAccentColor:hover, .buttonAccentColor:focus { top: -2px; left: -2px; box-shadow: 2px 2px 4px #7F5500; @@ -526,7 +526,7 @@ span.loginalphabetasign width: 300px; } -.entryFields input:focus, .entryFields textarea:focus, .entryFields select:focus +.entryFields input:not(.buttonAccentColor):focus, .entryFields textarea:focus, .entryFields select:focus { background: #F0F6FF; box-shadow: 0px 0px 4px 2px #1C397E inset; @@ -539,6 +539,24 @@ span.loginalphabetasign line-height: 40px; padding-top: 12px; padding-left: 15px; + font-weight: 300; +} + +.content .entryLabels h2 +{ + font-size: 130%; + letter-spacing: 0px; + padding-bottom: 0px; + padding-top: 7px; + margin-bottom: 0px; + border: none; + font-weight: 400; + color: #476EC7; + line-height: 33px; +} + +.alignRight { + text-align: right; }