diff --git a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml index 61f2bf6..6e9b9fd 100644 --- a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml +++ b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml @@ -19,32 +19,13 @@
- +
-
-
- -
-
-
-

- Forgot your password? -

-

- Register as a new user -

-

- Resend email confirmation -

-
diff --git a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs index 18a2f60..1af18f5 100644 --- a/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs +++ b/Aberwyn/Areas/Identity/Pages/Account/Login.cshtml.cs @@ -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] diff --git a/Aberwyn/Views/Admin/Todo.cshtml b/Aberwyn/Views/Admin/Todo.cshtml index be2d097..5707a80 100644 --- a/Aberwyn/Views/Admin/Todo.cshtml +++ b/Aberwyn/Views/Admin/Todo.cshtml @@ -35,7 +35,6 @@ } .todo-board { - padding: 20px; font-family: sans-serif; } .todo-columns { diff --git a/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml b/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml index 739fc5e..d5b3af8 100644 --- a/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml +++ b/Aberwyn/Views/FoodMenu/PizzaAdmin.cshtml @@ -3,7 +3,7 @@ @{ ViewData["Title"] = "Pizza Admin"; var availablePizzas = Model.AvailablePizzas as List ?? new List(); - var restaurantOpen = ViewBag.RestaurantOpen as bool? ?? true; + var restaurantOpen = ViewBag.RestaurantIsOpen as bool? ?? false; } diff --git a/Aberwyn/Views/Home/Menu.cshtml b/Aberwyn/Views/Home/Menu.cshtml index 9634090..8b95389 100644 --- a/Aberwyn/Views/Home/Menu.cshtml +++ b/Aberwyn/Views/Home/Menu.cshtml @@ -65,6 +65,7 @@ + diff --git a/Aberwyn/wwwroot/js/menu.js b/Aberwyn/wwwroot/js/menu.js index 9394bcd..8917d82 100644 --- a/Aberwyn/wwwroot/js/menu.js +++ b/Aberwyn/wwwroot/js/menu.js @@ -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 = [];