Skip to content

Commit

Permalink
adding changes to fix About, Login and Register pages with the bootst…
Browse files Browse the repository at this point in the history
…rap theme
  • Loading branch information
gyurisc committed Sep 12, 2011
1 parent 99d592b commit 2070646
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 94 deletions.
29 changes: 29 additions & 0 deletions .gitignore
@@ -0,0 +1,29 @@

#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult*
83 changes: 43 additions & 40 deletions Views/Account/LogOn.cshtml
Expand Up @@ -3,46 +3,49 @@
@{
ViewBag.Title = "Log On";
}

<h2>Log On</h2>
<p>
Please enter your user name and password. @Html.ActionLink("Register", "Register") if you don't have an account.
</p>

<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>

@Html.ValidationSummary(true, "Login was unsuccessful. Please correct the errors and try again.")

@using (Html.BeginForm()) {
<div>
<fieldset>
<legend>Account Information</legend>

<div class="editor-label">
@Html.LabelFor(m => m.UserName)
</div>
<div class="editor-field">
@Html.TextBoxFor(m => m.UserName)
@Html.ValidationMessageFor(m => m.UserName)
</div>

<div class="editor-label">
@Html.LabelFor(m => m.Password)
</div>
<div class="editor-field">
@Html.PasswordFor(m => m.Password)
@Html.ValidationMessageFor(m => m.Password)
</div>

<div class="editor-label">
@Html.CheckBoxFor(m => m.RememberMe)
@Html.LabelFor(m => m.RememberMe)
</div>

<section id="LogOn">
<div class="page-header">
<h1>Log On</h1>
</div>
<div class="row">
<div class="span12 columns">
<p>
<input type="submit" value="Log On" />
Please enter your user name and password. @Html.ActionLink("Register", "Register") if you don't have an account.
</p>
</fieldset>
<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>

@Html.ValidationSummary(true, "Login was unsuccessful. Please correct the errors and try again.")

@using (Html.BeginForm()) {
<fieldset>
<legend>Account Information</legend>
<div class="clearfix">
@Html.LabelFor(m => m.UserName)
<div class="input">
@Html.TextBoxFor(m => m.UserName, new { @class = "xlarge"})
@Html.ValidationMessageFor(m => m.UserName)
</div>
</div>
<div class="clearfix">
@Html.LabelFor(m => m.Password)
<div class="input">
@Html.TextBoxFor(m => m.Password, new { @class = "xlarge"})
@Html.ValidationMessageFor(m => m.Password)
</div>
</div>
<div class="clearfix">
<div class="input">
@Html.CheckBoxFor(m => m.RememberMe)
<span>Remember me?</span>
</div>
</div>
<div class="actions">
<input type="submit" class="btn primary" value="Log On" />
</div>
</fieldset>
}

</div>
</div>
}
</section>
110 changes: 57 additions & 53 deletions Views/Account/Register.cshtml
Expand Up @@ -4,58 +4,62 @@
ViewBag.Title = "Register";
}

<h2>Create a New Account</h2>
<p>
Use the form below to create a new account.
</p>
<p>
Passwords are required to be a minimum of @Membership.MinRequiredPasswordLength characters in length.
</p>

<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>

@using (Html.BeginForm()) {
@Html.ValidationSummary(true, "Account creation was unsuccessful. Please correct the errors and try again.")
<div>
<fieldset>
<legend>Account Information</legend>

<div class="editor-label">
@Html.LabelFor(m => m.UserName)
</div>
<div class="editor-field">
@Html.TextBoxFor(m => m.UserName)
@Html.ValidationMessageFor(m => m.UserName)
</div>

<div class="editor-label">
@Html.LabelFor(m => m.Email)
</div>
<div class="editor-field">
@Html.TextBoxFor(m => m.Email)
@Html.ValidationMessageFor(m => m.Email)
</div>

<div class="editor-label">
@Html.LabelFor(m => m.Password)
</div>
<div class="editor-field">
@Html.PasswordFor(m => m.Password)
@Html.ValidationMessageFor(m => m.Password)
</div>

<div class="editor-label">
@Html.LabelFor(m => m.ConfirmPassword)
</div>
<div class="editor-field">
@Html.PasswordFor(m => m.ConfirmPassword)
@Html.ValidationMessageFor(m => m.ConfirmPassword)
</div>

<section id="LogOn">
<div class="page-header">
<h1>Create a New Account</h1>
</div>
<div class="row">
<div class="span12 columns">
<p>
<input type="submit" value="Register" />
</p>
</fieldset>
Use the form below to create a new account. Passwords are required to be a <strong>minimum of @Membership.MinRequiredPasswordLength characters</strong> in length.
</p>


<script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>

@using (Html.BeginForm()) {
@Html.ValidationSummary(true, "Account creation was unsuccessful. Please correct the errors and try again.")
<fieldset>
<legend>Account Information</legend>

<div class="clearfix">
@Html.LabelFor(m => m.UserName)
<div class="input">
@Html.TextBoxFor(m => m.UserName)
@Html.ValidationMessageFor(m => m.UserName)
</div>
</div>

<div class="clearfix">
@Html.LabelFor(m => m.Email)
<div class="input">
@Html.TextBoxFor(m => m.Email)
@Html.ValidationMessageFor(m => m.Email)
</div>
</div>

<div class="clearfix">
@Html.LabelFor(m => m.Password)
<div class="input">
@Html.PasswordFor(m => m.Password)
@Html.ValidationMessageFor(m => m.Password)
</div>
</div>

<div class="clearfix">
@Html.LabelFor(m => m.ConfirmPassword)
<div class="input">
@Html.PasswordFor(m => m.ConfirmPassword)
@Html.ValidationMessageFor(m => m.ConfirmPassword)
</div>
</div>

<div class="actions">
<input type="submit" class="btn primary" value="Register" />
</div>
</fieldset>
}
</div>
</div>
}
</section>
1 change: 0 additions & 1 deletion Views/Home/About.cshtml
@@ -1,7 +1,6 @@
@{
ViewBag.Title = "About Us";
}
<div class="row"></div>
<section id="About">
<div class="page-header">
<h1>About</h1>
Expand Down

0 comments on commit 2070646

Please sign in to comment.