s434799/Forum-Inzynieria1
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Styling manage category

Browse Source
This commit is contained in:
Damian Lasecki 2018-12-19 19:19:48 +01:00
parent df046dc2a0
commit aa4ae61818
11 changed files with 141 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Trunk/Server/Forum/Forum/Content/Site.css
View File

@ -297,8 +297,10 @@ textarea {
border-radius: 1rem;
}
.wrapper {
padding: 3rem;
background-color: #f2f2f2;
}

2
Trunk/Server/Forum/Forum/Controllers/AccountController.cs
View File

@ -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);
}
}

6
Trunk/Server/Forum/Forum/Models/AccountViewModels.cs
View File

@ -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; }
}

13
Trunk/Server/Forum/Forum/Views/Account/Login.cshtml
View File

@ -1,7 +1,7 @@
@using Forum.Models
@model LoginViewModel
@{
ViewBag.Title = "Log in";
ViewBag.Title = "Zaloguj się";
}
<h2>@ViewBag.Title.</h2>
@ -11,7 +11,6 @@
@using (Html.BeginForm("Login", "Account", new { ReturnUrl = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
{
@Html.AntiForgeryToken()
<h4>Use a local account to log in.</h4>
<hr />
@Html.ValidationSummary(true, "", new { @class = "text-danger" })
<div class="form-group">
@ -38,11 +37,11 @@
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<input type="submit" value="Log in" class="btn btn-default" />
<input type="submit" value="Zaloguj się" class="btn btn-default" />
</div>
</div>
<p>
@Html.ActionLink("Register as a new user", "Register")
@Html.ActionLink("Utwórz nowego użytkownika", "Register")
</p>
@* Enable this once you have account confirmation enabled for password reset functionality
<p>
@ -51,11 +50,7 @@
}
</section>
</div>
<div class="col-md-4">
<section id="socialLoginForm">
@Html.Partial("_ExternalLoginsListPartial", new ExternalLoginListViewModel { ReturnUrl = ViewBag.ReturnUrl })
</section>
</div>
</div>
@section Scripts {

5
Trunk/Server/Forum/Forum/Views/Account/Register.cshtml
View File

@ -1,6 +1,6 @@
@model Forum.Models.RegisterViewModel
@{
ViewBag.Title = "Register";
ViewBag.Title = "Zarejestruj się";
}
<h2>@ViewBag.Title.</h2>
@ -8,7 +8,6 @@
@using (Html.BeginForm("Register", "Account", FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
{
@Html.AntiForgeryToken()
<h4>Create a new account.</h4>
<hr />
@Html.ValidationSummary("", new { @class = "text-danger" })
<div class="form-group">
@ -37,7 +36,7 @@
</div>
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<input type="submit" class="btn btn-default" value="Register" />
<input type="submit" class="btn btn-default" value="Zarejestruj" />
</div>
</div>
}

12
Trunk/Server/Forum/Forum/Views/Categories/Create.cshtml
View File

@ -4,7 +4,11 @@
ViewBag.Title = "Create";
}
<h2>Create</h2>
<div class="single-category-wrapper">
<h2>Utwórz kategorie</h2>
<hr style="border-top: 1px solid #d3d3d3; margin-bottom: 3rem;" />
@using (Html.BeginForm())
@ -12,7 +16,6 @@
@Html.AntiForgeryToken()
<div class="form-horizontal">
<h4>Category</h4>
<hr />
@Html.ValidationSummary(true, "", new { @class = "text-danger" })
<div class="form-group">
@ -25,16 +28,17 @@
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<input type="submit" value="Create" class="btn btn-default" />
<input type="submit" value="Utwórz kategorie" class="answer-list__add-btn" style="height:4rem; width:17rem" />
</div>
</div>
</div>
}
<div>
@Html.ActionLink("Back to List", "Index")
@Html.ActionLink("Powrót", "Index")
</div>
</div>
@section Scripts {
@Scripts.Render("~/bundles/jqueryval")
}

21
Trunk/Server/Forum/Forum/Views/Categories/Index.cshtml
View File

@ -4,11 +4,11 @@
ViewBag.Title = "Index";
}
<h2>Index</h2>
<div class="single-category-wrapper">
<h2 style="margin-bottom:3rem;">Kategorie</h2>
<p>
@Html.ActionLink("Create New", "Create")
</p>
<table class="table">
<tr>
<th>
@ -16,17 +16,20 @@
</th>
<th></th>
</tr>
@foreach (var item in Model) {
@foreach (var item in Model)
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.CategoryName)
</td>
<td>
@Html.ActionLink("Edit", "Edit", new { id=item.Id }) |
@Html.ActionLink("Delete", "Delete", new { id=item.Id })
@Html.ActionLink("Edytuj", "Edit", new { id = item.Id }) |
@Html.ActionLink("Usuń", "Delete", new { id = item.Id })
</td>
</tr>
}
</table>
<p class="answer-list__add-btn">
@Html.ActionLink("Utwórz kategorie", "Create")
</p>
</div>

2
Trunk/Server/Forum/Forum/Views/Home/AddAnswer.cshtml
View File

@ -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" } })
}
}
</div>

2
Trunk/Server/Forum/Forum/Views/Home/AddQuestion.cshtml
View File

@ -28,7 +28,7 @@
</div>
<div class="form-personal-data">
<div class="form-group">
@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" } })
</div>
<div class="form-group">

8
Trunk/Server/Forum/Forum/Views/Shared/_LoginPartial.cshtml
View File

@ -7,16 +7,16 @@
<ul class="nav navbar-nav navbar-right">
<li>
@Html.ActionLink("Hello " + User.Identity.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
@Html.ActionLink("Witaj " + User.Identity.GetUserName() + "!", "Index", "Manage", routeValues: null, htmlAttributes: new { title = "Manage" })
</li>
<li>@Html.ActionLink("Register", "Register", "Account", routeValues: null, htmlAttributes: new { id = "registerLink" })</li>
<li><a href="javascript:document.getElementById('logoutForm').submit()">Log off</a></li>
<li>@Html.ActionLink("Zarejestruj się", "Register", "Account", routeValues: null, htmlAttributes: new { id = "registerLink" })</li>
<li><a href="javascript:document.getElementById('logoutForm').submit()">Wyloguj się</a></li>
</ul>
}
}
else
{
<ul class="nav navbar-nav navbar-right">
<li>@Html.ActionLink("Log in", "Login", "Account", routeValues: null, htmlAttributes: new {id = "loginLink"})</li>
<li>@Html.ActionLink("Zaloguj się", "Login", "Account", routeValues: null, htmlAttributes: new {id = "loginLink"})</li>
</ul>
}

2
Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml
View File

@ -9,7 +9,7 @@
<h3>Error: @ViewData["mailErr"]</h3>
}
@using (Html.BeginForm("Send", "Home", FormMethod.Post))
@using (Html.BeginForm("Send", "Home", FormMethod.FPost))
{
<div class="form-group">
@Html.LabelFor(i => i.Subject, new { @class = "label-form" })