Submitting more visual work to dev, live

This commit is contained in:
Rick Falkvinge
2012-12-01 21:02:35 +00:00
parent 6d81dfb840
commit 250e8fef5a
4 changed files with 38 additions and 12 deletions
+8 -9
View File
@@ -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();
@@ -6,7 +6,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
<div class="entryFields">
<asp:TextBox runat="server" ID="TextAmount" />&nbsp;<br/>
<asp:TextBox runat="server" ID="TextAmount" CssClass="alignRight" />&nbsp;<br/>
<asp:TextBox runat="server" ID="TextPurpose" />&nbsp;<br/>
<asp:TextBox runat="server" ID="Budget" />&nbsp;<br/>
&nbsp;<br/><!-- placeholder for label-side H2 -->
@@ -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();
}
}
}
+20 -2
View File
@@ -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;
}