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

Replace tabs for spaces in views, css and cs files.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2010-11-24 16:10:08 -08:00
parent b84a4f74e8
commit d94666aac0
58 changed files with 676 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml
View File

@@ -2,8 +2,8 @@
also, doing this here, inline, until we have a pluggable processing model (both in and out) also, doing this here, inline, until we have a pluggable processing model (both in and out)
also, ...this is ugly *@ also, ...this is ugly *@
@{ @{
Orchard.ContentManagement.ContentItem contentItem = Model.ContentPart.ContentItem; Orchard.ContentManagement.ContentItem contentItem = Model.ContentPart.ContentItem;
string bodyHtml = Model.Html.ToString(); string bodyHtml = Model.Html.ToString();
var body = new HtmlString(Html.Excerpt(bodyHtml, 200).ToString().Replace(Environment.NewLine, "</p>" + Environment.NewLine + "<p>")); var body = new HtmlString(Html.Excerpt(bodyHtml, 200).ToString().Replace(Environment.NewLine, "</p>" + Environment.NewLine + "<p>"));
} }
<p>@body @Html.ItemDisplayLink(T("more").ToString(), contentItem)</p> <p>@body @Html.ItemDisplayLink(T("more").ToString(), contentItem)</p>

2
src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml
View File

@@ -1,6 +1,6 @@
@{ @{
var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName; var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName;
var pageTitle = T("Create {0}", typeDisplayName); var pageTitle = T("Create {0}", typeDisplayName);
} }
<h1>@Html.TitleForPage((string)pageTitle.Text)</h1> <h1>@Html.TitleForPage((string)pageTitle.Text)</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

10
src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml
View File

@@ -1,9 +1,9 @@
@{ @{
var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName; var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName;
var pageTitle = T("Edit Content"); var pageTitle = T("Edit Content");
if (!string.IsNullOrWhiteSpace(typeDisplayName)) { if (!string.IsNullOrWhiteSpace(typeDisplayName)) {
pageTitle = T("Edit {0}", typeDisplayName); pageTitle = T("Edit {0}", typeDisplayName);
} }
} }
<h1>@Html.TitleForPage(pageTitle)</h1> <h1>@Html.TitleForPage(pageTitle)</h1>
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {

34
src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml
View File

@@ -2,23 +2,23 @@
@using Orchard.Core.Reports.ViewModels; @using Orchard.Core.Reports.ViewModels;
<h1>@Html.TitleForPage(T("Display Report").ToString())</h1> <h1>@Html.TitleForPage(T("Display Report").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset> <fieldset>
<table class="items" summary="@T("This is a table of the reports in your application")"> <table class="items" summary="@T("This is a table of the reports in your application")">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
<col id="Col3" /> <col id="Col3" />
<col id="Col4" /> <col id="Col4" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">@T("Type")</th> <th scope="col">@T("Type")</th>
<th scope="col">@T("Message")</th> <th scope="col">@T("Message")</th>
<th scope="col">@T("Date")</th> <th scope="col">@T("Date")</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
</thead> </thead>
@foreach (var reportEntry in Model.Report.Entries) { @foreach (var reportEntry in Model.Report.Entries) {
<tr> <tr>
<td> <td>

34
src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml
View File

@@ -2,23 +2,23 @@
@using Orchard.Core.Reports.ViewModels; @using Orchard.Core.Reports.ViewModels;
<h1>@Html.TitleForPage(T("Manage Reports").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Reports").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset> <fieldset>
<table class="items" summary="@T("This is a table of the reports in your application")"> <table class="items" summary="@T("This is a table of the reports in your application")">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
<col id="Col3" /> <col id="Col3" />
<col id="Col4" /> <col id="Col4" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">@T("Name")</th> <th scope="col">@T("Name")</th>
<th scope="col">@T("Title")</th> <th scope="col">@T("Title")</th>
<th scope="col">@T("Date")</th> <th scope="col">@T("Date")</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
</thead> </thead>
@foreach (var report in Model.Reports) { @foreach (var report in Model.Reports) {
<tr> <tr>
<td> <td>

30
src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml
View File

@@ -17,21 +17,21 @@
@using(Script.Foot()){ @using(Script.Foot()){
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
$(function(){ $(function(){
//pull slug input from tab order //pull slug input from tab order
$("#@Html.FieldIdFor(m=>m.Slug)").attr("tabindex",-1); $("#@Html.FieldIdFor(m=>m.Slug)").attr("tabindex",-1);
$("#@Html.FieldIdFor(m=>m.Title)").blur(function(){ $("#@Html.FieldIdFor(m=>m.Title)").blur(function(){
var slug = $("#@Html.FieldIdFor(m=>m.Slug)"); var slug = $("#@Html.FieldIdFor(m=>m.Slug)");
if (slug.val()) { return true; } if (slug.val()) { return true; }
$(this).slugify({ $(this).slugify({
target:slug, target:slug,
contentType:"@Model.ContentType", contentType:"@Model.ContentType",
id:"@Model.Id", id:"@Model.Id",
@if (Model.ContainerId != null) {<text>containerId:@Model.ContainerId,</text>} @if (Model.ContainerId != null) {<text>containerId:@Model.ContainerId,</text>}
url:"@Url.Action("Slugify","Item",new RouteValueDictionary{{"Area","Routable"}})" url:"@Url.Action("Slugify","Item",new RouteValueDictionary{{"Area","Routable"}})"
}) })
}) })
}) })
//]]> //]]>
</script> </script>
} }

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

@@ -1,7 +1,7 @@
@using Orchard.Mvc.Html; @using Orchard.Mvc.Html;
@using Orchard.UI.Resources; @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); 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 //todo: (heskew) get conditions (as in conditional comments) hooked up for script tags too
Script.Include("html5.js").AtLocation(ResourceLocation.Head); Script.Include("html5.js").AtLocation(ResourceLocation.Head);

2
src/Orchard.Web/Core/Shapes/Views/Menu.cshtml
View File

@@ -1,6 +1,6 @@
@{ @{
// Model is Model.Menu from the layout (Layout.Menu) // Model is Model.Menu from the layout (Layout.Menu)
var tag = Tag(Model, "ul"); var tag = Tag(Model, "ul");
} }
<nav> <nav>
@tag.StartElement @tag.StartElement

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml
View File

@@ -2,7 +2,7 @@
<fieldset> <fieldset>
<div> <div>
@Html.LabelFor(m => m.ForBlog, T("For Blog")) @Html.LabelFor(m => m.ForBlog, T("For Blog"))
@Html.TextBoxFor(m => m.ForBlog) @Html.TextBoxFor(m => m.ForBlog)
<span class="hint">@T("Show the archives for which blog? Note: specify the blog's slug.")</span> <span class="hint">@T("Show the archives for which blog? Note: specify the blog's slug.")</span>
</div> </div>
</fieldset> </fieldset>

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml
View File

@@ -2,7 +2,7 @@
<fieldset> <fieldset>
<div> <div>
@Html.LabelFor(m => m.ForBlog, T("For Blog")) @Html.LabelFor(m => m.ForBlog, T("For Blog"))
@Html.TextBoxFor(m => m.ForBlog) @Html.TextBoxFor(m => m.ForBlog)
</div> </div>
<div> <div>
@Html.LabelFor(m => m.Count, T("Count")) @Html.LabelFor(m => m.Count, T("Count"))

40
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
View File

@@ -19,7 +19,7 @@
} }
</div> </div>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset class="bulk-actions"> <fieldset class="bulk-actions">
<label for="publishActions">@T("Actions:")</label> <label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)"> <select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)">
@@ -42,25 +42,25 @@
<button type="submit" name="submit.Filter" value="@T("Apply")">@T("Apply")</button> <button type="submit" name="submit.Filter" value="@T("Apply")">@T("Apply")</button>
</fieldset> </fieldset>
<fieldset> <fieldset>
<table class="items" summary="@T("This is a table of the comments for the content item")"> <table class="items" summary="@T("This is a table of the comments for the content item")">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
<col id="Col3" /> <col id="Col3" />
<col id="Col4" /> <col id="Col4" />
<col id="Col5" /> <col id="Col5" />
<col id="Col6" /> <col id="Col6" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">&nbsp;&darr;</th> <th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Status")</th> <th scope="col">@T("Status")</th>
<th scope="col">@T("Author")</th> <th scope="col">@T("Author")</th>
<th scope="col">@T("Comment")</th> <th scope="col">@T("Comment")</th>
<th scope="col">@T("Date")</th> <th scope="col">@T("Date")</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
</thead> </thead>
@{var commentIndex = 0;} @{var commentIndex = 0;}
@foreach (var commentEntry in Model.Comments) { @foreach (var commentEntry in Model.Comments) {
<tr> <tr>

2
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
View File

@@ -22,7 +22,7 @@
<div> <div>
<label for="CommentText">@T("Body")</label> <label for="CommentText">@T("Body")</label>
<textarea id="CommentText" rows="10" cols="30" name="CommentText">@Model.CommentText</textarea> <textarea id="CommentText" rows="10" cols="30" name="CommentText">@Model.CommentText</textarea>
<input id="CommentId" name="Id" type="hidden" value="@Model.Id" /> <input id="CommentId" name="Id" type="hidden" value="@Model.Id" />
</div> </div>
</fieldset> </fieldset>
<fieldset> <fieldset>

40
src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
View File

@@ -9,7 +9,7 @@
} }
<h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Comments").ToString())</h1>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset class="bulk-actions"> <fieldset class="bulk-actions">
<label for="publishActions">@T("Actions:")</label> <label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)"> <select id="publishActions" name="@Html.NameOf(m => m.Options.BulkAction)">
@@ -32,25 +32,25 @@
<button type="submit" name="submit.Filter" value="@T("Apply")">@T("Apply")</button> <button type="submit" name="submit.Filter" value="@T("Apply")">@T("Apply")</button>
</fieldset> </fieldset>
<fieldset> <fieldset>
<table class="items" summary="@T("This is a table of the comments in your application")"> <table class="items" summary="@T("This is a table of the comments in your application")">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
<col id="Col3" /> <col id="Col3" />
<col id="Col4" /> <col id="Col4" />
<col id="Col5" /> <col id="Col5" />
<col id="Col6" /> <col id="Col6" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">&nbsp;&darr;</th> <th scope="col">&nbsp;&darr;</th>
<th scope="col">@T("Status")</th> <th scope="col">@T("Status")</th>
<th scope="col">@T("Author")</th> <th scope="col">@T("Author")</th>
<th scope="col">@T("Comment")</th> <th scope="col">@T("Comment")</th>
<th scope="col">@T("Commented On")</th> <th scope="col">@T("Commented On")</th>
<th scope="col">@T("Actions")</th> <th scope="col">@T("Actions")</th>
</tr> </tr>
</thead> </thead>
@{var commentIndex = 0;} @{var commentIndex = 0;}
@foreach (var commentEntry in Model.Comments) { @foreach (var commentEntry in Model.Comments) {
var commentClass = ""; var commentClass = "";

10
src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml
View File

@@ -4,11 +4,11 @@
@using Orchard.Utility.Extensions; @using Orchard.Utility.Extensions;
@{ @{
var contextExists = TempData["CreateCommentContext.Name"] != null; var contextExists = TempData["CreateCommentContext.Name"] != null;
var name = Convert.ToString(TempData["CreateCommentContext.Name"]); var name = Convert.ToString(TempData["CreateCommentContext.Name"]);
var commentText = Convert.ToString(TempData["CreateCommentContext.CommentText"]); var commentText = Convert.ToString(TempData["CreateCommentContext.CommentText"]);
var email = Convert.ToString(TempData["CreateCommentContext.Email"]); var email = Convert.ToString(TempData["CreateCommentContext.Email"]);
var siteName = Convert.ToString(TempData["CreateCommentContext.SiteName"]); var siteName = Convert.ToString(TempData["CreateCommentContext.SiteName"]);
} }
@if (Model.ContentPart.Comments.Count > 0) { @if (Model.ContentPart.Comments.Count > 0) {

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml
View File

@@ -1,7 +1,7 @@
@model Orchard.ContentTypes.ViewModels.EditTypeViewModel @model Orchard.ContentTypes.ViewModels.EditTypeViewModel
@{ @{
Style.Require("ContentTypesAdmin"); Style.Require("ContentTypesAdmin");
Script.Require("jQuery"); Script.Require("jQuery");
Script.Include("admin.js"); Script.Include("admin.js");
} }
<h1>@Html.TitleForPage(T("Edit Content Type").ToString())</h1> <h1>@Html.TitleForPage(T("Edit Content Type").ToString())</h1>

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml
View File

@@ -1,7 +1,7 @@
@model Orchard.ContentTypes.ViewModels.EditPartViewModel @model Orchard.ContentTypes.ViewModels.EditPartViewModel
@{ @{
Style.Require("ContentTypesAdmin"); Style.Require("ContentTypesAdmin");
Script.Require("jQuery"); Script.Require("jQuery");
Script.Include("admin.js"); Script.Include("admin.js");
} }
<h1>@Html.TitleForPage(T("Edit Part").ToString())</h1> <h1>@Html.TitleForPage(T("Edit Part").ToString())</h1>

10
src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml
View File

@@ -7,11 +7,11 @@
@Html.ValidationSummary() @Html.ValidationSummary()
<ul> <ul>
@for (int index = 0; index != (Model.History ?? new string[0]).Length; ++index) { @for (int index = 0; index != (Model.History ?? new string[0]).Length; ++index) {
<li> <li>
@Model.History[index] @Model.History[index]
@Html.HiddenFor(m => m.History[index]) @Html.HiddenFor(m => m.History[index])
</li> </li>
} }
</ul> </ul>
@Html.LabelFor(m => m.CommandLine, T("Command Line")) @Html.LabelFor(m => m.CommandLine, T("Command Line"))
@Html.TextBoxFor(m => m.CommandLine, new { style = "width:100%;" }) @Html.TextBoxFor(m => m.CommandLine, new { style = "width:100%;" })

14
src/Orchard.Web/Modules/Orchard.Experimental/Views/DumpShapeTable.cshtml
View File

@@ -2,13 +2,13 @@
@using Orchard.DisplayManagement.Descriptors; @using Orchard.DisplayManagement.Descriptors;
@Display(Model.Metadata.ChildContent) @Display(Model.Metadata.ChildContent)
@{ @{
var workContext = ViewContext.GetWorkContext(); var workContext = ViewContext.GetWorkContext();
var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.Id); var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.Id);
<!-- <!--
<ul> <ul>
@foreach(var binding in shapeTable.Bindings) { @foreach(var binding in shapeTable.Bindings) {
<li>@binding.Key : @binding.Value.BindingSource</li> <li>@binding.Key : @binding.Value.BindingSource</li>
} }
</ul> </ul>
--> -->
} }

18
src/Orchard.Web/Modules/Orchard.Experimental/Views/ShapeTable/ShapeTable.cshtml
View File

@@ -1,12 +1,12 @@
 
<div> <div>
@model Orchard.DisplayManagement.Descriptors.ShapeTable; @model Orchard.DisplayManagement.Descriptors.ShapeTable;
<ul> <ul>
@foreach(var descriptor in Model.Descriptors) { @foreach(var descriptor in Model.Descriptors) {
<li> <li>
@descriptor.Key @descriptor.Key
<p>@descriptor.Value.BindingSource</p> <p>@descriptor.Value.BindingSource</p>
</li> </li>
} }
</ul> </ul>
</div> </div>

6
src/Orchard.Web/Modules/Orchard.Experimental/Views/ThinBorder.cshtml
View File

@@ -1,9 +1,9 @@
@using Orchard; @using Orchard;
@using Orchard.DisplayManagement.Descriptors; @using Orchard.DisplayManagement.Descriptors;
@{ @{
var workContext = ViewContext.GetWorkContext(); var workContext = ViewContext.GetWorkContext();
var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.Id); var shapeTable = workContext.Resolve<IShapeTableManager>().GetShapeTable(workContext.CurrentTheme.Id);
var descriptor = shapeTable.Descriptors[Model.Metadata.Type]; var descriptor = shapeTable.Descriptors[Model.Metadata.Type];
} }
<!-- ----DEBUG---- --><div class="thin-dotted-orange-border-with-a-little-padding" title="@Model.Metadata.Type @descriptor.BindingSource"> <!-- ----DEBUG---- --><div class="thin-dotted-orange-border-with-a-little-padding" title="@Model.Metadata.Type @descriptor.BindingSource">

2
src/Orchard.Web/Modules/Orchard.Indexing/DefaultIndexingUpdater.cs
View File

@@ -15,7 +15,7 @@ namespace Orchard.Indexing {
public DefaultIndexingUpdater (IIndexingTaskManager indexingTaskManager, IContentManager contentManager){ public DefaultIndexingUpdater (IIndexingTaskManager indexingTaskManager, IContentManager contentManager){
_indexingTaskManager = indexingTaskManager; _indexingTaskManager = indexingTaskManager;
_contentManager = contentManager; _contentManager = contentManager;
} }
public void Install(Environment.Extensions.Models.Feature feature) { public void Install(Environment.Extensions.Models.Feature feature) {
} }

2
src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
View File

@@ -14,7 +14,7 @@ namespace Orchard.Indexing.Settings {
public EditorEvents(IIndexingTaskManager indexingTaskManager, IContentManager contentManager){ public EditorEvents(IIndexingTaskManager indexingTaskManager, IContentManager contentManager){
_indexingTaskManager = indexingTaskManager; _indexingTaskManager = indexingTaskManager;
_contentManager = contentManager; _contentManager = contentManager;
} }
private string _contentTypeName; private string _contentTypeName;
private bool _tasksCreated = false; private bool _tasksCreated = false;

3
src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml
View File

@@ -32,5 +32,4 @@
<button type="submit" title="@T("Rebuild the search index.")">@T("Rebuild")</button></p> <button type="submit" title="@T("Rebuild the search index.")">@T("Rebuild")</button></p>
@Html.AntiForgeryTokenOrchard() @Html.AntiForgeryTokenOrchard()
</fieldset> </fieldset>
} }

8
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml
View File

@@ -16,10 +16,10 @@
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>@T("Database Setup")</legend> <legend>@T("Database Setup")</legend>
<div> <div>
@Html.RadioButtonFor(svm => svm.DataProvider, "", new { id = "tenantDatabaseOption" }) @Html.RadioButtonFor(svm => svm.DataProvider, "", new { id = "tenantDatabaseOption" })
<label for="tenantDatabaseOption" class="forcheckbox">@T("Allow the tenant to set up the database")</label> <label for="tenantDatabaseOption" class="forcheckbox">@T("Allow the tenant to set up the database")</label>
</div> </div>
<div> <div>
@Html.RadioButtonFor(svm => svm.DataProvider, "SqlCe", new { id = "builtinDatabaseOption" }) @Html.RadioButtonFor(svm => svm.DataProvider, "SqlCe", new { id = "builtinDatabaseOption" })
<label for="builtinDatabaseOption" class="forcheckbox">@T("Use built-in data storage (SQL Server Compact)")</label> <label for="builtinDatabaseOption" class="forcheckbox">@T("Use built-in data storage (SQL Server Compact)")</label>
@@ -40,7 +40,7 @@
</div> </div>
</div> </div>
</fieldset> </fieldset>
<fieldset> <fieldset>
<button class="primaryAction" type="submit">@T("Save")</button> <button class="primaryAction" type="submit">@T("Save")</button>
</fieldset> </fieldset>
} }

