Merge branch 'master' into develop_akritikos

akritikos · Nov 19, 2017 · 96fd819 · 96fd819
2 parents 7656d85 + af763d7
commit 96fd819
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/EzPay.WebApp/Controllers/CitizenController.cs b/EzPay.WebApp/Controllers/CitizenController.cs
@@ -118,15 +118,10 @@ public async Task<IActionResult> Login(LoginViewModel model, string returnUrl =
                     }
                     else
                     {
-                        ModelState.AddModelError(nameof(LoginViewModel.Password), "Password is invalid.");
+                        ModelState.AddModelError(string.Empty, "ID or Password is invalid.");
                         return View(model);
                     }
                 }
-                else
-                {
-                    ModelState.AddModelError(nameof(LoginViewModel.CitizenId), "Citizen ID is invalid.");
-                    return View(model);
-                }
             }
 
             // If we got this far, something failed, redisplay form

diff --git a/EzPay.WebApp/Views/Citizen/Login.cshtml b/EzPay.WebApp/Views/Citizen/Login.cshtml
@@ -15,15 +15,14 @@
 		<div class="row">
 			<div class="col-xs-12 col-md-4 col-md-offset-4">
 				<form asp-controller="Citizen" asp-action="Login" method="post" accept-charset="UTF-8" id="login-nav">
+					<center><div asp-validation-summary="All" class="text-danger mp0"></div></center>
 					<div class="form-group">
 						<label asp-for="CitizenId" class="sr-only" for="CitizenId">Citizen Id</label>
 						<input asp-for="CitizenId" type="number" class="form-control" id="CitizenId" placeholder="Citizen ID" required>
-						<span asp-validation-for="CitizenId" class="text-danger"></span>
 					</div>
 					<div class="form-group">
 						<label asp-for="Password" class="sr-only" for="Password">Password</label>
 						<input asp-for="Password" type="password" class="form-control" id="Password" placeholder="Password" required>
-						<span asp-validation-for="Password" class="text-danger"></span>
 						<div class="help-block text-right">
 							<a href="">Forgot your password?</a>
 						</div>

diff --git a/EzPay.WebApp/Views/Home/Contact.cshtml b/EzPay.WebApp/Views/Home/Contact.cshtml
@@ -1,10 +1,13 @@
 @model EzPay.WebApp.Models.ContactViewModel
 
-<center><h2>@ViewBag.Title</h2></center>
+@{
+	ViewData["Title"] = "Contact";
+}
+<center><h2>@ViewData["Title"] Us</h2></center>
 
 <center><h4>We are here for you! Please provide your comments or contact us for any issue:</h4></center>
 
-	<div class="row">
+	<div class="container">
 		<div class="col-xs-12 col-md-4 col-md-offset-4">
 			<form asp-action="SendForm" method="post">
 				<div class="form-group">

diff --git a/EzPay.WebApp/Views/Shared/_LoginPartial.cshtml b/EzPay.WebApp/Views/Shared/_LoginPartial.cshtml
@@ -30,17 +30,16 @@ else
 					<div class="row">
 						<div class="col-md-12">
 							<form asp-controller="Citizen" asp-action="Login" method="post" accept-charset="UTF-8" id="login-nav" novalidate>
+								<div asp-validation-summary="All" class="text-danger"></div>
 								<div class="form-group">
 									<label asp-for="CitizenId" class="sr-only" for="CitizenId">Citizen Id</label>
 									<input asp-for="CitizenId" type="number" class="form-control" id="CitizenId" placeholder="Citizen ID" autofocus required>
-									<span asp-validation-for="CitizenId" class="text-danger lc"></span>
 								</div>
 								<div class="form-group">
 									<label asp-for="Password" class="sr-only" for="Password">Password</label>
 									<input asp-for="Password" type="password" class="form-control" id="Password" placeholder="Password" required>
-									<span asp-validation-for="Password" class="text-danger lc"></span>
 									<div class="help-block text-right">
-										<a href="" class="text-success lc">Forgot your password?</a>
+										<a asp-controller="Home" asp-action="Contact" class="text-success lc">Forgot your password?</a>
 									</div>
 								</div>
 								<div class="form-group">

diff --git a/EzPay.WebApp/Views/Shared/_Main.cshtml b/EzPay.WebApp/Views/Shared/_Main.cshtml
@@ -23,9 +23,9 @@
 <div class="container body-content">
 	@RenderBody()
 
-	<footer class="fixed-bottom mtop20">
-		<hr />
+	<footer class="navbar-fixed-bottom">
 		<div class="col-xs-12 col-sm-12">
+			<hr />
 			<div class="container">
 				<center>
 					<p class="pull-left"><font color="#00BA75" style="font-weight:bold">EzPay</font> - &copy; @DateTime.Now.Year</p>

diff --git a/EzPay.WebApp/wwwroot/css/site.css b/EzPay.WebApp/wwwroot/css/site.css
@@ -23,6 +23,10 @@
 	padding: 10px 15px !important;
 }
 
+.navbar-fixed-bottom {
+	background-color: rgba(255, 255, 255, 0.8);
+}
+
 .jumbotron {
 	margin-top: -20px !important;
 }