Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restyle login, change password works

Browse Source
This commit is contained in:
poprhythm
2012-12-22 10:48:34 -05:00
parent f129142dab
commit c1944f6262
54 changed files with 327 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/Views/Account/Login.cshtml
+14 -11
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.LoginViewModel
@model MileageTraker.Web.ViewModels.Account.LoginViewModel
@{
ViewBag.Title = "Log in";
@@ -9,20 +9,23 @@
<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>
}
@section Styles
{
<link href="@Url.Content("~/Content/Account.Login.css")" rel="stylesheet" type="text/css" />
}
<h2>@ViewBag.Title</h2>
@using (Html.BeginForm("Login", "Account", new { ViewBag.ReturnUrl }, FormMethod.Post)) {
@using (Html.BeginForm("Login", "Account", new { ViewBag.ReturnUrl }, FormMethod.Post, new {@class = "form-login"})) {
<div class="header"></div>
<h2>@ViewBag.Title</h2>
@Html.AntiForgeryToken()
@Html.ValidationSummary(true)
@Html.Partial("_ValidationSummary")
<fieldset>
<legend />
<legend></legend>
@Html.EditorForModel()
<div class="control-group">
<div class="controls">
<input type="submit" value="Log in" class="btn btn-primary" />
</div>
</div>
<input type="submit" value="Log in" class="btn btn-primary" />
</fieldset>
}
Web/Views/Account/Manage.cshtml
+7 -4
View File
@@ -1,11 +1,14 @@
@model MileageTraker.Web.ViewModels.ChangePasswordViewModel
@model MileageTraker.Web.ViewModels.Account.ChangePasswordViewModel
@{
ViewBag.Title = "Manage Account";
}
@section Scripts
{
<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>
}
<hgroup class="title">
<h1>@ViewBag.Title</h1>
</hgroup>
<h2>@ViewBag.Title</h2>
<p class="label label-success">@ViewBag.StatusMessage</p>
Web/Views/Account/Register.cshtml
+2 -2
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.RegisterModel
@model MileageTraker.Web.ViewModels.Account.RegisterModel
@{
ViewBag.Title = "Register";
}
@@ -10,7 +10,7 @@
@using (Html.BeginForm()) {
@Html.AntiForgeryToken()
@Html.ValidationSummary()
@Html.Partial("_ValidationSummary")
<fieldset>
<legend>Registration Form</legend>
Web/Views/Account/_ChangePasswordPartial.cshtml
+5 -19
View File
@@ -1,27 +1,13 @@
@model MileageTraker.Web.ViewModels.ChangePasswordViewModel
@model MileageTraker.Web.ViewModels.Account.ChangePasswordViewModel
<h3>Change password</h3>
@using (Html.BeginForm("Manage", "Account")) {
@Html.Partial("_ValidationSummary")
@Html.AntiForgeryToken()
@Html.ValidationSummary()
<fieldset>
<legend>Change Password Form</legend>
<ol>
<li>
@Html.LabelFor(m => m.OldPassword)
@Html.PasswordFor(m => m.OldPassword)
</li>
<li>
@Html.LabelFor(m => m.NewPassword)
@Html.PasswordFor(m => m.NewPassword)
</li>
<li>
@Html.LabelFor(m => m.ConfirmPassword)
@Html.PasswordFor(m => m.ConfirmPassword)
</li>
</ol>
<input type="submit" value="Change password" />
<legend></legend>
@Html.EditorForModel()
<input type="submit" value="Change password" class="btn btn-primary" />
</fieldset>
}
Web/Views/Account/_SetPasswordPartial.cshtml
-25
View File
@@ -1,25 +0,0 @@
@model MileageTraker.Web.ViewModels.ChangePasswordViewModel
<p>
You do not have a password for this site.
</p>
@using (Html.BeginForm("Manage", "Account")) {
@Html.AntiForgeryToken()
@Html.ValidationSummary()
<fieldset>
<legend>Set Password Form</legend>
<ol>
<li>
@Html.LabelFor(m => m.NewPassword)
@Html.PasswordFor(m => m.NewPassword)
</li>
<li>
@Html.LabelFor(m => m.ConfirmPassword)
@Html.PasswordFor(m => m.ConfirmPassword)
</li>
</ol>
<input type="submit" value="Set password" />
</fieldset>
}
Web/Views/CreateLog/Confirm.cshtml
+1 -1
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.ConfirmCreateLogViewModel
@model MileageTraker.Web.ViewModels.CreateLog.ConfirmCreateLogViewModel
@{
ViewBag.Title = "Confirm";
Web/Views/CreateLog/Index.cshtml
+2 -2
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.CreateLogViewModel
@model MileageTraker.Web.ViewModels.CreateLog.CreateLogViewModel
@{
ViewBag.Title = "Enter Mileage Log";
@@ -19,7 +19,7 @@
{
<fieldset>
<legend>@ViewBag.Title</legend>
@Html.ValidationSummary(true)
@Html.Partial("_ValidationSummary")
@Html.EditorForModel()
<div class="control-group">
<div class="controls">
Web/Views/CreateLog/Success.cshtml
+1 -1
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.CreateLogViewModel
@model MileageTraker.Web.ViewModels.CreateLog.CreateLogViewModel
@{
ViewBag.Title = "Success";
Web/Views/Log/Create.cshtml
+2 -2
View File
@@ -19,9 +19,9 @@
<h2>@ViewBag.Title</h2>
@using (Html.BeginForm("Create", "Log", FormMethod.Post, new { @class = "form-horizontal" })) {
@Html.ValidationSummary(true)
@Html.Partial("_ValidationSummary")
<fieldset>
<legend>Log</legend>
<legend></legend>
@Html.EditorForModel()
<div class="control-group">
<div class="controls">
Web/Views/Log/DetailsPartial.cshtml
+1 -2
View File
@@ -1,5 +1,4 @@
@using MileageTraker.Web.ViewModels
@model LogPartialDetails
@model MileageTraker.Web.ViewModels.Log.LogPartialDetails
@{
Layout = null;
}
Web/Views/Log/Edit.cshtml
+2 -2
View File
@@ -20,9 +20,9 @@
@using (Html.BeginForm("Edit", "Log", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.ValidationSummary(true)
@Html.Partial("_ValidationSummary")
<fieldset>
<legend />
<legend></legend>
@Html.EditorForModel()
Web/Views/Log/Index.cshtml
+1 -1
View File
@@ -1,6 +1,6 @@
@using MileageTraker.Web.Utility
@using MileageTraker.Web.ViewModels
@model LogResultsViewModel
@model MileageTraker.Web.ViewModels.Log.LogResultsViewModel
@{
ViewBag.Title = "Logs";
Web/Views/Log/MonthlyVehicleMileage.cshtml
+1 -1
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.VehicleMileageViewModel
@model MileageTraker.Web.ViewModels.Vehicle.VehicleMileageViewModel
@{
ViewBag.Title = "Vehicle Mileage Report";
}
Web/Views/Shared/EditorTemplates/Boolean.cshtml
+4 -1
View File
@@ -1,4 +1,7 @@
<label class="checkbox">
@{
Layout = "~/Views/Shared/EditorTemplates/_FieldLayout.cshtml";
}
<label class="checkbox">
@Html.CheckBox("", ViewData.TemplateInfo.FormattedModelValue)
@Html.LabelForModel()
</label>
Web/Views/Shared/EditorTemplates/LogResultsViewModel.cshtml
+1 -1
View File
@@ -1,6 +1,6 @@
@using MileageTraker.Web.Models
@using MileageTraker.Web.Utility
@model MileageTraker.Web.ViewModels.LogResultsViewModel
@model MileageTraker.Web.ViewModels.Log.LogResultsViewModel
@Html.DropDownList("Year", new SelectList(Model.Years, Model.SelectedYear), new { @class = "input-small" })
@Html.DropDownList("Month", new SelectList(Model.Months, Model.SelectedMonth), new { @class = "input-mini" })
Web/Views/Shared/_Layout.admin.cshtml
+1 -1
View File
@@ -18,7 +18,7 @@
<li>@Html.ActionLink("Enter Mileage Log", "Index", "CreateLog")</li>
</ul>
<section id="account-management">
@Html.Partial("_Layout.authentication.cshtml")
@Html.Partial("_Layout.authentication")
</section>
</div>
</div>
Web/Views/Shared/_Layout.authentication.cshtml.cshtml → Web/Views/Shared/_Layout.authentication.cshtml
+1 -1
View File
@@ -6,7 +6,7 @@
<li>
@using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "form-logout" })) {
@Html.AntiForgeryToken()
<button type="submit" class="btn-link">
<button type="submit" class="btn-link logoff">
Log Off
</button>
}
Web/Views/Shared/_Layout.login.cshtml
-1
View File
@@ -10,7 +10,6 @@
</head>
<body>
<div class="container-fluid">
@RenderBody()
</div>
Web/Views/Shared/_ValidationSummary.cshtml
+7
View File
@@ -0,0 +1,7 @@
@if (ViewData.ModelState[""] != null && ViewData.ModelState[""].Errors.Any())
{
<div class="alert alert-error">
<a class="close" data-dismiss="alert">×</a>
@Html.ValidationSummary(true)
</div>
}
Web/Views/Vehicle/Create.cshtml
+2 -1
View File
@@ -20,8 +20,9 @@
@using (Html.BeginForm("Create", "Vehicle", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.ValidationSummary(true)
@Html.Partial("_ValidationSummary")
<fieldset>
<label></label>
@Html.EditorForModel()
<div class="control-group">
Web/Views/Vehicle/DetailsPartial.cshtml
+1 -1
View File
@@ -1,4 +1,4 @@
@model MileageTraker.Web.ViewModels.VehiclePartialDetails
@model MileageTraker.Web.ViewModels.Vehicle.VehiclePartialDetails
@{
Layout = null;
}
Web/Views/Vehicle/Edit.cshtml
+2 -2
View File
@@ -20,9 +20,9 @@
@using (Html.BeginForm("Edit", "Vehicle", FormMethod.Post, new { @class = "form-horizontal" }))
{
@Html.ValidationSummary(true)
@Html.Partial("_ValidationSummary")
<fieldset>
<label></label>
@Html.EditorForModel()
<div class="control-group">
<div class="controls">