lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-24 01:49:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed inconsistent layout of item edit sidebars.

Browse Source
This commit is contained in:
Daniel Stolt
2017-03-09 12:44:02 +01:00
parent 514e4fa0d7
commit 34a2c128d9
6 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Core/Navigation/Views/Menu.Edit.cshtml
View File

@@ -19,7 +19,6 @@
@if (Model.Sidebar != null) {
<div class="edit-item-sidebar group">
@Display(Model.Sidebar)
</div>
}
</div>

10
src/Orchard.Web/Core/Navigation/Views/MenuItem.Edit.cshtml
View File

@@ -3,12 +3,14 @@
var tabs = (IEnumerable<string>)CoreShapes.HarvestAndSortTabs(Model.Content);
Display.LocalNavigation(Tabs: tabs);
}
<div class="sections">
<div class="primary">
<div class="edit-item">
<div class="edit-item-primary">
@Display(Model.Content)
</div>
<div class="secondary">
@Display(Model.Sidebar)
<div class="edit-item-secondary group">
<div class="edit-item-sidebar group">
@Display(Model.Sidebar)
</div>
</div>
</div>

14
src/Orchard.Web/Core/Shapes/Views/Layout.cshtml
View File

@@ -1,13 +1,13 @@
@* Html.RegisterStyle("site.css"); *@
@{
@{
Model.Header.Add(Display.Header(), "5");
Model.Header.Add(Display.User(), "10");
Model.Header.Add(Model.Navigation, "15");
}
<div id="page">
<!-- should be a header wrapper (and what about a wrapper for the default layout?) -->
<!-- should be a header wrapper (and what about a wrapper for the default layout?) -->
<header>
@Display(Model.Header)
@Display(Model.Header)
</header>
<div id="main">
<div id="messages">
@@ -15,19 +15,19 @@
</div>
<div id="content-wrapper">
<div id="content">
@Display(Model.Content)
@Display(Model.Content)
</div>
</div>
<div id="sidebar-wrapper">
<div id="sidebar">
@Display(Model.Sidebar)
@Display(Model.Sidebar)
</div>
</div>
</div>
<!-- should really be a footer wrapper -->
<!-- should really be a footer wrapper -->
<div id="footer-wrapper">
<footer>
@Display(Model.Footer)
@Display(Model.Footer)
</footer>
</div>
</div>

10
src/Orchard.Web/Modules/Orchard.Users/Views/Items/Content-User.Edit.cshtml
View File

@@ -1,9 +1,11 @@
<div class="sections">
<div class="primary">
<div class="edit-item">
<div class="edit-item-primary">
@Display(Model.Content)
</div>
<div class="secondary">
@Display(Model.Sidebar)
<div class="edit-item-secondary group">
<div class="edit-item-sidebar group">
@Display(Model.Sidebar)
</div>
</div>
</div>
@if (!String.IsNullOrWhiteSpace(Request.QueryString["returnUrl"])) {

8
src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.Edit.cshtml
View File

@@ -1,8 +1,10 @@
<div class="edit-widget">
<div class="primary">
<div class="edit-item-primary">
@Display(Model.Content)
</div>
<div class="secondary edit-item-sidebar">
@Display(Model.Sidebar)
<div class="edit-item-secondary group">
<div class="edit-item-sidebar group">
@Display(Model.Sidebar)
</div>
</div>
</div>

4
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -1526,8 +1526,8 @@ html.dir-rtl {
margin-left:inherit;
margin-right:10px;
}
.dir-rtl fieldset.publish-button, fieldset.delete-button, .dir-rtl fieldset.save-button {
float:right;
.dir-rtl fieldset.publish-button, .dir-rtl fieldset.delete-button, .dir-rtl fieldset.save-button {
float: right;
}
.dir-rtl fieldset.save-button {
clear:right;