diff --git a/src/Orchard.Web/Core/Contents/Placement.info b/src/Orchard.Web/Core/Contents/Placement.info index 3d99c94b2..4c17d18b6 100644 --- a/src/Orchard.Web/Core/Contents/Placement.info +++ b/src/Orchard.Web/Core/Contents/Placement.info @@ -6,7 +6,7 @@ --> - + diff --git a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml index 08a086a2a..534856f87 100644 --- a/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.Edit.cshtml @@ -6,14 +6,14 @@ } -
+
@if (Model.Actions != null) {
@Display(Model.Actions)
} @if (Model.Sidebar != null) { -
+
@Display(Model.Sidebar)
} diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info index e1671d67b..540beb062 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info @@ -7,7 +7,7 @@ --> - + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml index 1ac58b8ee..d0678e18b 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml @@ -7,7 +7,7 @@ Style.Require("jQueryUI_DatePicker"); }
- @T("Publish Settings") + @T("Publish") @Html.EditorFor(m => m.ScheduledPublishDate) diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 404bf17c2..18d0f2240 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -454,7 +454,7 @@ span.message { ***************************************************************/ form { margin: 0; padding: 0; } -legend { font-size: 1.231em; font-weight: normal; margin: 0 0 1.2em 0; border:none; } +legend { font-size: 1.231em; font-weight: normal; border:none; } fieldset { padding:0em; margin: 0 0 0em 0; border: 0px solid #dbdbdb; } label { font-weight: normal; display:block; padding: 0 0 0.3em 0; } label.forcheckbox { margin:0 0 0 .4em; display:inline; } @@ -591,7 +591,6 @@ input[type="submit"], input[type="reset"], input[type="button"], button, .button background:#F5F5F5; border:1px solid #999; cursor:pointer; - /*min-width:80px;*/ padding: 0 12px 2px 12px; text-align:center; @@ -877,6 +876,33 @@ table .button { margin:0 0 -.4em; } /* Core Contents and Orchard.PublishLater */ + + +.edit-item-sidebar +{ + border:1px solid #d3d3d3; + padding:6px; + + /*CSS3 properties*/ + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(#f7f7f7), to(#f5f5f5)); + background: -moz-linear-gradient(top, #f7f7f7, #f5f5f5); + /*box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.2); + -webkit-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.2); + -moz-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.2);*/ + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; +} + +.edit-item-sidebar fieldset { + margin:0; + padding:0; +} + +fieldset.publish-button { + float:left; +} fieldset.save-button { clear:none; float:left; @@ -886,10 +912,9 @@ fieldset.save-button { fieldset.publish-later-datetime { clear:none; float:left; - min-width:13.6em; - padding-left:6px; - padding-right:0; - width:50%; + margin: 0 0 0 12px; + padding:0 0 0 12px; + border-left:1px solid #ccc; } fieldset.publish-later-datetime legend { display:none;