Skip to content
This repository has been archived by the owner on Oct 2, 2021. It is now read-only.

change categories header design and small modify statusLabels design #96

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

change categories header design and small modify statusLabels design #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
568d8ee
change categories header design and small modify statusLabels design
kmrul Oct 12, 2018
0c84d5d
change submit button padding design
kmrul Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions src/AssetManager.Web/Views/Categories/Create.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,18 @@
ViewData["Title"] = "Create";
}

<h2>Create Category</h2>

<div class="header-content">
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-8">
<p class="header-content-title">Create</p>
<p class="header-content-subtitle">Category</p>
</div>
<div class="col-md-6 col-sm-6 col-xs-4">
<a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
</div>
</div>
</div>

<hr />
<div class="row">
Expand Down Expand Up @@ -74,12 +85,14 @@
</div>
</div>

<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
<div class="col-md-offset-3 col-md-7 no-padding">
<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
</div>
</div>

</div>
Expand Down
119 changes: 67 additions & 52 deletions src/AssetManager.Web/Views/Categories/Details.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,72 @@
ViewData["Title"] = "Details";
}

<h2>Details</h2>

<div>
<h4>Category</h4>
<hr />
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.Name)
</dt>
<dd>
@Html.DisplayFor(model => model.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.EulaText)
</dt>
<dd>
@Html.DisplayFor(model => model.EulaText)
</dd>
<dt>
@Html.DisplayNameFor(model => model.DefaultEula)
</dt>
<dd>
@Html.DisplayFor(model => model.DefaultEula)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Type)
</dt>
<dd>
@Html.DisplayFor(model => model.Type)
</dd>
<dt>
@Html.DisplayNameFor(model => model.CheckInEmail)
</dt>
<dd>
@Html.DisplayFor(model => model.CheckInEmail)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Image)
</dt>
<dd>
@Html.DisplayFor(model => model.Image)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Id)
</dt>
<dd>
@Html.DisplayFor(model => model.Id)
</dd>
</dl>
<div class="header-content">
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-8">
<p class="header-content-title">Details Category</p>
</div>
<div class="col-md-6 col-sm-6 col-xs-4">
<a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
</div>
</div>
</div>

<div>
@Html.ActionLink("Edit", "Edit", new { /* id = Model.PrimaryKey */ }) |
<a asp-action="Index">Back to List</a>
</div>
<div class="col-md-8 col-md-offset-2">
<div class="box box-info">
<div class="box-header with-border">
<dl class="dl-horizontal">
<dt>
@Html.DisplayNameFor(model => model.Name)
</dt>
<dd>
@Html.DisplayFor(model => model.Name)
</dd>
<dt>
@Html.DisplayNameFor(model => model.EulaText)
</dt>
<dd>
@Html.DisplayFor(model => model.EulaText)
</dd>
<dt>
@Html.DisplayNameFor(model => model.DefaultEula)
</dt>
<dd>
@Html.DisplayFor(model => model.DefaultEula)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Type)
</dt>
<dd>
@Html.DisplayFor(model => model.Type)
</dd>
<dt>
@Html.DisplayNameFor(model => model.CheckInEmail)
</dt>
<dd>
@Html.DisplayFor(model => model.CheckInEmail)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Image)
</dt>
<dd>
@Html.DisplayFor(model => model.Image)
</dd>
<dt>
@Html.DisplayNameFor(model => model.Id)
</dt>
<dd>
@Html.DisplayFor(model => model.Id)
</dd>
</dl>
</div>

<div class="box-footer">
@Html.ActionLink("Edit", "Edit", new { id = Model.Id }) |
<a asp-action="Index">Back to List</a>
</div>

</div>
</div>
</div>
23 changes: 18 additions & 5 deletions src/AssetManager.Web/Views/Categories/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,16 @@
ViewData["Title"] = "Edit";
}

<h2>Edit Category</h2>
<div class="header-content">
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-8">
<p class="header-content-title">Edit Category</p>
</div>
<div class="col-md-6 col-sm-6 col-xs-4">
<a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
</div>
</div>
</div>

<hr />
<div class="row">
Expand Down Expand Up @@ -70,12 +79,16 @@
</div>
</div>

<div class="form-group">
<div class="col-sm-5"></div>
<div class="col-sm-5">
<button type="submit" class="btn btn-primary">Submit</button>
<div class="col-md-offset-3 col-md-7 no-padding">
<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
</div>
</div>

</div>

</form>
Expand Down
15 changes: 11 additions & 4 deletions src/AssetManager.Web/Views/Categories/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@
ViewData["Title"] = "Index";
}

<h2>Index</h2>
<div class="header-content">
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-8">
<p class="header-content-title">Category</p>
</div>
<div class="col-md-6 col-sm-6 col-xs-4">
<a asp-action="Create" class="pull-right btn btn-primary btn-create-new">Create New</a>
</div>
</div>
</div>


<p>
<a asp-action="Create">Create New</a>
</p>
<div class="row">
<div class="col-md-12">

Expand Down
14 changes: 8 additions & 6 deletions src/AssetManager.Web/Views/StatusLabels/Create.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@
</div>
</div>

<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
<div class="col-md-offset-3 col-md-7 no-padding">
<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
</div>
</div>

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/AssetManager.Web/Views/StatusLabels/Details.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p class="header-content-title">Details Status Label</p>
</div>
<div class="col-md-6 col-sm-6 col-xs-4">
<a asp-action="Index" class="pull-right btn btn-primary btn-create-new">Back</a>
<a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
</div>
</div>
</div>
Expand Down
16 changes: 9 additions & 7 deletions src/AssetManager.Web/Views/StatusLabels/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p class="header-content-title">Edit Status Label</p>
</div>
<div class="col-md-6 col-sm-6 col-xs-4">
<a asp-action="Index" class="pull-right btn btn-primary btn-create-new">Back</a>
<a class="pull-right btn btn-primary btn-create-new" asp-action="Index"><i class="fa fa-arrow-left icon-white"></i> Back</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -62,12 +62,14 @@
</div>
</div>

<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
<div class="col-md-offset-3 col-md-7 no-padding">
<div class="box-footer text-right">
<a class="btn btn-link text-left" asp-action="Index">Cancel</a>
<button type="submit" class="btn btn-success">
<i class="fa fa-check icon-white"></i>
Submit
</button>
</div>
</div>


Expand Down