diff --git a/Trunk/Server/Forum/Forum/Content/Site.css b/Trunk/Server/Forum/Forum/Content/Site.css index 4a23635..f96c51f 100644 --- a/Trunk/Server/Forum/Forum/Content/Site.css +++ b/Trunk/Server/Forum/Forum/Content/Site.css @@ -297,8 +297,10 @@ textarea { border-radius: 1rem; } - - +.wrapper { + padding: 3rem; + background-color: #f2f2f2; +} diff --git a/Trunk/Server/Forum/Forum/Controllers/AccountController.cs b/Trunk/Server/Forum/Forum/Controllers/AccountController.cs index 7e4a6c7..6f8940c 100644 --- a/Trunk/Server/Forum/Forum/Controllers/AccountController.cs +++ b/Trunk/Server/Forum/Forum/Controllers/AccountController.cs @@ -86,7 +86,7 @@ namespace Forum.Controllers return RedirectToAction("SendCode", new { ReturnUrl = returnUrl, RememberMe = model.RememberMe }); case SignInStatus.Failure: default: - ModelState.AddModelError("", "Invalid login attempt."); + ModelState.AddModelError("", "Niepoprawny login lub hasło"); return View(model); } } diff --git a/Trunk/Server/Forum/Forum/Models/AccountViewModels.cs b/Trunk/Server/Forum/Forum/Models/AccountViewModels.cs index 294ec2d..91d61ee 100644 --- a/Trunk/Server/Forum/Forum/Models/AccountViewModels.cs +++ b/Trunk/Server/Forum/Forum/Models/AccountViewModels.cs @@ -55,10 +55,10 @@ namespace Forum.Models [Required] [DataType(DataType.Password)] - [Display(Name = "Password")] + [Display(Name = "Hasło")] public string Password { get; set; } - [Display(Name = "Remember me?")] + [Display(Name = "Zapamiętaj mnie")] public bool RememberMe { get; set; } } @@ -80,7 +80,7 @@ namespace Forum.Models [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] public string ConfirmPassword { get; set; } - [Display(Name = "Imie i nazwisko")] + [Display(Name = "Imię i nazwisko")] [Required] public string FullName { get; set; } } diff --git a/Trunk/Server/Forum/Forum/Views/Account/Login.cshtml b/Trunk/Server/Forum/Forum/Views/Account/Login.cshtml index 3926b3c..adb85b3 100644 --- a/Trunk/Server/Forum/Forum/Views/Account/Login.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Account/Login.cshtml @@ -1,7 +1,7 @@ @using Forum.Models @model LoginViewModel @{ - ViewBag.Title = "Log in"; + ViewBag.Title = "Zaloguj się"; }

@ViewBag.Title.

@@ -11,7 +11,6 @@ @using (Html.BeginForm("Login", "Account", new { ReturnUrl = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "form-horizontal", role = "form" })) { @Html.AntiForgeryToken() -

Use a local account to log in.

@Html.ValidationSummary(true, "", new { @class = "text-danger" })
@@ -38,11 +37,11 @@
- +

- @Html.ActionLink("Register as a new user", "Register") + @Html.ActionLink("Utwórz nowego użytkownika", "Register")

@* Enable this once you have account confirmation enabled for password reset functionality

@@ -51,11 +50,7 @@ } -

-
- @Html.Partial("_ExternalLoginsListPartial", new ExternalLoginListViewModel { ReturnUrl = ViewBag.ReturnUrl }) -
-
+ @section Scripts { diff --git a/Trunk/Server/Forum/Forum/Views/Account/Register.cshtml b/Trunk/Server/Forum/Forum/Views/Account/Register.cshtml index da03ca8..fb9ce15 100644 --- a/Trunk/Server/Forum/Forum/Views/Account/Register.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Account/Register.cshtml @@ -1,6 +1,6 @@ @model Forum.Models.RegisterViewModel @{ - ViewBag.Title = "Register"; + ViewBag.Title = "Zarejestruj się"; }

@ViewBag.Title.

@@ -8,7 +8,6 @@ @using (Html.BeginForm("Register", "Account", FormMethod.Post, new { @class = "form-horizontal", role = "form" })) { @Html.AntiForgeryToken() -

Create a new account.

@Html.ValidationSummary("", new { @class = "text-danger" })
@@ -37,7 +36,7 @@
- +
} diff --git a/Trunk/Server/Forum/Forum/Views/Categories/Create.cshtml b/Trunk/Server/Forum/Forum/Views/Categories/Create.cshtml index 6a9961d..e4981a1 100644 --- a/Trunk/Server/Forum/Forum/Views/Categories/Create.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Categories/Create.cshtml @@ -1,40 +1,44 @@ -@model Forum.DataAccessLayer.Models.Category - -@{ - ViewBag.Title = "Create"; -} - -

Create

- - -@using (Html.BeginForm()) -{ - @Html.AntiForgeryToken() - -
-

Category

-
- @Html.ValidationSummary(true, "", new { @class = "text-danger" }) -
- @Html.LabelFor(model => model.CategoryName, htmlAttributes: new { @class = "control-label col-md-2" }) -
- @Html.EditorFor(model => model.CategoryName, new { htmlAttributes = new { @class = "form-control" } }) - @Html.ValidationMessageFor(model => model.CategoryName, "", new { @class = "text-danger" }) -
-
- -
-
- -
-
-
-} - -
- @Html.ActionLink("Back to List", "Index") -
- -@section Scripts { - @Scripts.Render("~/bundles/jqueryval") -} +@model Forum.DataAccessLayer.Models.Category + +@{ + ViewBag.Title = "Create"; +} + + +
+

Utwórz kategorie

+
+ + + +@using (Html.BeginForm()) +{ + @Html.AntiForgeryToken() + +
+
+ @Html.ValidationSummary(true, "", new { @class = "text-danger" }) +
+ @Html.LabelFor(model => model.CategoryName, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.CategoryName, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.CategoryName, "", new { @class = "text-danger" }) +
+
+ +
+
+ +
+
+
+} + +
+ @Html.ActionLink("Powrót", "Index") +
+ +
+@section Scripts { + @Scripts.Render("~/bundles/jqueryval") +} diff --git a/Trunk/Server/Forum/Forum/Views/Categories/Index.cshtml b/Trunk/Server/Forum/Forum/Views/Categories/Index.cshtml index 0838253..d85fd70 100644 --- a/Trunk/Server/Forum/Forum/Views/Categories/Index.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Categories/Index.cshtml @@ -4,29 +4,32 @@ ViewBag.Title = "Index"; } -

Index

- -

- @Html.ActionLink("Create New", "Create") -

- - - - - - -@foreach (var item in Model) { - - - - -} - -
- @Html.DisplayNameFor(model => model.CategoryName) -
- @Html.DisplayFor(modelItem => item.CategoryName) - - @Html.ActionLink("Edit", "Edit", new { id=item.Id }) | - @Html.ActionLink("Delete", "Delete", new { id=item.Id }) -
+
+ +

Kategorie

+ + + + + + + + @foreach (var item in Model) + { + + + + + } +
+ @Html.DisplayNameFor(model => model.CategoryName) +
+ @Html.DisplayFor(modelItem => item.CategoryName) + + @Html.ActionLink("Edytuj", "Edit", new { id = item.Id }) | + @Html.ActionLink("Usuń", "Delete", new { id = item.Id }) +
+

+ @Html.ActionLink("Utwórz kategorie", "Create") +

+
\ No newline at end of file diff --git a/Trunk/Server/Forum/Forum/Views/Home/AddAnswer.cshtml b/Trunk/Server/Forum/Forum/Views/Home/AddAnswer.cshtml index 73b0be8..d9a4bbd 100644 --- a/Trunk/Server/Forum/Forum/Views/Home/AddAnswer.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Home/AddAnswer.cshtml @@ -22,7 +22,7 @@ } else { - @Html.EditorFor(model => model.Nick, new { htmlAttributes = new { @class = "form-control", placeholder = "Nazwa użytkownika" } }) + @Html.EditorFor(model => model.Nick, new { htmlAttributes = new { @class = "form-control", placeholder = "Nick" } }) } } diff --git a/Trunk/Server/Forum/Forum/Views/Home/AddQuestion.cshtml b/Trunk/Server/Forum/Forum/Views/Home/AddQuestion.cshtml index 2da2c89..57ad81c 100644 --- a/Trunk/Server/Forum/Forum/Views/Home/AddQuestion.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Home/AddQuestion.cshtml @@ -1,49 +1,49 @@ -@model Forum.ViewModels.AddQuestionViewModel -@{ - ViewBag.Title = "AddQuestion"; -} - - - - -@using (Html.BeginForm("AddQuestion", "Home", FormMethod.Post)) -{ - - -
-

Dodaj zapytanie

+@model Forum.ViewModels.AddQuestionViewModel +@{ + ViewBag.Title = "AddQuestion"; +} + + + + +@using (Html.BeginForm("AddQuestion", "Home", FormMethod.Post)) +{ + + +
+

Dodaj zapytanie

- - - -
- @Html.EditorFor(model => model.Title, new { htmlAttributes = new { @class = "form-control", placeholder="Temat" } }) -
- -
- - - @Html.TextAreaFor(model => model.Content, new { @class="form-control", @id = "exampleFormControlTextarea3", rows=7, placeholder="Treść zapytania" })
- -
-
-
- @Html.EditorFor(model => model.Nick, new { htmlAttributes = new { @class = "form-control", placeholder="Nazwa użytkownika" } }) -
- -
- @Html.EditorFor(model => model.Email, new { htmlAttributes = new { @class = "form-control", placeholder="Adres email" } }) -
-
- -
- - - @Html.DropDownListFor(x=>x.CategoryId,new SelectList(Model.Categories,"Id", "CategoryName"), new { @class = "form-control" }) - - -
-
-} - - + + + +
+ @Html.EditorFor(model => model.Title, new { htmlAttributes = new { @class = "form-control", placeholder="Temat" } }) +
+ +
+ + + @Html.TextAreaFor(model => model.Content, new { @class="form-control", @id = "exampleFormControlTextarea3", rows=7, placeholder="Treść zapytania" })
+ +
+
+
+ @Html.EditorFor(model => model.Nick, new { htmlAttributes = new { @class = "form-control", placeholder="Nick" } }) +
+ +
+ @Html.EditorFor(model => model.Email, new { htmlAttributes = new { @class = "form-control", placeholder="Adres email" } }) +
+
+ +
+ + + @Html.DropDownListFor(x=>x.CategoryId,new SelectList(Model.Categories,"Id", "CategoryName"), new { @class = "form-control" }) + + +
+
+} + + diff --git a/Trunk/Server/Forum/Forum/Views/Shared/_LoginPartial.cshtml b/Trunk/Server/Forum/Forum/Views/Shared/_LoginPartial.cshtml index 1447d22..8891048 100644 --- a/Trunk/Server/Forum/Forum/Views/Shared/_LoginPartial.cshtml +++ b/Trunk/Server/Forum/Forum/Views/Shared/_LoginPartial.cshtml @@ -7,16 +7,16 @@ } } else { } diff --git a/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml b/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml index 93b9e7b..b690454 100644 --- a/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml +++ b/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml @@ -9,7 +9,7 @@

Error: @ViewData["mailErr"]

} -@using (Html.BeginForm("Send", "Home", FormMethod.Post)) +@using (Html.BeginForm("Send", "Home", FormMethod.FPost)) {
@Html.LabelFor(i => i.Subject, new { @class = "label-form" })