lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Michael Dorian Bach
2011-04-04 20:28:46 -07:00
parent ba491e6678 83084c15b4
commit a61304c779
4 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css
View File

@@ -1,31 +1,23 @@
#currentTheme .themePreviewImage {
/*button[title="Disable"], button[title="Enable"]
{
display:none;
}*/
#currentTheme .themePreviewImage {
float: left;
margin-right: 20px;
}
#installedBar {
clear: both;
border-bottom-width: thin;
border-bottom-style: solid;
border-bottom-color: #E4E5E6;
height: 50px;
border-bottom:1px solid #E4E5E6;
height: 36px;
margin: 10px 0 10px 0;
}
#otherActionsBar {
clear: both;
border-top-width: thin;
border-top-style: solid;
border-top-color: #E4E5E6;
margin: 10px 0 0;
padding: 10px 0 0;
}
#installedBar h3 {
float: left;
padding-top: 10px;
}
#installedBar p a {
color: #3A822E;
#installedBar a {
float: right;
padding-top: 20px;
padding-top: 10px;
}
.templates li {
margin:.8em;

9
src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml
View File

@@ -18,8 +18,11 @@
@Display.ThemeEntry_Current(ContentPart: Model.CurrentTheme)
}
<div id="installedBar">
<div id="installedBar" class="group">
<h3>@T("Available")</h3>
@if (Model.InstallThemes) {
@Html.ActionLink(T("Install a theme from my computer").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)
}
</div>
@if (Model.Themes == null || Model.Themes.Count() <= 0) {
@@ -30,8 +33,4 @@
<li>@Display.ThemeEntry(ContentPart: themeEntry)</li>
}
</ul>
}
@if (Model.InstallThemes) {
<p id="otherActionsBar">@Html.ActionLink(T("Upload a theme").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)</p>
}

4
src/Orchard.Web/Modules/Orchard.Themes/Views/ThemeEntry.cshtml
View File

@@ -38,13 +38,13 @@
@if (Model.ContentPart.Enabled) {
using (Html.BeginFormAntiForgeryPost(Url.Action("Disable"), FormMethod.Post, new { @class = "inline link" })) {
@Html.Hidden("themeName", (string)Model.ContentPart.Descriptor.Id)
<button type="submit" title="Disable">@T("Disable")</button>
<button type="submit" class="disable" title="Disable">@T("Disable")</button>
}
}
else {
using (Html.BeginFormAntiForgeryPost(Url.Action("Enable"), FormMethod.Post, new { @class = "inline link" })) {
@Html.Hidden("themeName", (string)Model.ContentPart.Descriptor.Id)
<button type="submit" title="Enable">@T("Enable")</button>
<button type="submit" class="enable" title="Enable">@T("Enable")</button>
}
}

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

@@ -158,8 +158,8 @@ hr {border:0; height:1px; color:#e4e5e6; background-color:#e4e5e6;}
min-height:100%;
}
#layout-main {
display:inline;
overflow:auto;
/*display:inline;
overflow:auto;*/
float:right;
margin-left:-240px;
width:100%;
@@ -168,6 +168,7 @@ hr {border:0; height:1px; color:#e4e5e6; background-color:#e4e5e6;}
#main {
margin-left:260px;
margin-right:20px;
clear:both;
}
#menu {
background:#323232;
@@ -382,7 +383,7 @@ ul.menuItems {margin:6px 0 0 0;}
#content {
background-color: #fff;
padding: 16px 24px;
margin:8px 0 0 0;
margin-top:8px;
border: 1px solid #e4e5e6;
clear:both;