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

#17202: Fixing incorrect stylesheet import. Adding null condition checker to avoid null point exception.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2011-01-31 15:24:39 -08:00
parent c2e5fc7b28
commit 4f922640e7
8 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj
View File

@@ -120,11 +120,6 @@
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Scripts\Web.config">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Styles\Web.config">
<SubType>Designer</SubType>

21
src/Orchard.Web/Modules/Orchard.Packaging/Scripts/Web.config
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<appSettings>
<add key="webpages:Enabled" value="false" />
</appSettings>
<system.web>
<httpHandlers>
<!-- iis6 - for any request in this location, return via managed static file handler -->
<add path="*" verb="*" type="System.Web.StaticFileHandler" />
</httpHandlers>
</system.web>
<system.webServer>
<handlers accessPolicy="Script,Read">
<!--
iis7 - for any request to a file exists on disk, return it via native http module.
accessPolicy 'Script' is to allow for a managed 404 page.
-->
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
</handlers>
</system.webServer>
</configuration>

2
src/Orchard.Web/Modules/Orchard.Packaging/Styles/orchard-packaging-admin.css
View File

@@ -46,4 +46,4 @@
.screenshotThumbnail .thumbnail {
width: 171px;
height: 128px;
}
}

3
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddSource.cshtml
View File

@@ -1,6 +1,5 @@
@model Orchard.Packaging.ViewModels.PackagingAddSourceViewModel
<h1>
@Html.TitleForPage(T("Add a Feed").ToString())</h1>
<h1>@Html.TitleForPage(T("Add a Feed").ToString())</h1>
@using ( Html.BeginFormAntiForgeryPost(Url.Action("AddSource")) ) {
@Html.ValidationSummary()

45
src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml
View File

@@ -1,31 +1,30 @@
@model Orchard.Packaging.ViewModels.PackagingSourcesViewModel
<h1>
@Html.TitleForPage(T("Gallery Feeds").ToString())</h1>
<h1>@Html.TitleForPage(T("Gallery Feeds").ToString())</h1>
<div class="manage">
@Html.ActionLink(T("Add Feed").Text, "AddSource", new { }, new { @class = "button primaryAction" })
</div>
<fieldset>
<table class="items" summary="@T("This is a table of the gallery feeds in your application")">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
</colgroup>
<thead>
<tr>
<th scope="col">@T("Title")</th>
<th scope="col">@T("Url")</th>
<th scope="col"></th>
</tr>
</thead>
@foreach ( var item in Model.Sources ) {
<fieldset>
<table class="items" summary="@T("This is a table of the gallery feeds in your application")">
<colgroup>
<col id="Col1" />
<col id="Col2" />
<col id="Col3" />
</colgroup>
<thead>
<tr>
<td>@item.FeedTitle</td>
<td>@Html.Link(item.FeedUrl, item.FeedUrl)</td>
<td>@Html.ActionLink(T("Remove").ToString(), "Remove", new { id = item.Id })</td>
<th scope="col">@T("Title")</th>
<th scope="col">@T("Url")</th>
<th scope="col"></th>
</tr>
}
</table>
</fieldset>
</thead>
@foreach ( var item in Model.Sources ) {
<tr>
<td>@item.FeedTitle</td>
<td>@Html.Link(item.FeedUrl, item.FeedUrl)</td>
<td>@Html.ActionLink(T("Remove").ToString(), "Remove", new { id = item.Id })</td>
</tr>
}
</table>
</fieldset>

4
src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml
View File

@@ -10,8 +10,8 @@
Script.Require("jQuery");
Script.Require("ShapesBase");
Script.Include("admin.js");
RegisterLink(new LinkEntry { Condition = "lte IE 8", Rel = "stylesheet", Type = "text/css", Href = Url.Content("../Styles/ie.css") }.AddAttribute("media", "screen, projection"));
RegisterLink(new LinkEntry { Condition = "lte IE 6", Rel = "stylesheet", Type = "text/css", Href = Url.Content("../Styles/ie6.css") }.AddAttribute("media", "screen, projection"));
RegisterLink(new LinkEntry { Condition = "lte IE 8", Rel = "stylesheet", Type = "text/css", Href = Url.Content("~/Themes/TheAdmin/Styles/ie.css") }.AddAttribute("media", "screen, projection"));
RegisterLink(new LinkEntry { Condition = "lte IE 6", Rel = "stylesheet", Type = "text/css", Href = Url.Content("~/Themes/TheAdmin/Styles/ie6.css") }.AddAttribute("media", "screen, projection"));
// these are just hacked together to fire existing partials... can change
Model.Header.Add(Display.Header());