4
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForDisabled.cshtml
View File

@@ -2,6 +2,6 @@
@using Orchard.MultiTenancy.Extensions; @using Orchard.MultiTenancy.Extensions;
@using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { @using(Html.BeginFormAntiForgeryPost(Url.Action("enable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) {
@Html.HiddenFor(ss => ss.Name) @Html.HiddenFor(ss => ss.Name)
<button type="submit">@T("Resume")</button> <button type="submit">@T("Resume")</button>
} }

4
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/DisplayTemplates/ActionsForRunning.cshtml
View File

@@ -2,6 +2,6 @@
@using Orchard.MultiTenancy.Extensions; @using Orchard.MultiTenancy.Extensions;
@using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) { @using(Html.BeginFormAntiForgeryPost(Url.Action("disable", new {area = "Orchard.MultiTenancy"}), FormMethod.Post, new {@class = "inline link"})) {
@Html.HiddenFor(ss => ss.Name) @Html.HiddenFor(ss => ss.Name)
<button type="submit">@T("Suspend")</button> <button type="submit">@T("Suspend")</button>
} }

12
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
View File

@@ -17,12 +17,12 @@
<fieldset> <fieldset>
<legend>@T("Database Setup")</legend> <legend>@T("Database Setup")</legend>
@if (Model.State.CurrentState != TenantState.State.Uninitialized) { @if (Model.State.CurrentState != TenantState.State.Uninitialized) {
<div class="warning message">@T("Warning: If you don't know what you're doing you *will* (likely) send this tenant into a downward spiral of irrecoverable disrepair. Have a nice day.")</div> <div class="warning message">@T("Warning: If you don't know what you're doing you *will* (likely) send this tenant into a downward spiral of irrecoverable disrepair. Have a nice day.")</div>
} else { } else {
<div> <div>
@Html.RadioButtonFor(svm => svm.DataProvider, "", new { id = "tenantDatabaseOption" }) @Html.RadioButtonFor(svm => svm.DataProvider, "", new { id = "tenantDatabaseOption" })
<label for="tenantDatabaseOption" class="forcheckbox">@T("Allow the tenant to set up the database")</label> <label for="tenantDatabaseOption" class="forcheckbox">@T("Allow the tenant to set up the database")</label>
</div> </div>
} }
<div> <div>
@Html.RadioButtonFor(svm => svm.DataProvider, "SqlCe", new { id = "builtinDatabaseOption" }) @Html.RadioButtonFor(svm => svm.DataProvider, "SqlCe", new { id = "builtinDatabaseOption" })
@@ -42,7 +42,7 @@
</span> </span>
</div> </div>
</fieldset> </fieldset>
<fieldset> <fieldset>
<button class="primaryAction" type="submit">@T("Save")</button> <button class="primaryAction" type="submit">@T("Save")</button>
</fieldset> </fieldset>
} }

4
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Index.cshtml
View File

@@ -16,8 +16,8 @@
</div> </div>
<div class="related"> <div class="related">
@if (!string.Equals(tenant.Name, "default", StringComparison.OrdinalIgnoreCase)) { //todo: (heskew) base this off the view model so logic on what can be removed and have its state changed stays in the controller @if (!string.Equals(tenant.Name, "default", StringComparison.OrdinalIgnoreCase)) { //todo: (heskew) base this off the view model so logic on what can be removed and have its state changed stays in the controller
var t = tenant; var t = tenant;
@Html.DisplayFor(m => t, string.Format("ActionsFor{0}", tenant.State.CurrentState), "") @T(" | ") @Html.DisplayFor(m => t, string.Format("ActionsFor{0}", tenant.State.CurrentState), "") @T(" | ")
} }
@Html.ActionLink(T("Edit").ToString(), "Edit", new {name = tenant.Name, area = "Orchard.MultiTenancy"}) @Html.ActionLink(T("Edit").ToString(), "Edit", new {name = tenant.Name, area = "Orchard.MultiTenancy"})
</div> </div>

3
src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
View File

@@ -10,7 +10,6 @@ using Orchard.Packaging.ViewModels;
using Orchard.Themes; using Orchard.Themes;
using Orchard.UI.Admin; using Orchard.UI.Admin;
using Orchard.UI.Notify; using Orchard.UI.Notify;
using System.Xml.XPath;
namespace Orchard.Packaging.Controllers { namespace Orchard.Packaging.Controllers {
[OrchardFeature("Gallery")] [OrchardFeature("Gallery")]
@@ -34,7 +33,7 @@ namespace Orchard.Packaging.Controllers {
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
} }
Localizer T { get; set; } public Localizer T { get; set; }
public ActionResult Sources() { public ActionResult Sources() {
return View(new PackagingSourcesViewModel { return View(new PackagingSourcesViewModel {

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

@@ -6,9 +6,9 @@
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset> <fieldset>
<label for="Url">@T("Feed Url")</label> <label for="Url">@T("Feed Url")</label>
<input id="Url" class="textMedium" name="Url" type="text" value="@Model.Url"/> <input id="Url" class="textMedium" name="Url" type="text" value="@Model.Url"/>
</fieldset> </fieldset>
<fieldset> <fieldset>
<button class="primaryAction" type="submit">@T("Add Feed")</button> <button class="primaryAction" type="submit">@T("Add Feed")</button>
</fieldset> </fieldset>
} }

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

@@ -17,7 +17,6 @@
<button type="submit">@T("Apply")</button> <button type="submit">@T("Apply")</button>
</fieldset> </fieldset>
} }
@if (Model.Extensions.Count() > 0) { @if (Model.Extensions.Count() > 0) {
<ul class="contentItems"> <ul class="contentItems">

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

@@ -6,20 +6,20 @@
@Html.ActionLink(T("Add Feed").Text, "AddSource", new { }, new { @class = "button primaryAction" }) @Html.ActionLink(T("Add Feed").Text, "AddSource", new { }, new { @class = "button primaryAction" })
</div> </div>
<fieldset> <fieldset>
<table class="items" summary="@T("This is a table of the gallery feeds in your application")"> <table class="items" summary="@T("This is a table of the gallery feeds in your application")">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
<col id="Col3" /> <col id="Col3" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">@T("Title")</th> <th scope="col">@T("Title")</th>
<th scope="col">@T("Url")</th> <th scope="col">@T("Url")</th>
<th scope="col"></th> <th scope="col"></th>
</tr> </tr>
</thead> </thead>
@foreach ( var item in Model.Sources ) { @foreach ( var item in Model.Sources ) {
<tr> <tr>
<td>@item.FeedTitle</td> <td>@item.FeedTitle</td>

6
src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
View File

@@ -4,9 +4,9 @@
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary(); Html.ValidationSummary();
<fieldset> <fieldset>
<legend>@T("Information")</legend> <legend>@T("Information")</legend>
<label for="pageTitle">@T("Role Name:")</label> <label for="pageTitle">@T("Role Name:")</label>
<input id="Name" class="text" name="Name" type="text" value="@Model.Name" /> <input id="Name" class="text" name="Name" type="text" value="@Model.Name" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>@T("Permissions")</legend> <legend>@T("Permissions")</legend>

84
src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
View File

@@ -4,61 +4,61 @@
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary(); Html.ValidationSummary();
<fieldset> <fieldset>
<legend>@T("Information")</legend> <legend>@T("Information")</legend>
<label for="pageTitle">@T("Role Name:")</label> <label for="pageTitle">@T("Role Name:")</label>
@if (Model.Name == "Administrator") { // the one special case @if (Model.Name == "Administrator") { // the one special case
<input id="Name" class="text" type="text" value="@Model.Name" readonly="readonly" /> <input id="Name" class="text" type="text" value="@Model.Name" readonly="readonly" />
<input class="text" name="Name" type="hidden" value="@Model.Name" /> <input class="text" name="Name" type="hidden" value="@Model.Name" />
} }
else { else {
<input id="Name" class="text" name="Name" type="text" value="@Model.Name" /> <input id="Name" class="text" name="Name" type="text" value="@Model.Name" />
} }
<input type="hidden" value="@Model.Id" name="Id" /> <input type="hidden" value="@Model.Id" name="Id" />
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>@T("Permissions")</legend> <legend>@T("Permissions")</legend>
@foreach (var category in Model.RoleCategoryPermissions.Keys) { @foreach (var category in Model.RoleCategoryPermissions.Keys) {
<fieldset> <fieldset>
<legend>@category</legend> <legend>@category</legend>
<table class="items"> <table class="items">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">@T("Permission")</th> <th scope="col">@T("Permission")</th>
<th scope="col">@T("Allow")</th> <th scope="col">@T("Allow")</th>
<th scope="col">@T("Effective")</th> <th scope="col">@T("Effective")</th>
</tr> </tr>
</thead> </thead>
@foreach (var permission in Model.RoleCategoryPermissions[category]) { @foreach (var permission in Model.RoleCategoryPermissions[category]) {
<tr> <tr>
<td>@permission.Description</td> <td>@permission.Description</td>
<td style="width:60px;"> <td style="width:60px;">
@if (Model.CurrentPermissions.Contains(permission.Name)) { @if (Model.CurrentPermissions.Contains(permission.Name)) {
<input type="checkbox" value="true" name="@T("Checkbox.{0}", permission.Name)" checked="checked"/> <input type="checkbox" value="true" name="@T("Checkbox.{0}", permission.Name)" checked="checked"/>
} else { } else {
<input type="checkbox" value="true" name="@T("Checkbox.{0}", permission.Name)"/> <input type="checkbox" value="true" name="@T("Checkbox.{0}", permission.Name)"/>
} }
</td> </td>
<td style="width:60px;"> <td style="width:60px;">
@if (Model.EffectivePermissions.Contains(permission.Name)) { @if (Model.EffectivePermissions.Contains(permission.Name)) {
<input type="checkbox" disabled="disabled" name="@T("Effective.{0}", permission.Name)" checked="checked"/> <input type="checkbox" disabled="disabled" name="@T("Effective.{0}", permission.Name)" checked="checked"/>
} else { } else {
<input type="checkbox" disabled="disabled" name="@T("Effective.{0}", permission.Name)"/> <input type="checkbox" disabled="disabled" name="@T("Effective.{0}", permission.Name)"/>
} }
</td> </td>
</tr> </tr>
} }
</table> </table>
</fieldset> </fieldset>
} }
</fieldset> </fieldset>
<fieldset> <fieldset>
<button class="primaryAction" type="submit" name="submit.Save" value="@T("Save")">@T("Save")</button> <button class="primaryAction" type="submit" name="submit.Save" value="@T("Save")">@T("Save")</button>
@if (Model.Name != "Administrator") { @if (Model.Name != "Administrator") {
<button type="submit" name="submit.Delete" value="@T("Remove")">@T("Remove")</button> <button type="submit" name="submit.Delete" value="@T("Remove")">@T("Remove")</button>
} }
</fieldset> </fieldset>
} }

22
src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml
View File

@@ -6,7 +6,7 @@
@using (Html.BeginFormAntiForgeryPost()) { @using (Html.BeginFormAntiForgeryPost()) {
@Html.ValidationSummary() @Html.ValidationSummary()
<fieldset> <fieldset>
@Html.HiddenFor(m=>m.Id) @Html.HiddenFor(m=>m.Id)
@Html.LabelFor(m => m.TagName, T("Tag Name")) @Html.LabelFor(m => m.TagName, T("Tag Name"))
@Html.TextBoxFor(m=>m.TagName, new { @class = "text" }) @Html.TextBoxFor(m=>m.TagName, new { @class = "text" })
</fieldset> </fieldset>
@@ -21,16 +21,16 @@
} }
else { else {
<table class="items"> <table class="items">
<colgroup> <colgroup>
<col id="Col1" /> <col id="Col1" />
<col id="Col2" /> <col id="Col2" />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th scope="col">@T("Content Type")</th> <th scope="col">@T("Content Type")</th>
<th scope="co2">@T("Name")</th> <th scope="co2">@T("Name")</th>
</tr> </tr>
</thead> </thead>
@foreach (IContent content in View.ContentItems) { @foreach (IContent content in View.ContentItems) {
<tr> <tr>
<td>@content.ContentItem.ContentType.CamelFriendly()</td> <td>@content.ContentItem.ContentType.CamelFriendly()</td>

14
src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
View File

@@ -12,7 +12,7 @@
@Display.EditorTemplate(TemplateName: "Parts/CreateTag", Model: View.CreateTag != null ? View.CreateTag : new TagsAdminCreateViewModel()) @Display.EditorTemplate(TemplateName: "Parts/CreateTag", Model: View.CreateTag != null ? View.CreateTag : new TagsAdminCreateViewModel())
</div> </div>
@using(Html.BeginFormAntiForgeryPost()) { @using(Html.BeginFormAntiForgeryPost()) {
<fieldset class="bulk-actions"> <fieldset class="bulk-actions">
<label for="publishActions">@T("Actions:")</label> <label for="publishActions">@T("Actions:")</label>
<select id="publishActions" name="@Html.NameOf(m => m.BulkAction)"> <select id="publishActions" name="@Html.NameOf(m => m.BulkAction)">
@Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, T("Choose action...").ToString()) @Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, T("Choose action...").ToString())
@@ -28,12 +28,12 @@
<col id="Edit" /> <col id="Edit" />
</colgroup> </colgroup>
<thead> <thead>
<th scope="col">&nbsp;&darr;@*todo: (heskew) something more appropriate for "this applies to the bulk actions*@</th> <th scope="col">&nbsp;&darr;@*todo: (heskew) something more appropriate for "this applies to the bulk actions*@</th>
<th scope="col">@T("Name")</th> <th scope="col">@T("Name")</th>
<th scope="col"></th> <th scope="col"></th>
</thead> </thead>
@{var tagIndex = 0;} @{var tagIndex = 0;}
@foreach (var tagEntry in Model.Tags) { @foreach (var tagEntry in Model.Tags) {
<tr> <tr>
<td> <td>
<input type="hidden" value="@Model.Tags[tagIndex].Tag.Id" name="@Html.NameOf(m => m.Tags[tagIndex].Tag.Id)"/> <input type="hidden" value="@Model.Tags[tagIndex].Tag.Id" name="@Html.NameOf(m => m.Tags[tagIndex].Tag.Id)"/>
@@ -48,7 +48,7 @@
</td> </td>
</tr> </tr>
tagIndex = tagIndex + 1; tagIndex = tagIndex + 1;
} }
</table> </table>
</fieldset> </fieldset>
} }

8
src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
View File

@@ -1,10 +1,10 @@
@model Orchard.Tags.ViewModels.TagsSearchViewModel @model Orchard.Tags.ViewModels.TagsSearchViewModel
@{ @{
Html.AddTitleParts(T("Tags").ToString()); Html.AddTitleParts(T("Tags").ToString());
Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString()); Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString());
Model.List.Classes.Add("tagged-posts"); Model.List.Classes.Add("tagged-posts");
Model.List.Classes.Add("content-items"); Model.List.Classes.Add("content-items");
} }
<h1 class="page-title">@T("Contents tagged with <span>{0}</span>", Model.TagName)</h1> <h1 class="page-title">@T("Contents tagged with <span>{0}</span>", Model.TagName)</h1>

14
src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml
View File

@@ -1,11 +1,11 @@
@{ @{
var tagsHtml = new List<IHtmlString>(); var tagsHtml = new List<IHtmlString>();
foreach(var t in Model.Tags) { foreach(var t in Model.Tags) {
if (tagsHtml.Any()) { if (tagsHtml.Any()) {
tagsHtml.Add(new HtmlString(", ")); tagsHtml.Add(new HtmlString(", "));
} }
tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { })); tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { }));
} }
} }
@if (tagsHtml.Any()) { @if (tagsHtml.Any()) {

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

@@ -14,19 +14,19 @@
overflow:hidden; overflow:hidden;
} }
.templates img, .themePreviewImage { .templates img, .themePreviewImage {
border:1px solid #e8e8e8; border:1px solid #e8e8e8;
height:200px; height:200px;
margin:.27em 0 .93em 0; margin:.27em 0 .93em 0;
display:block; display:block;
} }
.previewImage { .previewImage {
border:1px solid #525e50; border:1px solid #525e50;
height:50%; height:50%;
width:50%; width:50%;
} }
.themes #main h2 { .themes #main h2 {
margin:1em 0 0 0; margin:1em 0 0 0;
} }
.themePreviewImage { .themePreviewImage {
height:300px; height:300px;
} }

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

@@ -2,63 +2,63 @@
@{ Style.Require("ThemesAdmin"); } @{ Style.Require("ThemesAdmin"); }
<h1>@Html.TitleForPage(T("Manage Themes").ToString())</h1> <h1>@Html.TitleForPage(T("Manage Themes").ToString())</h1>
@if (Model.CurrentTheme == null) { @if (Model.CurrentTheme == null) {
<p> <p>
@T("There is no current theme in the application. The built-in theme will be used.")<br /> @T("There is no current theme in the application. The built-in theme will be used.")<br />
@Html.ActionLink(T("Install a new Theme").ToString(), "Install") @Html.ActionLink(T("Install a new Theme").ToString(), "Install")
</p> </p>
} else { } else {
<h3>@T("Current Theme") - @Model.CurrentTheme.Name</h3> <h3>@T("Current Theme") - @Model.CurrentTheme.Name</h3>
@Html.Image(Href(Html.ThemePath(Model.CurrentTheme, "/Theme.png")), Html.Encode(Model.CurrentTheme.Name), new { @class = "themePreviewImage" }) @Html.Image(Href(Html.ThemePath(Model.CurrentTheme, "/Theme.png")), Html.Encode(Model.CurrentTheme.Name), new { @class = "themePreviewImage" })
<h5>@T("By") @Model.CurrentTheme.Author</h5> <h5>@T("By") @Model.CurrentTheme.Author</h5>
<p> <p>
@T("Version:") @Model.CurrentTheme.Version<br /> @T("Version:") @Model.CurrentTheme.Version<br />
@Model.CurrentTheme.Description<br /> @Model.CurrentTheme.Description<br />
@Model.CurrentTheme.WebSite @Model.CurrentTheme.WebSite
</p> </p>
@Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" }) @Html.ActionLink(T("Install a new Theme").ToString(), "Install", null, new { @class = "button primaryAction" })
} }
<h2>@T("Available Themes")</h2> <h2>@T("Available Themes")</h2>
<ul class="templates"> <ul class="templates">
@foreach (var theme in Model.Themes) { @foreach (var theme in Model.Themes) {
if (Model.CurrentTheme == null || theme.Id != Model.CurrentTheme.Id) { if (Model.CurrentTheme == null || theme.Id != Model.CurrentTheme.Id) {
<li> <li>
<div> <div>
<h3>@theme.Name</h3> <h3>@theme.Name</h3>
@Html.Image(Href(theme.ThemePath("/Theme.png")), Html.Encode(theme.Name), null) @Html.Image(Href(theme.ThemePath("/Theme.png")), Html.Encode(theme.Name), null)
@using (Html.BeginFormAntiForgeryPost(Url.Action(theme.Enabled ? "Disable" : "Enable"), FormMethod.Post, new { @class = "inline" })) { @using (Html.BeginFormAntiForgeryPost(Url.Action(theme.Enabled ? "Disable" : "Enable"), FormMethod.Post, new { @class = "inline" })) {
@Html.Hidden("themeName", theme.Id) @Html.Hidden("themeName", theme.Id)
<button type="submit" title="@T(theme.Enabled ? "Disable" : "Enable")">@T(theme.Enabled ? "Disable" : "Enable")</button> <button type="submit" title="@T(theme.Enabled ? "Disable" : "Enable")">@T(theme.Enabled ? "Disable" : "Enable")</button>
} }
@using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { @using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) {
@Html.Hidden("themeName", theme.Id) @Html.Hidden("themeName", theme.Id)
<button type="submit" title="@T("Activate")">@T("Set Current")</button> <button type="submit" title="@T("Activate")">@T("Set Current")</button>
} }
@using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" })) { @using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" })) {
@Html.Hidden("themeName", theme.Id) @Html.Hidden("themeName", theme.Id)
<button type="submit" title="@T("Preview")">@T("Preview")</button> <button type="submit" title="@T("Preview")">@T("Preview")</button>
} }
<h5>@T("By") @theme.Descriptor.Author</h5> <h5>@T("By") @theme.Descriptor.Author</h5>
<p> <p>
@T("Version:") @theme.Descriptor.Version<br /> @T("Version:") @theme.Descriptor.Version<br />
@theme.Descriptor.Description<br /> @theme.Descriptor.Description<br />
@theme.Descriptor.WebSite @theme.Descriptor.WebSite
</p> </p>
@if(theme.NeedsUpdate){ @if(theme.NeedsUpdate){
using (Html.BeginFormAntiForgeryPost(Url.Action("Update"), FormMethod.Post, new { @class = "inline link" })) { using (Html.BeginFormAntiForgeryPost(Url.Action("Update"), FormMethod.Post, new { @class = "inline link" })) {
@Html.Hidden("themeName", theme.Id) @Html.Hidden("themeName", theme.Id)
<button type="submit" class="update">@T("Update")</button> <br/> <button type="submit" class="update">@T("Update")</button> <br/>
} }
} }
@using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { @using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) {
@Html.Hidden("themeName", theme.Id) @Html.Hidden("themeName", theme.Id)
<button type="submit" class="uninstall" title="@T("Uninstall")">@T("Uninstall")</button> <button type="submit" class="uninstall" title="@T("Uninstall")">@T("Uninstall")</button>
} }
</div> </div>
</li> </li>
} }
} }
</ul> </ul>

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

@@ -5,6 +5,6 @@
<label for="ThemeZipPath">@T("File Path to the zip file:")</label> <label for="ThemeZipPath">@T("File Path to the zip file:")</label>
<input id="ThemeZipPath" name="ThemeZipPath" type="file" class="text" value="@T("Browse")" size="64" /><br /> <input id="ThemeZipPath" name="ThemeZipPath" type="file" class="text" value="@T("Browse")" size="64" /><br />
<button class="primaryAction" type="submit">@T("Install")</button> <button class="primaryAction" type="submit">@T("Install")</button>
@Html.AntiForgeryTokenOrchard() @Html.AntiForgeryTokenOrchard()
</fieldset> </fieldset>
} }

22
src/Orchard.Web/Modules/Orchard.Themes/Views/ThemePreview.cshtml
View File

@@ -1,5 +1,5 @@
@{ @{
var themes = (IEnumerable<SelectListItem>)Model.Themes; var themes = (IEnumerable<SelectListItem>)Model.Themes;
} }
<style type="text/css"> <style type="text/css">
body { body {
@@ -57,15 +57,15 @@ html.dyn #themepreview button.preview { display:none; }
</style> </style>
<div id="themepreview"> <div id="themepreview">
@using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) { @using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) {
<fieldset> <fieldset>
<span>@T("You are previewing: ")</span> <span>@T("You are previewing: ")</span>
@Html.DropDownList("ThemeName", themes, new {onChange = "this.form.submit();"}) @Html.DropDownList("ThemeName", themes, new {onChange = "this.form.submit();"})
@Html.Hidden("ReturnUrl", Context.Request.RawUrl) @Html.Hidden("ReturnUrl", Context.Request.RawUrl)
<button type="submit" class="preview" title="@T("Preview")" name="submit.Preview" value="@T("Preview")">@T("Preview")</button> <button type="submit" class="preview" title="@T("Preview")" name="submit.Preview" value="@T("Preview")">@T("Preview")</button>
<button type="submit" title="@T("Apply")" name="submit.Apply" value="@T("Apply")">@T("Apply this theme")</button> <button type="submit" title="@T("Apply")" name="submit.Apply" value="@T("Apply")">@T("Apply this theme")</button>
<button type="submit" class="cancel" title="@T("Cancel")" name="submit.Cancel" value="@T("Cancel")">@T("Cancel")</button> <button type="submit" class="cancel" title="@T("Cancel")" name="submit.Cancel" value="@T("Cancel")">@T("Cancel")</button>
</fieldset> </fieldset>
} }
</div> </div>

2
src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
View File

@@ -211,7 +211,7 @@ namespace Orchard.Users.Controllers {
protected override void OnActionExecuting(ActionExecutingContext filterContext) { protected override void OnActionExecuting(ActionExecutingContext filterContext) {
if (filterContext.HttpContext.User.Identity is WindowsIdentity) { if (filterContext.HttpContext.User.Identity is WindowsIdentity) {
throw new InvalidOperationException("Windows authentication is not supported."); throw new InvalidOperationException(T("Windows authentication is not supported.").ToString());
} }
} }

5
src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
View File

@@ -6,6 +6,7 @@ using System.Text;
using System.Web.Security; using System.Web.Security;
using System.Xml.Linq; using System.Xml.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Orchard.Localization;
using Orchard.Logging; using Orchard.Logging;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Security; using Orchard.Security;
@@ -27,9 +28,11 @@ namespace Orchard.Users.Services {
_messageManager = messageManager; _messageManager = messageManager;
_userEventHandlers = userEventHandlers; _userEventHandlers = userEventHandlers;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
} }
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public Localizer T { get; set; }
public MembershipSettings GetSettings() { public MembershipSettings GetSettings() {
var settings = new MembershipSettings(); var settings = new MembershipSettings();
@@ -179,7 +182,7 @@ namespace Orchard.Users.Services {
SetPasswordEncrypted(partRecord, password); SetPasswordEncrypted(partRecord, password);
break; break;
default: default:
throw new ApplicationException("Unexpected password format value"); throw new ApplicationException(T("Unexpected password format value").ToString());
} }
} }

28
src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
View File

@@ -47,18 +47,18 @@ h4.widgets-layer-header {
} }
.widgets-layerZones .widgets-zone { .widgets-layerZones .widgets-zone {
background:#f5f5f5; background:#f5f5f5;
border: 1px solid #f1f1f1; border: 1px solid #f1f1f1;
padding: 1em 2em 1em 2em; padding: 1em 2em 1em 2em;
margin: 0 0 .6em 0; margin: 0 0 .6em 0;
} }
.widgets-layerZones .widgets-zoneWidget { .widgets-layerZones .widgets-zoneWidget {
margin: .6em; margin: .6em;
padding: 1em 2em 1em 3em; padding: 1em 2em 1em 3em;
background:#ffffff; background:#ffffff;
border: 1px solid #f1f1f1; border: 1px solid #f1f1f1;
vertical-align: middle; vertical-align: middle;
} }
.widgets-availableLayers fieldset .widgets-availableLayers fieldset
@@ -79,8 +79,8 @@ h4.widgets-layer-header {
} }
.widgets-layers ul { .widgets-layers ul {
background: #f5f5f5; background: #f5f5f5;
border: 1px solid #f1f1f1; border: 1px solid #f1f1f1;
} }
.widgets-layers ul li .widgets-layers ul li
@@ -90,17 +90,17 @@ h4.widgets-layer-header {
} }
.widgets-layers .widgets-currentLayer { .widgets-layers .widgets-currentLayer {
background: #c3d9ff; background: #c3d9ff;
} }
.widgets-layers .widgets-currentLayer a { .widgets-layers .widgets-currentLayer a {
color: #333; color: #333;
font-weight: 600; font-weight: 600;
} }
.widgets-layerZones ul li ul { .widgets-layerZones ul li ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.new-layer { .new-layer {

10
src/Orchard.Web/Modules/Orchard.jQuery/Styles/ui.timepickr.css
View File

@@ -1,14 +1,14 @@
.ui-timepickr { .ui-timepickr {
display:none; display:none;
position:absolute; position:absolute;
padding:2px 2px 2px 0; padding:2px 2px 2px 0;
} }
.ui-timepickr-row { .ui-timepickr-row {
padding:0; padding:0;
float:right; float:right;
clear:both; clear:both;
overflow:hidden; overflow:hidden;
margin:2px 0; margin:2px 0;
display:none; display:none;
position:relative; position:relative;

2
src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml
View File

@@ -1,5 +1,5 @@
@{ @{
Script.Require("TinyMce"); Script.Require("TinyMce");
} }
@using(Script.Foot()) { @using(Script.Foot()) {
<script type="text/javascript"> <script type="text/javascript">

16
src/Orchard.Web/Themes/SafeMode/Styles/ie6.css
View File

@@ -1,24 +1,24 @@
#branding #branding
{ {
height:50px; height:50px;
margin:0 0 0 20px; margin:0 0 0 20px;
background:transparent url(images/orchardLogo.gif) no-repeat scroll 0 0; background:transparent url(images/orchardLogo.gif) no-repeat scroll 0 0;
} }
#branding h1 { #branding h1 {
padding:8px 0 0 38px; padding:8px 0 0 38px;
} }
/* Forms /* Forms
----------------------------------------------------------*/ ----------------------------------------------------------*/
legend { legend {
color:#333; color:#333;
} }
#AdminPassword, .text-box #AdminPassword, .text-box
{ {
border:1px solid #DDDEDF; border:1px solid #DDDEDF;
padding:4px; padding:4px;
width:98%; width:98%;
} }

112
src/Orchard.Web/Themes/SafeMode/Styles/site.css
View File

@@ -19,10 +19,10 @@ abbr,acronym { border:0;}
html {height: 100%;} html {height: 100%;}
body { body {
font: normal 100% Segoe UI,Trebuchet,Arial,Sans-Serif; font: normal 100% Segoe UI,Trebuchet,Arial,Sans-Serif;
height: 100%; height: 100%;
text-align:left; text-align:left;
color:#333; color:#333;
} }
/* ---------- Headings and defaults ---------- */ /* ---------- Headings and defaults ---------- */
@@ -41,24 +41,24 @@ h5 {font-size: 105%;}
} }
#header { #header {
background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right; background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right;
width:100%; width:100%;
height:50px; height:50px;
margin-bottom:40px; margin-bottom:40px;
} }
#branding{ #branding{
background:url(images/orchardLogo.gif) no-repeat; background:url(images/orchardLogo.gif) no-repeat;
display:block; display:block;
height:60px; height:60px;
margin:0 0 0 20px; margin:0 0 0 20px;
} }
#branding h1{ #branding h1{
font-size: 140%; font-size: 140%;
color:#fff; color:#fff;
padding:8px 0 0 40px; padding:8px 0 0 40px;
} }
@@ -78,14 +78,14 @@ input[type="password"] {
} }
form { form {
border:1px solid #DDDEDF; border:1px solid #DDDEDF;
padding:10px 0; padding:10px 0;
background:transparent url(images/backgroundVines.gif) no-repeat right bottom; background:transparent url(images/backgroundVines.gif) no-repeat right bottom;
} }
form h2 { form h2 {
font-size: 105%; font-size: 105%;
margin:20px 20px 0; margin:20px 20px 0;
} }
fieldset.data { fieldset.data {
@@ -93,17 +93,17 @@ fieldset.data {
} }
fieldset div { fieldset div {
margin:20px 20px 32px 20px; margin:20px 20px 32px 20px;
} }
fieldset.data div { fieldset.data div {
margin:10px 20px 16px 20px; margin:10px 20px 16px 20px;
} }
legend { legend {
font-size: 105%; font-size: 105%;
font-weight:500; font-weight:500;
border:none; border:none;
padding:10px 20px 0; padding:10px 20px 0;
} }
fieldset.data legend { fieldset.data legend {
padding-bottom:10px; padding-bottom:10px;
@@ -132,18 +132,18 @@ button, .button, .button:link, .button:visited {
font-size: 102%; font-size: 102%;
font-weight:600; font-weight:600;
background:#F5F5F5; background:#F5F5F5;
background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb)); background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb));
background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb); background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb);
border:1px solid #999999; border:1px solid #999999;
color:#2D2F25; color:#2D2F25;
cursor:pointer; cursor:pointer;
margin:0 0 20px 20px; margin:0 0 20px 20px;
padding:.2em 1.4em; padding:.2em 1.4em;
text-align:center; text-align:center;
text-shadow: 0 1px 1px rgba(0,0,0,.2); text-shadow: 0 1px 1px rgba(0,0,0,.2);
box-shadow: 0 4px 4px rgba(231,231,231,.2) inset; box-shadow: 0 4px 4px rgba(231,231,231,.2) inset;
-webkit-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset; -webkit-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset;
-moz-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset; -moz-box-shadow: 0 4px 4px rgba(231,231,231,.2) inset;
} }
button:hover, .button:hover, button:hover, .button:hover,
@@ -153,8 +153,8 @@ button:focus, .button:focus {
color:#fff; color:#fff;
text-decoration:none; text-decoration:none;
background: #ffac40; background: #ffac40;
background: -webkit-gradient(linear, left top, left bottom, from(#ffac40), to(#f06015)); background: -webkit-gradient(linear, left top, left bottom, from(#ffac40), to(#f06015));
background: -moz-linear-gradient(top, #ffac40, #f9760d); background: -moz-linear-gradient(top, #ffac40, #f9760d);
} }
@@ -164,17 +164,17 @@ button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
.primaryAction, .primaryAction:link, .primaryAction:visited { .primaryAction, .primaryAction:link, .primaryAction:visited {
background:#4687ad; background:#4687ad;
background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581)); background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581));
background:-moz-linear-gradient(top , #4687AD, #366581); background:-moz-linear-gradient(top , #4687AD, #366581);
border:1px solid #405f71; border:1px solid #405f71;
color:#fff; color:#fff;
} }
/* Confirmations, Messages and the like /* Confirmations, Messages and the like
***************************************************************/ ***************************************************************/
.message, .validation-summary-errors { .message, .validation-summary-errors {
margin:10px 0 4px 0; margin:10px 0 4px 0;
padding:4px; padding:4px;
} }
messages div.message { messages div.message {
@@ -182,7 +182,7 @@ messages div.message {
} }
span.message { span.message {
display:block; display:block;
margin:4px 0 4px 4px; margin:4px 0 4px 4px;
} }
.messages a { .messages a {
font-weight:bold; font-weight:bold;
@@ -190,30 +190,30 @@ span.message {
/* todo: (heskew) what else (other inputs) needs this? */ /* todo: (heskew) what else (other inputs) needs this? */
.critical.message, .validation-summary-errors, .critical.message, .validation-summary-errors,
.input-validation-error.text-box, .input-validation-error.text { .input-validation-error.text-box, .input-validation-error.text {
border:1px solid #990808; border:1px solid #990808;
} }
.critical.message, .validation-summary-errors { .critical.message, .validation-summary-errors {
background:#e68585; /* red */ background:#e68585; /* red */
color:#fff; color:#fff;
} }
.message-Information { .message-Information {
background:#e6f1c9; /* green */ background:#e6f1c9; /* green */
border:1px solid #cfe493; border:1px solid #cfe493;
color:#062232; color:#062232;
} }
.message-Warning { .message-Warning {
background:#fdf5bc; /* yellow */ background:#fdf5bc; /* yellow */
border:1px solid #ffea9b; border:1px solid #ffea9b;
} }
.message-Error { .message-Error {
background:#e68585; /* red */ background:#e68585; /* red */
border:1px solid #990808; border:1px solid #990808;
color:#fff; color:#fff;
}.debug.message { }.debug.message {
background:#eee; background:#eee;
border:1px dashed #D2D6C6; border:1px dashed #D2D6C6;
color:#7a7a7a; color:#7a7a7a;
margin:20px 0 14px 0; margin:20px 0 14px 0;
} }
.debug.message:before { .debug.message:before {
content:"DEBUG » "; content:"DEBUG » ";

4
src/Orchard.Web/Themes/SafeMode/Views/Document.cshtml
View File

@@ -1,7 +1,7 @@
@using Orchard.Mvc.Html; @using Orchard.Mvc.Html;
@using Orchard.UI.Resources; @using Orchard.UI.Resources;
@{ @{
RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")}); RegisterLink(new LinkEntry {Type = "image/x-icon", Rel = "shortcut icon", Href = Url.Content("~/modules/orchard.themes/Content/orchard.ico")});
} }
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" class="static @Html.ClassForPage()"> <html lang="en" class="static @Html.ClassForPage()">
@@ -14,7 +14,7 @@
} }
@*Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);*@ @*Model.Zones.AddRenderPartial("head:before", "HeadPreload", Model);*@
@*Html.Zone("head", ":metas :styles :scripts"); %>*@ @*Html.Zone("head", ":metas :styles :scripts"); %>*@
@Display(Model.Head) @Display(Model.Head)
<script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script> <script>(function(d){d.className="dyn "+d.className.substring(7,d.length);})(document.documentElement);</script>
</head> </head>
<body> <body>

28
src/Orchard.Web/Themes/TheAdmin/Styles/ie6.css
View File

@@ -1,18 +1,18 @@
body{ body{
background:#fcfcfc; background:#fcfcfc;
} }
#branding #branding
{ {
height:50px; height:50px;
margin:0 0 0 20px; margin:0 0 0 20px;
background:transparent url(images/orchardLogo.gif) no-repeat scroll 0 0; background:transparent url(images/orchardLogo.gif) no-repeat scroll 0 0;
} }
#branding h1 { #branding h1 {
padding:8px 0 0 38px; padding:8px 0 0 38px;
} }
#content { #content {
overflow:auto; overflow:auto;
padding:1.4em; padding:1.4em;
} }
/* Navigation /* Navigation
@@ -20,26 +20,26 @@
#navigation ul li { #navigation ul li {
border:0; border:0;
margin:0 0 0 4px; margin:0 0 0 4px;
} }
#navigation li h3 a #navigation li h3 a
{ {
color:#333; color:#333;
padding:6px 4px 8px 0px; padding:6px 4px 8px 0px;
} }
/* Forms /* Forms
----------------------------------------------------------*/ ----------------------------------------------------------*/
legend { legend {
color:#333; color:#333;
} }
#AdminPassword, .text-box #AdminPassword, .text-box
{ {
border:1px solid #DDDEDF; border:1px solid #DDDEDF;
padding:4px; padding:4px;
width:98%; width:98%;
} }
.manage .manage

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

@@ -29,15 +29,15 @@ small, strike, strong, sub, sup, tt, var,
dl, dt, dd, ol, ul, li, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td, button, submit { table, caption, tbody, tfoot, thead, tr, th, td, button, submit {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0; border: 0;
outline: 0; outline: 0;
font-weight: inherit; font-weight: inherit;
font-style: inherit; font-style: inherit;
font-size: 100%; font-size: 100%;
font-family: inherit; font-family: inherit;
vertical-align: baseline; vertical-align: baseline;
} }
/* Remember focus styles! */ /* Remember focus styles! */
@@ -64,11 +64,11 @@ header, footer, aside, nav, article { display: block; }
.group:after .group:after
{ {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
visibility: hidden; visibility: hidden;
} }
@@ -78,31 +78,31 @@ header, footer, aside, nav, article { display: block; }
/* Default font settings. /* Default font settings.
The font-size 81.3% sets the base font to 13px The font-size 81.3% sets the base font to 13px
Pixels EMs Percent Points Pixels EMs Percent Points
1px 0.077em 7.7% 1pt 1px 0.077em 7.7% 1pt
2px 0.154em 15.4% 2pt 2px 0.154em 15.4% 2pt
3px 0.231em 23.1% 3pt 3px 0.231em 23.1% 3pt
4px 0.308em 30.8% 3pt 4px 0.308em 30.8% 3pt
5px 0.385em 38.5% 4pt 5px 0.385em 38.5% 4pt
6px 0.462em 46.2% 5pt 6px 0.462em 46.2% 5pt
7px 0.538em 53.8% 5pt 7px 0.538em 53.8% 5pt
8px 0.615em 61.5% 6pt 8px 0.615em 61.5% 6pt
9px 0.692em 69.2% 7pt 9px 0.692em 69.2% 7pt
10px 0.769em 76.9% 8pt 10px 0.769em 76.9% 8pt
11px 0.846em 84.6% 8pt 11px 0.846em 84.6% 8pt
12px 0.923em 92.3% 9pt 12px 0.923em 92.3% 9pt
13px 1em 100% 10pt 13px 1em 100% 10pt
14px 1.077em 107.7% 11pt 14px 1.077em 107.7% 11pt
15px 1.154em 115.4% 11pt 15px 1.154em 115.4% 11pt
16px 1.231em 123.1% 12pt 16px 1.231em 123.1% 12pt
17px 1.308em 130.8% 13pt 17px 1.308em 130.8% 13pt
18px 1.385em 138.5% 14pt 18px 1.385em 138.5% 14pt
19px 1.462em 146.2% 14pt 19px 1.462em 146.2% 14pt
20px 1.538em 153.8% 15pt 20px 1.538em 153.8% 15pt
21px 1.615em 161.5% 16pt 21px 1.615em 161.5% 16pt
22px 1.692em 169.2% 17pt 22px 1.692em 169.2% 17pt
23px 1.769em 176.9% 17pt 23px 1.769em 176.9% 17pt
24px 1.846em 184.6% 18pt 24px 1.846em 184.6% 18pt
*/ */
html { html {
@@ -225,8 +225,8 @@ form.link button:hover {
/* Header - Branding and Login /* Header - Branding and Login
***************************************************************/ ***************************************************************/
#header { #header {
background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right; background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right;
height:50px; height:50px;
} }
#header #app { #header #app {
float:left; float:left;
@@ -234,29 +234,29 @@ form.link button:hover {
padding:.4em 0; padding:.4em 0;
} }
#header #app a { #header #app a {
background:url(images/orchardLogo.gif) no-repeat; background:url(images/orchardLogo.gif) no-repeat;
display:block; display:block;
height:60px; height:60px;
margin:-11px 0 0 14px; margin:-11px 0 0 14px;
text-indent:-9999px; text-indent:-9999px;
width:40px; width:40px;
} }
#site { #site {
font-size:1.385em; /*18px*/ font-size:1.385em; /*18px*/
} }
#site a, #site a:visited, #site a:active { #site a, #site a:visited, #site a:active {
color:#fff; color:#fff;
float:left; float:left;
line-height:2.6em; line-height:2.6em;
position:relative; position:relative;
} }
#login { #login {
color:#fff; color:#fff;
display:block; display:block;
float:right; float:right;
margin:14px 20px 0 0; margin:14px 20px 0 0;
white-space:nowrap; white-space:nowrap;
} }
#login a, #login a:link, #login a:visited { #login a, #login a:link, #login a:visited {
@@ -276,7 +276,7 @@ form.link button:hover {
width:0; width:0;
} }
#menu .menu-admin li { #menu .menu-admin li {
margin:5px 0 17px 4px; margin:5px 0 17px 4px;
} }
#menu .menu-admin ul li { #menu .menu-admin ul li {
border:0; border:0;
@@ -286,19 +286,19 @@ form.link button:hover {
padding:0 0 0 8px; padding:0 0 0 8px;
} }
#menu .menu-admin li h3 a, #menu .menu-admin li h3 span { #menu .menu-admin li h3 a, #menu .menu-admin li h3 span {
line-height:1.2em; line-height:1.2em;
} }
#menu .menu-admin ul a, #menu .menu-admin ul a:link, #menu .menu-admin ul a:visited { #menu .menu-admin ul a, #menu .menu-admin ul a:link, #menu .menu-admin ul a:visited {
color:#2d2f25; color:#2d2f25;
display:block; display:block;
line-height:1.2em; line-height:1.2em;
padding:.4em 0 .4em 12px; padding:.4em 0 .4em 12px;
text-decoration:none; text-decoration:none;
} }
#menu .menu-admin ul a:hover, #menu .menu-admin ul a:active, #menu .menu-admin ul a:focus { #menu .menu-admin ul a:hover, #menu .menu-admin ul a:active, #menu .menu-admin ul a:focus {
background:#f5f5f5; background:#f5f5f5;
color: #000; color: #000;
text-decoration:underline; text-decoration:underline;
} }
#menu .menu-admin li.section-dashboard h3 { #menu .menu-admin li.section-dashboard h3 {
padding:.4em 0 0 .4em; padding:.4em 0 0 .4em;
@@ -393,7 +393,7 @@ form.link button:hover {
/* Confirmations, Messages and the like /* Confirmations, Messages and the like
***************************************************************/ ***************************************************************/
.message, .validation-summary-errors { .message, .validation-summary-errors {
margin:10px 0 4px 0; margin:10px 0 4px 0;
padding:4px; padding:4px;
} }
messages div.message { messages div.message {
@@ -401,7 +401,7 @@ messages div.message {
} }
span.message { span.message {
display:block; display:block;
margin:4px 0 4px 4px; margin:4px 0 4px 4px;
} }
.messages a { .messages a {
font-weight:bold; font-weight:bold;
@@ -409,30 +409,30 @@ span.message {
/* todo: (heskew) what else (other inputs) needs this? */ /* todo: (heskew) what else (other inputs) needs this? */
.critical.message, .validation-summary-errors, .critical.message, .validation-summary-errors,
.input-validation-error.text-box, .input-validation-error.text { .input-validation-error.text-box, .input-validation-error.text {
border:1px solid #990808; border:1px solid #990808;
} }
.critical.message, .validation-summary-errors { .critical.message, .validation-summary-errors {
background:#e68585; /* red */ background:#e68585; /* red */
color:#fff; color:#fff;
} }
.message-Information { .message-Information {
background:#e6f1c9; /* green */ background:#e6f1c9; /* green */
border:1px solid #cfe493; border:1px solid #cfe493;
color:#062232; color:#062232;
} }
.message-Warning { .message-Warning {
background:#fdf5bc; /* yellow */ background:#fdf5bc; /* yellow */
border:1px solid #ffea9b; border:1px solid #ffea9b;
} }
.message-Error { .message-Error {
background:#e68585; /* green */ background:#e68585; /* green */
border:1px solid #990808; border:1px solid #990808;
color:#fff; color:#fff;
}.debug.message { }.debug.message {
background:#eee; background:#eee;
border:1px dashed #D2D6C6; border:1px dashed #D2D6C6;
color:#7a7a7a; color:#7a7a7a;
margin:20px 0 14px 0; margin:20px 0 14px 0;
} }
.debug.message:before { .debug.message:before {
content:"DEBUG » "; content:"DEBUG » ";
@@ -470,7 +470,7 @@ label.bulk-order {
text-transform:lowercase; text-transform:lowercase;
} }
label span { label span {
font-weight:normal; font-weight:normal;
} }
label input { label input {
vertical-align:text-top; vertical-align:text-top;
@@ -496,7 +496,7 @@ select {
padding:1px; padding:1px;
} }
select:focus, textarea:focus, input.text:focus, input.text-box:focus { select:focus, textarea:focus, input.text:focus, input.text-box:focus {
border-color:#666d51; border-color:#666d51;
} }
input.check-box { input.check-box {
margin-left:0; margin-left:0;
@@ -546,12 +546,12 @@ form.link button {
button.primaryAction, .button.primaryAction, .button.primaryAction:link, .button.primaryAction:visited { button.primaryAction, .button.primaryAction, .button.primaryAction:link, .button.primaryAction:visited {
background:#4687ad; background:#4687ad;
border:1px solid #405f71; border:1px solid #405f71;
color:#fff; color:#fff;
/*CSS3 properties*/ /*CSS3 properties*/
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#4687AD', endColorstr='#366581'); filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#4687AD', endColorstr='#366581');
background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581)); background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581));
background:-moz-linear-gradient(top , #4687AD, #366581); background:-moz-linear-gradient(top , #4687AD, #366581);
} }
button.remove, .remove.button, .remove.button:link, .remove.button:visited { button.remove, .remove.button, .remove.button:link, .remove.button:visited {
background-color:#DECCCA; background-color:#DECCCA;
@@ -574,48 +574,48 @@ button.remove:focus::-moz-focus-inner, .remove.button:focus::-moz-focus-inner {
} }
input[type="submit"], input[type="reset"], input[type="button"], button, submit, .button, .button:link, .button:visited input[type="submit"], input[type="reset"], input[type="button"], button, submit, .button, .button:link, .button:visited
{ {
color:#333; color:#333;
background:#F5F5F5; background:#F5F5F5;
border:1px solid #999; border:1px solid #999;
cursor:pointer; cursor:pointer;
padding: 0 12px 2px 12px; padding: 0 12px 2px 12px;
text-align:center; text-align:center;
/*CSS3 properties*/ /*CSS3 properties*/
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f5f5f5', endColorstr='#cbcbcb'); filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f5f5f5', endColorstr='#cbcbcb');
background: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#cbcbcb)); background: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#cbcbcb));
background: -moz-linear-gradient(top, #f5f5f5, #cbcbcb); background: -moz-linear-gradient(top, #f5f5f5, #cbcbcb);
box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3); box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
-webkit-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3); -webkit-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
-moz-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3); -moz-box-shadow: inset 0px 0px 1px rgba(255, 255, 255, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
border-radius: 3px; border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
} }
input[type="submit"]:hover,input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover, .button.primaryAction:hover { input[type="submit"]:hover,input[type="reset"]:hover, input[type="button"]:hover, button:hover, .button:hover, .button.primaryAction:hover {
text-decoration:none; text-decoration:none;
background: #ffac40; background: #ffac40;
color:#fff; color:#fff;
border:1px solid #bb8b2d; border:1px solid #bb8b2d;
/*CSS3 properties*/ /*CSS3 properties*/
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ffac40', endColorstr='#f9760d'); filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ffac40', endColorstr='#f9760d');
background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffac40), to(#f9760d)); background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffac40), to(#f9760d));
background: -moz-linear-gradient(top, #ffac40, #f9760d); background: -moz-linear-gradient(top, #ffac40, #f9760d);
} }
input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active, button:active, .buton:active, .button.primaryAction:active { input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active, button:active, .buton:active, .button.primaryAction:active {
text-decoration:none; text-decoration:none;
background: #62a9e2; background: #62a9e2;
color:#fff; color:#fff;
border:1px solid #bb772d; border:1px solid #bb772d;
/*CSS3 properties*/ /*CSS3 properties*/
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fece3b', endColorstr='#fe6001'); filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fece3b', endColorstr='#fe6001');
background: -webkit-gradient(linear, 0 0, 0 100%, from(#fece3b), to(#fe6001)); background: -webkit-gradient(linear, 0 0, 0 100%, from(#fece3b), to(#fe6001));
background: -moz-linear-gradient(top, #fece3b, #fe6001); background: -moz-linear-gradient(top, #fece3b, #fe6001);
box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3); box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
-moz-box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3); -moz-box-shadow: inset 0px 0px 1px rgba(254, 225, 109, 1.0), 1px 1px 1px rgba(102, 102, 102, 0.3);
-webkit-box-shadow: inset 1px 1px 1px rgba(254, 225, 109, 0.6), 1px 1px 1px rgba(102, 102, 102, 0.1); -webkit-box-shadow: inset 1px 1px 1px rgba(254, 225, 109, 0.6), 1px 1px 1px rgba(102, 102, 102, 0.1);
} }
input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner { input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner {
border: 1px dotted transparent; border: 1px dotted transparent;
@@ -683,36 +683,36 @@ input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .b
----------------------------------------------------------*/ ----------------------------------------------------------*/
table.items { table.items {
margin:0 0 1.4em 0; margin:0 0 1.4em 0;
background:#fff; background:#fff;
border:1px solid #eaeaea; border:1px solid #eaeaea;
border-bottom:none; border-bottom:none;
border-collapse:separate; border-collapse:separate;
border-spacing:0; border-spacing:0;
width:100%; width:100%;
} }
table.items caption { table.items caption {
padding:8px 0; padding:8px 0;
text-indent:0; text-indent:0;
} }
table.items col { table.items col {
border-spacing:0; border-spacing:0;
display:table-column; display:table-column;
} }
table.items colgroup table.items colgroup
{ {
border-spacing:0; border-spacing:0;
display:table-column-group; display:table-column-group;
} }
table.items tbody { table.items tbody {
border-spacing:0; border-spacing:0;
vertical-align:middle; vertical-align:middle;
} }
table.items thead, table.items th { table.items thead, table.items th {
background:#f5f5f5; background:#f5f5f5;
font-weight:700; font-weight:700;
overflow:hidden; overflow:hidden;
text-align:left; text-align:left;
white-space:nowrap; white-space:nowrap;
} }
/* todo: (heskew) hook back up */ /* todo: (heskew) hook back up */
table.items tr.hover { table.items tr.hover {
@@ -721,11 +721,11 @@ table.items tr.hover {
table.items tr.critical {background:#e68585; border:inherit;} table.items tr.critical {background:#e68585; border:inherit;}
table.items tr.warning {background:#fdf5bc; border:inherit;} table.items tr.warning {background:#fdf5bc; border:inherit;}
table.items th, table.items td { table.items th, table.items td {
border-bottom:1px solid #eaeaea; border-bottom:1px solid #eaeaea;
border-spacing:0px; border-spacing:0px;
display:table-cell; display:table-cell;
padding:8px 12px; padding:8px 12px;
vertical-align:middle; vertical-align:middle;
} }
/* Content item lists /* Content item lists
@@ -829,7 +829,7 @@ table.items th, table.items td {
border-style:dashed; border-style:dashed;
margin-left:0; margin-left:0;
margin-right:2em; margin-right:2em;
width:350px; width:350px;
} }
.permalink input.text:focus { .permalink input.text:focus {
background:#FFF; background:#FFF;
@@ -858,12 +858,12 @@ table.items th, table.items td {
padding:6px; padding:6px;
/*CSS3 properties*/ /*CSS3 properties*/
filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5'); filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5');
background: -webkit-gradient(linear, 0 0, 0 100%, from(#f7f7f7), to(#f5f5f5)); background: -webkit-gradient(linear, 0 0, 0 100%, from(#f7f7f7), to(#f5f5f5));
background: -moz-linear-gradient(top, #f7f7f7, #f5f5f5); background: -moz-linear-gradient(top, #f7f7f7, #f5f5f5);
border-radius: 3px; border-radius: 3px;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
} }
.edit-item-sidebar fieldset { .edit-item-sidebar fieldset {
@@ -911,7 +911,7 @@ fieldset.publish-later-datetime input {
} }
/* todo: needed? */ /* todo: needed? */
.clearBoth { .clearBoth {
clear:both; clear:both;
} }
.placeholderd { .placeholderd {
color:#ccc; color:#ccc;

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

@@ -7,7 +7,7 @@
@{ @{
Style.Include("site.css"); Style.Include("site.css");
Script.Require("jQuery"); Script.Require("jQuery");
Script.Require("ShapesBase"); Script.Require("ShapesBase");
Script.Include("admin.js"); 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 8", Rel = "stylesheet", Type = "text/css", Href = Url.Content("../Styles/ie.css") }.AddAttribute("media", "screen, projection"));

6
src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml
View File

@@ -1,7 +1,7 @@
@using System.Web.Routing; @using System.Web.Routing;
@using Orchard.Utility.Extensions; @using Orchard.Utility.Extensions;
@{ @{
Script.Require("jQuery"); Script.Require("jQuery");
Script.Include("admin.js"); Script.Include("admin.js");
IEnumerable<dynamic> firstLevelMenuItems = Model; IEnumerable<dynamic> firstLevelMenuItems = Model;
@@ -9,7 +9,7 @@
var tag = Tag(Model, "ul"); var tag = Tag(Model, "ul");
} }
@tag.StartElement @tag.StartElement
@foreach(var firstLevelMenuItem in Model) { @foreach(var firstLevelMenuItem in Model) {
IEnumerable<dynamic> secondLevelMenuItems = firstLevelMenuItem; IEnumerable<dynamic> secondLevelMenuItems = firstLevelMenuItem;
string sectionHeaderText = firstLevelMenuItem.Text; string sectionHeaderText = firstLevelMenuItem.Text;
@@ -33,7 +33,7 @@
<h3>@sectionHeaderMarkup</h3> <h3>@sectionHeaderMarkup</h3>
if (secondLevelMenuItems.Count() > 1) { if (secondLevelMenuItems.Count() > 1) {
<ul class="menuItems"> <ul class="menuItems">
@foreach(var secondLevelMenuItem in secondLevelMenuItems) { @foreach(var secondLevelMenuItem in secondLevelMenuItems) {
<li> <li>
<a href="@secondLevelMenuItem.Href">@secondLevelMenuItem.Text</a> <a href="@secondLevelMenuItem.Href">@secondLevelMenuItem.Text</a>
</li> </li>

216
src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
View File

@@ -29,15 +29,15 @@ small, strike, strong, sub, sup, tt, var,
dl, dt, dd, ol, ul, li, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td { table, caption, tbody, tfoot, thead, tr, th, td {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0; border: 0;
outline: 0; outline: 0;
font-weight: inherit; font-weight: inherit;
font-style: inherit; font-style: inherit;
font-size: 100%; font-size: 100%;
font-family: inherit; font-family: inherit;
vertical-align: baseline; vertical-align: baseline;
} }
/* Remember focus styles! */ /* Remember focus styles! */
@@ -64,20 +64,20 @@ header, footer, aside, nav, article { display: block; }
.group:after .group:after
{ {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
visibility: hidden; visibility: hidden;
} }
.zone:after /* Self clears every zone container */ .zone:after /* Self clears every zone container */
{ {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
visibility: hidden; visibility: hidden;
} }
@@ -88,26 +88,26 @@ header, footer, aside, nav, article { display: block; }
/* Default font settings. /* Default font settings.
The font-size 81.3% sets the base font to 13px The font-size 81.3% sets the base font to 13px
Pixels EMs Percent Points Pixels EMs Percent Points
6px 0.462em 46.2% 5pt 6px 0.462em 46.2% 5pt
7px 0.538em 53.8% 5pt 7px 0.538em 53.8% 5pt
8px 0.615em 61.5% 6pt 8px 0.615em 61.5% 6pt
9px 0.692em 69.2% 7pt 9px 0.692em 69.2% 7pt
10px 0.769em 76.9% 8pt 10px 0.769em 76.9% 8pt
11px 0.846em 84.6% 8pt 11px 0.846em 84.6% 8pt
12px 0.923em 92.3% 9pt 12px 0.923em 92.3% 9pt
13px 1em 100% 10pt 13px 1em 100% 10pt
14px 1.077em 107.7% 11pt 14px 1.077em 107.7% 11pt
15px 1.154em 115.4% 11pt 15px 1.154em 115.4% 11pt
16px 1.231em 123.1% 12pt 16px 1.231em 123.1% 12pt
17px 1.308em 130.8% 13pt 17px 1.308em 130.8% 13pt
18px 1.385em 138.5% 14pt 18px 1.385em 138.5% 14pt
19px 1.462em 146.2% 14pt 19px 1.462em 146.2% 14pt
20px 1.538em 153.8% 15pt 20px 1.538em 153.8% 15pt
21px 1.615em 161.5% 16pt 21px 1.615em 161.5% 16pt
22px 1.692em 169.2% 17pt 22px 1.692em 169.2% 17pt
23px 1.769em 176.9% 17pt 23px 1.769em 176.9% 17pt
24px 1.846em 184.6% 18pt 24px 1.846em 184.6% 18pt
*/ */
body { body {
@@ -172,7 +172,7 @@ acronym { border-bottom: 1px dotted #666; }
address { margin: 0 0 0.923em; font-style: italic; } address { margin: 0 0 0.923em; font-style: italic; }
del { color:#666; } del { color:#666; }
pre { margin: 0.923em 0; white-space: pre; } pre { margin: 0.923em 0; white-space: pre; }
pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.462em; } pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height: 1.462em; }
@@ -187,12 +187,12 @@ label { font-weight: normal; display:block; padding: 0 0 0.3em 0; }
label.forcheckbox { margin:0 0 0 .4em; display:inline; } label.forcheckbox { margin:0 0 0 .4em; display:inline; }
input[type="text"], input[type="password"] { input[type="text"], input[type="password"] {
display: block; display: block;
padding: 0.3em; padding: 0.3em;
} }
input[type="checkbox"] { input[type="checkbox"] {
margin:.2em 0 1.2em 0; margin:.2em 0 1.2em 0;
} }
fieldset ol { list-style-type:none; padding: 0; margin: 0; } fieldset ol { list-style-type:none; padding: 0; margin: 0; }
@@ -205,61 +205,61 @@ fieldset ol li { margin: 0 0 6px 0; }
#layout-wrapper { } #layout-wrapper { }
#layout-header, #layout-featured, #layout-before-main, #layout-main, #layout-footer, #layout-after-main, #layout-tripel { #layout-header, #layout-featured, #layout-before-main, #layout-main, #layout-footer, #layout-after-main, #layout-tripel {
width:960px; width:960px;
margin:0 auto; margin:0 auto;
} }
/* Navigation */ /* Navigation */
#layout-navigation #layout-navigation
{ {
width: 960px; width: 960px;
margin: 0 auto; margin: 0 auto;
display: block; display: block;
border-bottom: 1px solid #dbdbdb; border-bottom: 1px solid #dbdbdb;
} }
nav ul nav ul
{ {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
} }
nav ul li nav ul li
{ {
border:1px solid #dbdbdb; border:1px solid #dbdbdb;
background:#f6f6f6; background:#f6f6f6;
display:block; display:block;
float:left; float:left;
margin:0 2px -1px 0; margin:0 2px -1px 0;
} }
nav ul li.current nav ul li.current
{ {
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
background:#fff; background:#fff;
} }
nav ul a nav ul a
{ {
padding:0 18px; padding:0 18px;
display:block; display:block;
float:left; float:left;
color: #333; color: #333;
font-size: 1.077em; font-size: 1.077em;
text-decoration:none; text-decoration:none;
line-height:24px; line-height:24px;
} }
#layout-header {} #layout-header {}
#branding #branding
{ {
font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif; font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif;
font-size: 2.9em; font-size: 2.9em;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
#branding a #branding a
{ {
text-decoration:none; text-decoration:none;
color: #434343; color: #434343;
} }
#layout-navigation {} #layout-navigation {}
#layout-featured {} #layout-featured {}
#layout-before-main {} #layout-before-main {}
@@ -278,22 +278,22 @@ nav ul
#tripel-third {} #tripel-third {}
#layout-footer {} #layout-footer {}
#footer-quad {} #footer-quad {}
#footer-quad-first {} #footer-quad-first {}
#footer-quad-second {} #footer-quad-second {}
#footer-quad-third {} #footer-quad-third {}
#footer-quad-forth {} #footer-quad-forth {}
#footer-sig {} #footer-sig {}
/* Zones */ /* Zones */
.zone .zone
{ {
padding: 12px; padding: 12px;
/* Enable this to see zone visualizations /* Enable this to see zone visualizations
background-color: yellow; background-color: yellow;
box-shadow:inset 0 0 1px purple; box-shadow:inset 0 0 1px purple;
-moz-box-shadow:inset 0 0 1px purple; -moz-box-shadow:inset 0 0 1px purple;
-webkit-box-shadow:inset 0 0 1px purple; -webkit-box-shadow:inset 0 0 1px purple;
*/ */
} }
.zone-header { padding: 30px 0 30px 12px; position: relative; } .zone-header { padding: 30px 0 30px 12px; position: relative; }
@@ -527,15 +527,15 @@ nav ul
***************************************************************/ ***************************************************************/
input[type="submit"], input[type="button"], button, .button, .button:link, .button:visited { input[type="submit"], input[type="button"], button, .button, .button:link, .button:visited {
color:#333; color:#333;
background:#F5F5F5; background:#F5F5F5;
background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb)); background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb));
background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb); background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb);
border:1px solid #999; border:1px solid #999;
cursor:pointer; cursor:pointer;
margin:.2em 0 2em 0; margin:.2em 0 2em 0;
padding:.3em 1.8em; padding:.3em 1.8em;
text-align:center; text-align:center;
} }
input[type="submit"]:hover, input[type="button"]:hover, input[type="submit"]:hover, input[type="button"]:hover,
@@ -544,8 +544,8 @@ input[type="submit"]:focus, input[type="button"]:focus,
button:hover, .button:hover, button:hover, .button:hover,
button:active, .button:active, button:active, .button:active,
button:focus, .button:focus { button:focus, .button:focus {
text-decoration:none; text-decoration:none;
background: #ebebeb; background: #ebebeb;
background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb)); background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb));
background:-moz-linear-gradient(top , #e1e1e1, #ebebeb); background:-moz-linear-gradient(top , #e1e1e1, #ebebeb);
} }

2
src/Orchard/Mvc/Html/ContainerExtensions.cs
View File

@@ -1,7 +1,5 @@
using System; using System;
using System.Web.Mvc; using System.Web.Mvc;
using Autofac;
using Autofac.Integration.Web;
namespace Orchard.Mvc.Html { namespace Orchard.Mvc.Html {
public static class ContainerExtensions { public static class ContainerExtensions {

2
src/Orchard/Mvc/ViewPage.cs
View File

@@ -48,7 +48,7 @@ namespace Orchard.Mvc {
} }
} }
public override void InitHelpers() { public override void InitHelpers() {
base.InitHelpers(); base.InitHelpers();
_workContext = ViewContext.GetWorkContext(); _workContext = ViewContext.GetWorkContext();

1
src/Orchard/UI/Resources/ResourceManager.cs
View File

@@ -6,7 +6,6 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
using Autofac.Features.Metadata; using Autofac.Features.Metadata;
using Orchard.DisplayManagement.Descriptors;
using Orchard.Environment.Extensions.Models; using Orchard.Environment.Extensions.Models;
namespace Orchard.UI.Resources { namespace Orchard.UI.Resources {