lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Andre Rodrigues
2011-04-06 13:53:20 -07:00
parent 8dae33f27c a9b7aac641
commit a0d1c56905
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Themes.cshtml
View File

@@ -52,9 +52,18 @@
}
}
<div class="summary">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
@foreach (string notification in item.Notifications) {
<h5>@Html.Raw(notification)</h5>
}
</div>
}
</div>
<div class="@extensionClass">
<div class="extensionDetails column">
<div class="extensionName">
<div class="extensionName @if (item.Installed) {<text>installed</text>}">
@if (!string.IsNullOrWhiteSpace(item.GalleryDetailsUrl)) {
<a href="@item.GalleryDetailsUrl">
<h2>@item.Title<span> - @T("Version: {0}", item.Version)</span></h2>
@@ -70,13 +79,6 @@
</div>
<div class="properties">
@if (item.Notifications != null && item.Notifications.Count > 0) {
<div class="notifications">
@foreach (string notification in item.Notifications) {
<h5>@Html.Raw(notification)</h5>
}
</div>
}
<p>@(item.Description == null ? T("(No description").Text : item.Description)</p>
<ul class="pageStatus group">
<li>@T("Last Updated: {0}", item.LastUpdated)</li>

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

@@ -21,7 +21,7 @@
<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)
@Html.ActionLink(T("Install a theme from your computer").ToString(), "AddTheme", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null)
}
</div>

4
src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js
View File

@@ -9,5 +9,7 @@
theme_advanced_buttons2: "",
theme_advanced_buttons3: "",
convert_urls: false,
valid_elements: "*[*]"
valid_elements: "*[*]",
// shouldn't be needed due to the valid_elements setting, but TinyMCE would strip script.src without it.
extended_valid_elements: "script[type|defer|src|language]"
});

8
src/Orchard.Web/Themes/TheAdmin/Styles/ie7.css
View File

@@ -2,7 +2,7 @@
border:1px solid #D3D2D2;
}
.bulk-actions {display:block;}
/*.bulk-actions {display:block;}*/
button, .button, .button:link, .button:visited {
background:#6a7b42;
@@ -37,5 +37,7 @@ zoom:1;
padding-top: 0;
}
/*modules*/
.iconThumbnail .extensionThumbnail {right:0px;}
/*packaging module*/
.iconThumbnail .extensionThumbnail {right:0px;}
.orchard-packaging .screenshotThumbnail .extensionThumbnail.column {position:static;}

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

@@ -359,8 +359,8 @@ ul.menuItems {margin:6px 0 0 0;}
display: inline;
font-size:15px;
line-height:32px;
}
.localmenu li {
z-index:10;
position:relative;
margin:0 2px;
padding: 8px 18px 7px 18px;
}