Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Admin Tree : fine tuning styling #2919

Merged
merged 2 commits into from
Dec 21, 2018
Merged

Admin Tree : fine tuning styling #2919

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
f6ecaf6
Removing list group and fine tuning styling with BS styles
Skrypt Dec 21, 2018
537c94c
Removing unnecessary wrapping div
Skrypt Dec 21, 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
4 changes: 0 additions & 4 deletions src/OrchardCore.Modules/OrchardCore.AdminTrees/Assets/scss/admin-trees.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ html, body, .ta-wrapper {
cursor: move;
}

.concrete-link {
min-height: 30px;
}

.card-columns {
column-count: 1;

Expand Down
2 changes: 1 addition & 1 deletion ...rdCore.Modules/OrchardCore.AdminTrees/Views/Items/LinkAdminNode.Fields.TreeSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@model ShapeViewModel<LinkAdminNode>

<div class="@(Model.Value.Enabled ? "" : "disabled") concrete-link">
<div class="@(Model.Value.Enabled ? "" : "disabled")">
<span>@Model.Value.LinkText <code>@Model.Value.LinkUrl</code> <span class="text-muted">- @T["Link"]</span></span>
</div>
2 changes: 1 addition & 1 deletion ...Modules/OrchardCore.AdminTrees/Views/Items/PlaceholderAdminNode.Fields.TreeSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@model ShapeViewModel<PlaceholderAdminNode>

<div class="@(Model.Value.Enabled ? "" : "disabled") concrete-link">
<div class="@(Model.Value.Enabled ? "" : "disabled")">
<span>@Model.Value.LinkText <span class="text-muted">- @T["Placeholder"]</span></span>
</div>
68 changes: 31 additions & 37 deletions src/OrchardCore.Modules/OrchardCore.AdminTrees/Views/MenuItem.TreeSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,53 +22,47 @@


<li class="menu-item display-summary" id="[email protected]" data-index="@Model.Index" data-treenode-id="@Model.MenuItem.UniqueId">
<div class="menu-item menu-item-title list-group-item @disabledClass" title="@Model.MenuItem.UniqueId">
<div class="menu-item menu-item-title border rounded p-2 pl-3 mb-1 d-flex flex-row justify-content-between align-items-center @disabledClass" title="@Model.MenuItem.UniqueId">
@if (Model.Content.Items.Count < 1)
{
<div class="properties">
<div class="related">
<a asp-action="Delete"
asp-controller="Node"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="btn btn-danger btn-sm"
itemprop="RemoveUrl UnsafeUrl">@T["Delete"]</a>
</div>
<div class="related">
<a asp-action="Delete"
asp-controller="Node"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="btn btn-danger btn-sm"
itemprop="RemoveUrl UnsafeUrl">@T["Delete"]</a>
</div>
<span class="text-warning">@T["Can't show the item of type: {0}. Maybe a required module has been disabled?", menuType]</span>
}
else
{
<div class="properties">
<div class="related">
<a asp-action="Edit"
asp-controller="Node"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="btn btn-primary btn-sm">@T["Edit"]</a>
@await DisplayAsync(Model.Content)
<div class="related">
<a asp-action="Edit"
asp-controller="Node"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="btn btn-primary btn-sm">@T["Edit"]</a>

<div class="btn-group btn-group-sm">
<a asp-action="Delete"
asp-controller="Node"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="btn btn-danger" itemprop="RemoveUrl UnsafeUrl">@T["Delete"]</a>
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-reference="parent" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">@T["Toggle Dropdown"]</span>
</button>
<div class="dropdown-menu">
<a asp-controller="Node"
asp-action="Toggle"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="dropdown-item btn-sm" itemprop="UnsafeUrl">@toggleButtonText</a>
</div>
<div class="btn-group btn-group-sm">
<a asp-action="Delete"
asp-controller="Node"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="btn btn-danger" itemprop="RemoveUrl UnsafeUrl">@T["Delete"]</a>
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-reference="parent" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">@T["Toggle Dropdown"]</span>
</button>
<div class="dropdown-menu">
<a asp-controller="Node"
asp-action="Toggle"
asp-route-id="@Model.AdminTreeId"
asp-route-treeNodeId="@Model.MenuItem.UniqueId"
class="dropdown-item btn-sm" itemprop="UnsafeUrl">@toggleButtonText</a>
</div>
</div>


</div>
@await DisplayAsync(Model.Content)
</div>
}

</div>
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminTrees/Views/Node/List.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{
var updater = ModelUpdaterAccessor.ModelUpdater;

<ol id="menu" class="list-group" data-treenode-id="content-preset">
<ol id="menu" data-treenode-id="content-preset">
@foreach (var menuItem in Model.AdminTree.MenuItems)
{
if (menuItem != null)
Expand Down
30 changes: 14 additions & 16 deletions src/OrchardCore.Modules/OrchardCore.AdminTrees/Views/Tree/List.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,24 @@
@foreach (var entry in Model.AdminTrees)
{
<li class="list-group-item @(entry.AdminTree.Enabled ? "" : "disabled-tree")">
<div class="properties">
<div class="related">
<a asp-controller="Node" asp-action="List" asp-route-id="@entry.AdminTree.Id" class="btn btn-secondary btn-sm">@T["Edit Nodes"]</a>
<a asp-action="Edit" asp-route-id="@entry.AdminTree.Id" class="btn btn-primary btn-sm">@T["Edit"]</a>
<div class="btn-group btn-group-sm">
<a asp-action="Delete"
<div class="related">
<a asp-controller="Node" asp-action="List" asp-route-id="@entry.AdminTree.Id" class="btn btn-secondary btn-sm">@T["Edit Nodes"]</a>
<a asp-action="Edit" asp-route-id="@entry.AdminTree.Id" class="btn btn-primary btn-sm">@T["Edit"]</a>
<div class="btn-group btn-group-sm">
<a asp-action="Delete"
asp-route-id="@entry.AdminTree.Id"
class="btn btn-danger" itemprop="RemoveUrl UnsafeUrl">@T["Delete"]</a>
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-reference="parent" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">@T["Toggle Dropdown"]</span>
</button>
<div class="dropdown-menu">
<a asp-action="Toggle"
asp-route-id="@entry.AdminTree.Id"
class="btn btn-danger" itemprop="RemoveUrl UnsafeUrl">@T["Delete"]</a>
<button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-reference="parent" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">@T["Toggle Dropdown"]</span>
</button>
<div class="dropdown-menu">
<a asp-action="Toggle"
asp-route-id="@entry.AdminTree.Id"
class="dropdown-item btn-sm" itemprop="UnsafeUrl">@(entry.AdminTree.Enabled ? T["Disable"] : T["Enable"])</a>
</div>
class="dropdown-item btn-sm" itemprop="UnsafeUrl">@(entry.AdminTree.Enabled ? T["Disable"] : T["Enable"])</a>
</div>
</div>
<a asp-controller="Node" asp-action="List" asp-route-id="@entry.AdminTree.Id" class="tree-name-link">@entry.AdminTree.Name</a>
</div>
<a asp-controller="Node" asp-action="List" asp-route-id="@entry.AdminTree.Id" class="tree-name-link">@entry.AdminTree.Name</a>
</li>
}
</ul>
Expand Down
3 changes: 0 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.AdminTrees/wwwroot/Styles/admin-trees.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ html, body, .ta-wrapper {
list-style: none;
cursor: move; }

.concrete-link {
min-height: 30px; }

.card-columns {
column-count: 1; }
.card-columns .card.admin-node-thumbnail .card-body {
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.AdminTrees/wwwroot/Styles/admin-trees.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ....Modules/OrchardCore.Contents/Views/Items/ContentTypesAdminNode.Fields.TreeSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
}

<div class="@(Model.Value.Enabled ? "" : "disabled") concrete-link">
<div class="@(Model.Value.Enabled ? "" : "disabled")">

@if (Model.Value.ShowAll)
{
Expand Down
2 changes: 1 addition & 1 deletion ...rchardCore.Modules/OrchardCore.Lists/Views/Items/ListsAdminNode.Fields.TreeSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var displayName = ContentDefinitionManager.GetTypeDefinition(Model.Value.ContentType);
}

<div class="@(Model.Value.Enabled ? "" : "disabled") concrete-link">
<div class="@(Model.Value.Enabled ? "" : "disabled")">
<span>@displayName</span>
<span class="text-muted">- @T["Lists"]</span>
</div>
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Setup/wwwroot/Scripts/setup.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...rdCore.Modules/OrchardCore.Workflows/wwwroot/Scripts/orchard.http-request-event-editor.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Workflows/wwwroot/Scripts/orchard.workflows-viewer.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading