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

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2010-10-11 12:20:01 -07:00
parent 44cf3c1cc2 62ddb9498a
commit 5468cab310
7 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CREDITS.txt
View File

@@ -75,6 +75,11 @@ Website: http://htmlagilitypack.codeplex.com/
Copyright: Copyright (c) 2003-20010 Simon Mourier
License: MS-PL
html5shim
-----
Website: http://code.google.com/p/html5shim/
License: MIT
IESI Collections
-----
Website: http://www.codeproject.com/KB/recipes/sets.aspx

3
lib/html5shim/html5.js Normal file
View File

@@ -0,0 +1,3 @@
// html5shiv MIT @rem remysharp.com/html5-enabling-script
// iepp v1.5.1 MIT @jon_neal iecss.com/print-protector
/*@cc_on(function(p,e){var q=e.createElement("div");q.innerHTML="<z>i</z>";q.childNodes.length!==1&&function(){function r(a,b){if(g[a])g[a].styleSheet.cssText+=b;else{var c=s[l],d=e[j]("style");d.media=a;c.insertBefore(d,c[l]);g[a]=d;r(a,b)}}function t(a,b){for(var c=new RegExp("\\b("+m+")\\b(?!.*[;}])","gi"),d=function(k){return".iepp_"+k},h=-1;++h<a.length;){b=a[h].media||b;t(a[h].imports,b);r(b,a[h].cssText.replace(c,d))}}for(var s=e.documentElement,i=e.createDocumentFragment(),g={},m="abbr article aside audio canvas details figcaption figure footer header hgroup mark meter nav output progress section summary time video".replace(/ /g, '|'),n=m.split("|"),f=[],o=-1,l="firstChild",j="createElement";++o<n.length;){e[j](n[o]);i[j](n[o])}i=i.appendChild(e[j]("div"));p.attachEvent("onbeforeprint",function(){for(var a,b=e.getElementsByTagName("*"),c,d,h=new RegExp("^"+m+"$","i"),k=-1;++k<b.length;)if((a=b[k])&&(d=a.nodeName.match(h))){c=new RegExp("^\\s*<"+d+"(.*)\\/"+d+">\\s*$","i");i.innerHTML=a.outerHTML.replace(/\r|\n/g," ").replace(c,a.currentStyle.display=="block"?"<div$1/div>":"<span$1/span>");c=i.childNodes[0];c.className+=" iepp_"+d;c=f[f.length]=[a,c];a.parentNode.replaceChild(c[1],c[0])}t(e.styleSheets,"all")});p.attachEvent("onafterprint",function(){for(var a=-1,b;++a<f.length;)f[a][1].parentNode.replaceChild(f[a][0],f[a][1]);for(b in g)s[l].removeChild(g[b]);g={};f=[]})}()})(this,document);@*/

1
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -309,6 +309,7 @@
<Content Include="Settings\Views\DisplayTemplates\RemovableCulture.ascx" />
<Content Include="Shapes\Module.txt" />
<Content Include="Shapes\Scripts\base.js" />
<Content Include="Shapes\Scripts\html5.js" />
<Content Include="Shapes\Scripts\jquery.switchable.js" />
<Content Include="Shapes\Styles\Images\detail-view-on.gif" />
<Content Include="Shapes\Styles\Images\detail-view.gif" />

3
src/Orchard.Web/Core/Shapes/Scripts/html5.js Normal file
View File

