Pizza fixes and removed school menu since summer
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -19,32 +19,13 @@
|
||||
<span asp-validation-for="Input.UserName" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-floating">
|
||||
<input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
|
||||
<label asp-for="Input.Password" class="form-label"></label>
|
||||
<input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
|
||||
<span asp-validation-for="Input.Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div>
|
||||
<div class="checkbox">
|
||||
<label asp-for="Input.RememberMe" class="form-label">
|
||||
<input class="form-check-input" asp-for="Input.RememberMe" />
|
||||
@Html.DisplayNameFor(m => m.Input.RememberMe)
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
||||
</div>
|
||||
<div>
|
||||
<p>
|
||||
<a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
|
||||
</p>
|
||||
<p>
|
||||
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
|
||||
</p>
|
||||
<p>
|
||||
<a id="resend-confirmation" asp-page="./ResendEmailConfirmation">Resend email confirmation</a>
|
||||
</p>
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@@ -62,7 +62,7 @@ namespace Aberwyn.Areas.Identity.Pages.Account
|
||||
public class InputModel
|
||||
{
|
||||
[Required]
|
||||
[Display(Name = "Användarnamn")]
|
||||
[Display(Name = "Username")]
|
||||
public string UserName { get; set; }
|
||||
|
||||
[Required]
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
}
|
||||
|
||||
.todo-board {
|
||||
padding: 20px;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
.todo-columns {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
@{
|
||||
ViewData["Title"] = "Pizza Admin";
|
||||
var availablePizzas = Model.AvailablePizzas as List<Meal> ?? new List<Meal>();
|
||||
var restaurantOpen = ViewBag.RestaurantOpen as bool? ?? true;
|
||||
var restaurantOpen = ViewBag.RestaurantIsOpen as bool? ?? false;
|
||||
}
|
||||
|
||||
<link rel="stylesheet" href="~/css/pizza-admin.css" />
|
||||
|
||||
@@ -65,6 +65,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<div class="school-meals card-view">
|
||||
<h2>Skolmat</h2>
|
||||
|
||||
@@ -85,7 +86,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
-->
|
||||
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -44,7 +44,7 @@ angular.module('mealMenuApp', ['ngSanitize'])
|
||||
});
|
||||
|
||||
}).catch(err => console.error("Fel vid hämtning av meny:", err));
|
||||
$scope.loadSchoolMeals(); // Lägg till här
|
||||
//$scope.loadSchoolMeals(); // Lägg till här
|
||||
|
||||
};
|
||||
$scope.schoolMeals = [];
|
||||
|
||||
Reference in New Issue
Block a user