lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay 2010-07-21 10:11:11 -07:00
commit 5dea6c7b73
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.ascx
View File

@ -1 +1,9 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel>" %>
<%
Html.RegisterStyle("base.css");
if (Model.Localizations.Count() > 0) { %>
<div class="content-localization">
<%--//todo: need this info in the view model--%>
<div class="content-localizations"><%:Html.UnorderedList(Model.Localizations, (c, i) => Html.ItemDisplayLink(c.Culture.Culture, c), "localizations") %></div>
</div><%
} %>

6
src/Orchard.Web/Themes/TheAdmin/Styles/ie.css
View File

@ -1,7 +1,3 @@
.contentItems {
/* need an alternative to:
box-shadow:inset 0 1px 2px #878686;
-moz-box-shadow:inset 0 1px 3px #878686;
-webkit-box-shadow:inset 0 1px 2px #878686;
*/
border:1px solid #878686;
}

2
src/Orchard.Web/Themes/TheAdmin/Views/Layout.ascx
View File

@ -2,7 +2,7 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels"%><%
Html.RegisterStyle("site.css", "1");
Html.RegisterStyle("ie.css", "1").WithCondition("if (lte IE 8)").ForMedia("screen, projection");
Html.RegisterStyle("ie6.css", "1").WithCondition("if lte IE 6").ForMedia("screen, projection");
Html.RegisterStyle("ie6.css", "1").WithCondition("if (lte IE 6)").ForMedia("screen, projection");
Html.RegisterFootScript("admin.js", "1");
Model.Zones.AddRenderPartial("header", "Header", Model);
Model.Zones.AddRenderPartial("header:after", "User", Model); // todo: (heskew) should be a user display or widget