@@ -0,0 +1,3 @@
// html5shiv MIT @rem remysharp.com/html5-enabling-script
// iepp v1.5.1 MIT @jon_neal iecss.com/print-protector
/*@cc_on(function(p,e){var q=e.createElement("div");q.innerHTML="&lt;z&gt;i&lt;/z&gt;";q.childNodes.length!==1&amp;&amp;function(){function r(a,b){if(g[a])g[a].styleSheet.cssText+=b;else{var c=s[l],d=e[j]("style");d.media=a;c.insertBefore(d,c[l]);g[a]=d;r(a,b)}}function t(a,b){for(var c=new RegExp("\\b("+m+")\\b(?!.*[;}])","gi"),d=function(k){return".iepp_"+k},h=-1;++h&lt;a.length;){b=a[h].media||b;t(a[h].imports,b);r(b,a[h].cssText.replace(c,d))}}for(var s=e.documentElement,i=e.createDocumentFragment(),g={},m="abbr article aside audio canvas details figcaption figure footer header hgroup mark meter nav output progress section summary time video".replace(/ /g, '|'),n=m.split("|"),f=[],o=-1,l="firstChild",j="createElement";++o&lt;n.length;){e[j](n[o]);i[j](n[o])}i=i.appendChild(e[j]("div"));p.attachEvent("onbeforeprint",function(){for(var a,b=e.getElementsByTagName("*"),c,d,h=new RegExp("^"+m+"$","i"),k=-1;++k&lt;b.length;)if((a=b[k])&amp;&amp;(d=a.nodeName.match(h))){c=new RegExp("^\\s*&lt;"+d+"(.*)\\/"+d+"&gt;\\s*$","i");i.innerHTML=a.outerHTML.replace(/\r|\n/g," ").replace(c,a.currentStyle.display=="block"?"&lt;div$1/div&gt;":"&lt;span$1/span&gt;");c=i.childNodes[0];c.className+=" iepp_"+d;c=f[f.length]=[a,c];a.parentNode.replaceChild(c[1],c[0])}t(e.styleSheets,"all")});p.attachEvent("onafterprint",function(){for(var a=-1,b;++a&lt;f.length;)f[a][1].parentNode.replaceChild(f[a][0],f[a][1]);for(b in g)s[l].removeChild(g[b]);g={};f=[]})}()})(this,document);@*/

17
src/Orchard.Web/Core/Shapes/Views/Document.cshtml
View File

@@ -2,22 +2,19 @@
@using Orchard.UI.Resources;
@{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
//todo: (heskew) get conditions (as in conditional comments) hooked up for script tags too
Script.Include("html5.js").AtLocation(ResourceLocation.Head);
}
<!DOCTYPE html>
<html lang="en" class="static @Html.ClassForPage()">
<head>
<meta charset="utf-8" />
<title>@Html.Title(WorkContext.CurrentSite.SiteName)</title>
@{
//todo: (heskew) have resource modules that can be leaned on (like a jQuery module that knows about various CDNs and jQuery's version and min naming schemes)
//todo: (heskew) this is an interim solution to inlude jQuery in every page and still allow that to be overriden in some theme by it containing a headScripts partial
}
@* Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model); *@
@* Html.Zone("head", ":metas :styles :scripts"); %> *@
@Display(Model.Head)
<meta charset="utf-8" />
<title>@Model.Title</title>
@Display(Model.Head)
<script>(function(d){d.className="dyn"+d.className.substring(6,d.className.length);})(document.documentElement);</script>
</head>
<body>
<body>
@* Layout (template) is in the Body zone @ the default position (nothing, zero, zilch) *@
@Display(Model.Body)
@Display(Model.Tail)
</body>

2
src/Orchard.Web/Orchard.Web.csproj
View File

@@ -147,7 +147,7 @@
<None Include="Themes\TheThemeMachine\Views\Featured.cshtml">
<SubType>Designer</SubType>
</None>
<None Include="Themes\TheThemeMachine\Views\Document.cshtml" />
<None Include="Themes\TheThemeMachine\Views\_Document.cshtml" />
<None Include="Themes\TheThemeMachine\Views\Content.cshtml" />
<Content Include="Web.config">
<SubType>Designer</SubType>

2
src/Orchard.Web/Themes/TheThemeMachine/Views/Document.cshtml → src/Orchard.Web/Themes/TheThemeMachine/Views/_Document.cshtml
View File

@@ -2,6 +2,8 @@
@using Orchard.UI.Resources;
@{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
//todo: (heskew) get conditions (as in conditional comments) hooked up for script tags too
Script.Include("html5.js").AtLocation(ResourceLocation.Head);
}
<!DOCTYPE html>
<html lang="en" class="static @Html.ClassForPage()">