diff --git a/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml b/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml index 874a5fb9c..df01f3a7e 100644 --- a/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml +++ b/src/Orchard.Web/Core/Common/Views/Parts/Common.Body.Summary.cshtml @@ -2,8 +2,8 @@ also, doing this here, inline, until we have a pluggable processing model (both in and out) also, ...this is ugly *@ @{ - Orchard.ContentManagement.ContentItem contentItem = Model.ContentPart.ContentItem; - string bodyHtml = Model.Html.ToString(); + Orchard.ContentManagement.ContentItem contentItem = Model.ContentPart.ContentItem; + string bodyHtml = Model.Html.ToString(); var body = new HtmlString(Html.Excerpt(bodyHtml, 200).ToString().Replace(Environment.NewLine, "

" + Environment.NewLine + "

")); }

@body @Html.ItemDisplayLink(T("more").ToString(), contentItem)

\ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml index 8eecd5e1c..1af6b9171 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Create.cshtml @@ -1,6 +1,6 @@ @{ var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName; - var pageTitle = T("Create {0}", typeDisplayName); + var pageTitle = T("Create {0}", typeDisplayName); }

@Html.TitleForPage((string)pageTitle.Text)

@using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml index 8f298bbb4..7cd4e1a3d 100644 --- a/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Admin/Edit.cshtml @@ -1,9 +1,9 @@ @{ - var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName; - var pageTitle = T("Edit Content"); - if (!string.IsNullOrWhiteSpace(typeDisplayName)) { - pageTitle = T("Edit {0}", typeDisplayName); - } + var typeDisplayName = Model.ContentItem.TypeDefinition.DisplayName; + var pageTitle = T("Edit Content"); + if (!string.IsNullOrWhiteSpace(typeDisplayName)) { + pageTitle = T("Edit {0}", typeDisplayName); + } }

@Html.TitleForPage(pageTitle)

@using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml b/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml index d41f9bda4..e946f9ae8 100644 --- a/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml +++ b/src/Orchard.Web/Core/Reports/Views/Admin/Display.cshtml @@ -2,23 +2,23 @@ @using Orchard.Core.Reports.ViewModels;

@Html.TitleForPage(T("Display Report").ToString())

@using(Html.BeginFormAntiForgeryPost()) { - @Html.ValidationSummary() -
- - - - - - - - - - - - - - - + @Html.ValidationSummary() +
+
@T("Type")@T("Message")@T("Date")
+ + + + + + + + + + + + + + @foreach (var reportEntry in Model.Report.Entries) {
@T("Type")@T("Message")@T("Date")
diff --git a/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml index 90249bf4d..714d94c49 100644 --- a/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Core/Reports/Views/Admin/Index.cshtml @@ -2,23 +2,23 @@ @using Orchard.Core.Reports.ViewModels;

@Html.TitleForPage(T("Manage Reports").ToString())

@using(Html.BeginFormAntiForgeryPost()) { - @Html.ValidationSummary() -
- - - - - - - - - - - - - - - + @Html.ValidationSummary() +
+
@T("Name")@T("Title")@T("Date")
+ + + + + + + + + + + + + + @foreach (var report in Model.Reports) { + + + + } +
@T("Name")@T("Title")@T("Date")
diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml index 483135db2..4e34d34f1 100644 --- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml +++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml @@ -17,21 +17,21 @@ @using(Script.Foot()){ } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml index 9b7bf9617..2323d0ed0 100644 --- a/src/Orchard.Web/Core/Shapes/Views/Document.cshtml +++ b/src/Orchard.Web/Core/Shapes/Views/Document.cshtml @@ -1,7 +1,7 @@ @using Orchard.Mvc.Html; @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 Script.Include("html5.js").AtLocation(ResourceLocation.Head); diff --git a/src/Orchard.Web/Core/Shapes/Views/Menu.cshtml b/src/Orchard.Web/Core/Shapes/Views/Menu.cshtml index b483973cd..d711f4b34 100644 --- a/src/Orchard.Web/Core/Shapes/Views/Menu.cshtml +++ b/src/Orchard.Web/Core/Shapes/Views/Menu.cshtml @@ -1,6 +1,6 @@ @{ // Model is Model.Menu from the layout (Layout.Menu) - var tag = Tag(Model, "ul"); + var tag = Tag(Model, "ul"); } @permission.Description + @if (Model.CurrentPermissions.Contains(permission.Name)) { + + } else { + + } + + @if (Model.EffectivePermissions.Contains(permission.Name)) { + + } else { + + } +
+
+ }
@if (Model.Name != "Administrator") { } -
+ } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml index 1bcbe8588..b89d93b0c 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml @@ -6,7 +6,7 @@ @using (Html.BeginFormAntiForgeryPost()) { @Html.ValidationSummary()
- @Html.HiddenFor(m=>m.Id) + @Html.HiddenFor(m=>m.Id) @Html.LabelFor(m => m.TagName, T("Tag Name")) @Html.TextBoxFor(m=>m.TagName, new { @class = "text" })
@@ -21,16 +21,16 @@ } else { - - - - - - - - - - + + + + + + + + + + @foreach (IContent content in View.ContentItems) { diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml index deb569a1c..e22a4a6b6 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml @@ -12,7 +12,7 @@ @Display.EditorTemplate(TemplateName: "Parts/CreateTag", Model: View.CreateTag != null ? View.CreateTag : new TagsAdminCreateViewModel()) @using(Html.BeginFormAntiForgeryPost()) { -
+
- - - + + + - @{var tagIndex = 0;} - @foreach (var tagEntry in Model.Tags) { + @{var tagIndex = 0;} + @foreach (var tagEntry in Model.Tags) { tagIndex = tagIndex + 1; - } + }
@T("Content Type")@T("Name")
@T("Content Type")@T("Name")
@content.ContentItem.ContentType.CamelFriendly()
 ↓@*todo: (heskew) something more appropriate for "this applies to the bulk actions*@@T("Name") ↓@*todo: (heskew) something more appropriate for "this applies to the bulk actions*@@T("Name")
@@ -48,7 +48,7 @@
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml index cc4c6ee26..5f12fa237 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml @@ -1,10 +1,10 @@ @model Orchard.Tags.ViewModels.TagsSearchViewModel @{ - Html.AddTitleParts(T("Tags").ToString()); - Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString()); - Model.List.Classes.Add("tagged-posts"); - Model.List.Classes.Add("content-items"); + Html.AddTitleParts(T("Tags").ToString()); + Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString()); + Model.List.Classes.Add("tagged-posts"); + Model.List.Classes.Add("content-items"); }

@T("Contents tagged with {0}", Model.TagName)

diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml index 58e5dfab6..1f0892ff1 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/Tags.ShowTags.cshtml @@ -1,11 +1,11 @@ @{ - var tagsHtml = new List(); - foreach(var t in Model.Tags) { - if (tagsHtml.Any()) { - tagsHtml.Add(new HtmlString(", ")); - } - tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { })); - } + var tagsHtml = new List(); + foreach(var t in Model.Tags) { + if (tagsHtml.Any()) { + tagsHtml.Add(new HtmlString(", ")); + } + tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { })); + } } @if (tagsHtml.Any()) { diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css index ef12b4820..2e4199200 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Themes/Styles/orchard-themes-admin.css @@ -14,19 +14,19 @@ overflow:hidden; } .templates img, .themePreviewImage { - border:1px solid #e8e8e8; + border:1px solid #e8e8e8; height:200px; margin:.27em 0 .93em 0; display:block; } .previewImage { - border:1px solid #525e50; - height:50%; - width:50%; + border:1px solid #525e50; + height:50%; + width:50%; } .themes #main h2 { margin:1em 0 0 0; } .themePreviewImage { - height:300px; + height:300px; } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml index 73fc7c115..d7588f591 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.cshtml @@ -2,63 +2,63 @@ @{ Style.Require("ThemesAdmin"); }

@Html.TitleForPage(T("Manage Themes").ToString())

@if (Model.CurrentTheme == null) { -

- @T("There is no current theme in the application. The built-in theme will be used.")
- @Html.ActionLink(T("Install a new Theme").ToString(), "Install") -

+

+ @T("There is no current theme in the application. The built-in theme will be used.")
+ @Html.ActionLink(T("Install a new Theme").ToString(), "Install") +

} else { -

@T("Current Theme") - @Model.CurrentTheme.Name

+

@T("Current Theme") - @Model.CurrentTheme.Name

- @Html.Image(Href(Html.ThemePath(Model.CurrentTheme, "/Theme.png")), Html.Encode(Model.CurrentTheme.Name), new { @class = "themePreviewImage" }) -
@T("By") @Model.CurrentTheme.Author
+ @Html.Image(Href(Html.ThemePath(Model.CurrentTheme, "/Theme.png")), Html.Encode(Model.CurrentTheme.Name), new { @class = "themePreviewImage" }) +
@T("By") @Model.CurrentTheme.Author
-

- @T("Version:") @Model.CurrentTheme.Version
- @Model.CurrentTheme.Description
- @Model.CurrentTheme.WebSite -

+

+ @T("Version:") @Model.CurrentTheme.Version
+ @Model.CurrentTheme.Description
+ @Model.CurrentTheme.WebSite +

- @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" }) }

@T("Available Themes")

    - @foreach (var theme in Model.Themes) { - if (Model.CurrentTheme == null || theme.Id != Model.CurrentTheme.Id) { -
  • -
    -

    @theme.Name

    - @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" })) { - @Html.Hidden("themeName", theme.Id) - - } - @using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { - @Html.Hidden("themeName", theme.Id) - - } - @using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" })) { - @Html.Hidden("themeName", theme.Id) - - } -
    @T("By") @theme.Descriptor.Author
    -

    - @T("Version:") @theme.Descriptor.Version
    - @theme.Descriptor.Description
    - @theme.Descriptor.WebSite -

    + @foreach (var theme in Model.Themes) { + if (Model.CurrentTheme == null || theme.Id != Model.CurrentTheme.Id) { +
  • +
    +

    @theme.Name

    + @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" })) { + @Html.Hidden("themeName", theme.Id) + + } + @using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { + @Html.Hidden("themeName", theme.Id) + + } + @using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" })) { + @Html.Hidden("themeName", theme.Id) + + } +
    @T("By") @theme.Descriptor.Author
    +

    + @T("Version:") @theme.Descriptor.Version
    + @theme.Descriptor.Description
    + @theme.Descriptor.WebSite +

    @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)
    } } - @using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { - @Html.Hidden("themeName", theme.Id) - - } -
    -
    • - } - } + @using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { + @Html.Hidden("themeName", theme.Id) + + } + + + } + }
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml index 038ea80e9..d83b0a2ce 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml @@ -5,6 +5,6 @@
- @Html.AntiForgeryTokenOrchard() - + @Html.AntiForgeryTokenOrchard() + } diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemePreview.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemePreview.cshtml index e925a15a3..5c984921e 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemePreview.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/ThemePreview.cshtml @@ -1,5 +1,5 @@ @{ - var themes = (IEnumerable)Model.Themes; + var themes = (IEnumerable)Model.Themes; }
- @using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) { -
- @T("You are previewing: ") - @Html.DropDownList("ThemeName", themes, new {onChange = "this.form.submit();"}) - @Html.Hidden("ReturnUrl", Context.Request.RawUrl) - - - -
- } + @using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) { +
+ @T("You are previewing: ") + @Html.DropDownList("ThemeName", themes, new {onChange = "this.form.submit();"}) + @Html.Hidden("ReturnUrl", Context.Request.RawUrl) + + + +
+ }
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs index e3c9ad8ca..bfab4c451 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs @@ -211,7 +211,7 @@ namespace Orchard.Users.Controllers { protected override void OnActionExecuting(ActionExecutingContext filterContext) { 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()); } } diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs index 264f5ce7d..124751cf7 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs @@ -6,6 +6,7 @@ using System.Text; using System.Web.Security; using System.Xml.Linq; using JetBrains.Annotations; +using Orchard.Localization; using Orchard.Logging; using Orchard.ContentManagement; using Orchard.Security; @@ -27,9 +28,11 @@ namespace Orchard.Users.Services { _messageManager = messageManager; _userEventHandlers = userEventHandlers; Logger = NullLogger.Instance; + T = NullLocalizer.Instance; } public ILogger Logger { get; set; } + public Localizer T { get; set; } public MembershipSettings GetSettings() { var settings = new MembershipSettings(); @@ -179,7 +182,7 @@ namespace Orchard.Users.Services { SetPasswordEncrypted(partRecord, password); break; default: - throw new ApplicationException("Unexpected password format value"); + throw new ApplicationException(T("Unexpected password format value").ToString()); } } diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css index 14438b614..c26226f70 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css @@ -47,18 +47,18 @@ h4.widgets-layer-header { } .widgets-layerZones .widgets-zone { - background:#f5f5f5; - border: 1px solid #f1f1f1; - padding: 1em 2em 1em 2em; - margin: 0 0 .6em 0; + background:#f5f5f5; + border: 1px solid #f1f1f1; + padding: 1em 2em 1em 2em; + margin: 0 0 .6em 0; } .widgets-layerZones .widgets-zoneWidget { margin: .6em; padding: 1em 2em 1em 3em; - background:#ffffff; - border: 1px solid #f1f1f1; - vertical-align: middle; + background:#ffffff; + border: 1px solid #f1f1f1; + vertical-align: middle; } .widgets-availableLayers fieldset @@ -79,8 +79,8 @@ h4.widgets-layer-header { } .widgets-layers ul { - background: #f5f5f5; - border: 1px solid #f1f1f1; + background: #f5f5f5; + border: 1px solid #f1f1f1; } .widgets-layers ul li @@ -90,17 +90,17 @@ h4.widgets-layer-header { } .widgets-layers .widgets-currentLayer { - background: #c3d9ff; + background: #c3d9ff; } .widgets-layers .widgets-currentLayer a { - color: #333; - font-weight: 600; + color: #333; + font-weight: 600; } .widgets-layerZones ul li ul { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } .new-layer { diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/ui.timepickr.css b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/ui.timepickr.css index dfc7edfb7..cf010f8b2 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Styles/ui.timepickr.css +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Styles/ui.timepickr.css @@ -1,14 +1,14 @@ .ui-timepickr { - display:none; + display:none; position:absolute; - padding:2px 2px 2px 0; + padding:2px 2px 2px 0; } .ui-timepickr-row { padding:0; - float:right; - clear:both; - overflow:hidden; + float:right; + clear:both; + overflow:hidden; margin:2px 0; display:none; position:relative; diff --git a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml index 0664d8e94..c4522e7e0 100644 --- a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml +++ b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml @@ -1,5 +1,5 @@ @{ - Script.Require("TinyMce"); + Script.Require("TinyMce"); } @using(Script.Foot()) { diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/ie6.css b/src/Orchard.Web/Themes/TheAdmin/Styles/ie6.css index b2c2d30b9..9df334948 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/ie6.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/ie6.css @@ -1,18 +1,18 @@ body{ - background:#fcfcfc; + background:#fcfcfc; } #branding { - height:50px; - margin:0 0 0 20px; - background:transparent url(images/orchardLogo.gif) no-repeat scroll 0 0; + height:50px; + margin:0 0 0 20px; + background:transparent url(images/orchardLogo.gif) no-repeat scroll 0 0; } #branding h1 { - padding:8px 0 0 38px; + padding:8px 0 0 38px; } #content { - overflow:auto; - padding:1.4em; + overflow:auto; + padding:1.4em; } /* Navigation @@ -20,26 +20,26 @@ #navigation ul li { border:0; - margin:0 0 0 4px; + margin:0 0 0 4px; } #navigation li h3 a { - color:#333; - padding:6px 4px 8px 0px; + color:#333; + padding:6px 4px 8px 0px; } /* Forms ----------------------------------------------------------*/ legend { - color:#333; + color:#333; } #AdminPassword, .text-box { - border:1px solid #DDDEDF; - padding:4px; - width:98%; + border:1px solid #DDDEDF; + padding:4px; + width:98%; } .manage diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 5b1ba68a1..c6ee3b82c 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -29,15 +29,15 @@ small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, button, submit { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; } /* Remember focus styles! */ @@ -64,11 +64,11 @@ header, footer, aside, nav, article { display: block; } .group:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } @@ -78,31 +78,31 @@ header, footer, aside, nav, article { display: block; } /* Default font settings. 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 2px 0.154em 15.4% 2pt 3px 0.231em 23.1% 3pt 4px 0.308em 30.8% 3pt 5px 0.385em 38.5% 4pt -6px 0.462em 46.2% 5pt -7px 0.538em 53.8% 5pt -8px 0.615em 61.5% 6pt -9px 0.692em 69.2% 7pt -10px 0.769em 76.9% 8pt -11px 0.846em 84.6% 8pt -12px 0.923em 92.3% 9pt -13px 1em 100% 10pt -14px 1.077em 107.7% 11pt -15px 1.154em 115.4% 11pt -16px 1.231em 123.1% 12pt -17px 1.308em 130.8% 13pt -18px 1.385em 138.5% 14pt -19px 1.462em 146.2% 14pt -20px 1.538em 153.8% 15pt -21px 1.615em 161.5% 16pt -22px 1.692em 169.2% 17pt -23px 1.769em 176.9% 17pt -24px 1.846em 184.6% 18pt +6px 0.462em 46.2% 5pt +7px 0.538em 53.8% 5pt +8px 0.615em 61.5% 6pt +9px 0.692em 69.2% 7pt +10px 0.769em 76.9% 8pt +11px 0.846em 84.6% 8pt +12px 0.923em 92.3% 9pt +13px 1em 100% 10pt +14px 1.077em 107.7% 11pt +15px 1.154em 115.4% 11pt +16px 1.231em 123.1% 12pt +17px 1.308em 130.8% 13pt +18px 1.385em 138.5% 14pt +19px 1.462em 146.2% 14pt +20px 1.538em 153.8% 15pt +21px 1.615em 161.5% 16pt +22px 1.692em 169.2% 17pt +23px 1.769em 176.9% 17pt +24px 1.846em 184.6% 18pt */ html { @@ -225,8 +225,8 @@ form.link button:hover { /* Header - Branding and Login ***************************************************************/ #header { - background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right; - height:50px; + background:#2d2f25 url(images/backgroundHeader.gif) no-repeat bottom right; + height:50px; } #header #app { float:left; @@ -234,29 +234,29 @@ form.link button:hover { padding:.4em 0; } #header #app a { - background:url(images/orchardLogo.gif) no-repeat; - display:block; - height:60px; - margin:-11px 0 0 14px; - text-indent:-9999px; - width:40px; + background:url(images/orchardLogo.gif) no-repeat; + display:block; + height:60px; + margin:-11px 0 0 14px; + text-indent:-9999px; + width:40px; } #site { font-size:1.385em; /*18px*/ } #site a, #site a:visited, #site a:active { - color:#fff; - float:left; - line-height:2.6em; - position:relative; + color:#fff; + float:left; + line-height:2.6em; + position:relative; } #login { - color:#fff; - display:block; - float:right; - margin:14px 20px 0 0; - white-space:nowrap; + color:#fff; + display:block; + float:right; + margin:14px 20px 0 0; + white-space:nowrap; } #login a, #login a:link, #login a:visited { @@ -276,7 +276,7 @@ form.link button:hover { width:0; } #menu .menu-admin li { - margin:5px 0 17px 4px; + margin:5px 0 17px 4px; } #menu .menu-admin ul li { border:0; @@ -286,19 +286,19 @@ form.link button:hover { padding:0 0 0 8px; } #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 { - color:#2d2f25; - display:block; - line-height:1.2em; - padding:.4em 0 .4em 12px; - text-decoration:none; + color:#2d2f25; + display:block; + line-height:1.2em; + padding:.4em 0 .4em 12px; + text-decoration:none; } #menu .menu-admin ul a:hover, #menu .menu-admin ul a:active, #menu .menu-admin ul a:focus { - background:#f5f5f5; - color: #000; - text-decoration:underline; + background:#f5f5f5; + color: #000; + text-decoration:underline; } #menu .menu-admin li.section-dashboard h3 { padding:.4em 0 0 .4em; @@ -393,7 +393,7 @@ form.link button:hover { /* Confirmations, Messages and the like ***************************************************************/ .message, .validation-summary-errors { - margin:10px 0 4px 0; + margin:10px 0 4px 0; padding:4px; } messages div.message { @@ -401,7 +401,7 @@ messages div.message { } span.message { display:block; - margin:4px 0 4px 4px; + margin:4px 0 4px 4px; } .messages a { font-weight:bold; @@ -409,30 +409,30 @@ span.message { /* todo: (heskew) what else (other inputs) needs this? */ .critical.message, .validation-summary-errors, .input-validation-error.text-box, .input-validation-error.text { - border:1px solid #990808; + border:1px solid #990808; } .critical.message, .validation-summary-errors { - background:#e68585; /* red */ - color:#fff; + background:#e68585; /* red */ + color:#fff; } .message-Information { background:#e6f1c9; /* green */ - border:1px solid #cfe493; - color:#062232; + border:1px solid #cfe493; + color:#062232; } .message-Warning { - background:#fdf5bc; /* yellow */ - border:1px solid #ffea9b; + background:#fdf5bc; /* yellow */ + border:1px solid #ffea9b; } .message-Error { - background:#e68585; /* green */ - border:1px solid #990808; - color:#fff; + background:#e68585; /* green */ + border:1px solid #990808; + color:#fff; }.debug.message { background:#eee; - border:1px dashed #D2D6C6; - color:#7a7a7a; - margin:20px 0 14px 0; + border:1px dashed #D2D6C6; + color:#7a7a7a; + margin:20px 0 14px 0; } .debug.message:before { content:"DEBUG » "; @@ -470,7 +470,7 @@ label.bulk-order { text-transform:lowercase; } label span { - font-weight:normal; + font-weight:normal; } label input { vertical-align:text-top; @@ -496,7 +496,7 @@ select { padding:1px; } select:focus, textarea:focus, input.text:focus, input.text-box:focus { - border-color:#666d51; + border-color:#666d51; } input.check-box { margin-left:0; @@ -546,12 +546,12 @@ form.link button { button.primaryAction, .button.primaryAction, .button.primaryAction:link, .button.primaryAction:visited { background:#4687ad; border:1px solid #405f71; - color:#fff; + color:#fff; /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#4687AD', endColorstr='#366581'); - background: -webkit-gradient(linear, left top, left bottom, from(#4687AD), to(#366581)); - background:-moz-linear-gradient(top , #4687AD, #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:-moz-linear-gradient(top , #4687AD, #366581); } button.remove, .remove.button, .remove.button:link, .remove.button:visited { 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 { - color:#333; - background:#F5F5F5; - border:1px solid #999; - cursor:pointer; - padding: 0 12px 2px 12px; - text-align:center; - - /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f5f5f5', endColorstr='#cbcbcb'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#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); - -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); - border-radius: 3px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; + color:#333; + background:#F5F5F5; + border:1px solid #999; + cursor:pointer; + padding: 0 12px 2px 12px; + text-align:center; + + /*CSS3 properties*/ + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f5f5f5', endColorstr='#cbcbcb'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#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); + -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); + border-radius: 3px; + -webkit-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 { - text-decoration:none; - background: #ffac40; - color:#fff; - border:1px solid #bb8b2d; - - /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ffac40', endColorstr='#f9760d'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffac40), to(#f9760d)); - background: -moz-linear-gradient(top, #ffac40, #f9760d); + text-decoration:none; + background: #ffac40; + color:#fff; + border:1px solid #bb8b2d; + + /*CSS3 properties*/ + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#ffac40', endColorstr='#f9760d'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffac40), to(#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 { - text-decoration:none; - background: #62a9e2; - color:#fff; - border:1px solid #bb772d; + text-decoration:none; + background: #62a9e2; + color:#fff; + border:1px solid #bb772d; - /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fece3b', endColorstr='#fe6001'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(#fece3b), to(#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); - -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); + /*CSS3 properties*/ + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#fece3b', endColorstr='#fe6001'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(#fece3b), to(#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); + -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); } input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .button:focus::-moz-focus-inner { border: 1px dotted transparent; @@ -683,36 +683,36 @@ input[type="submit"]:focus::-moz-focus-inner, button:focus::-moz-focus-inner, .b ----------------------------------------------------------*/ table.items { margin:0 0 1.4em 0; - background:#fff; - border:1px solid #eaeaea; - border-bottom:none; - border-collapse:separate; - border-spacing:0; - width:100%; + background:#fff; + border:1px solid #eaeaea; + border-bottom:none; + border-collapse:separate; + border-spacing:0; + width:100%; } table.items caption { - padding:8px 0; - text-indent:0; + padding:8px 0; + text-indent:0; } table.items col { - border-spacing:0; - display:table-column; + border-spacing:0; + display:table-column; } table.items colgroup { - border-spacing:0; - display:table-column-group; + border-spacing:0; + display:table-column-group; } table.items tbody { - border-spacing:0; - vertical-align:middle; + border-spacing:0; + vertical-align:middle; } table.items thead, table.items th { - background:#f5f5f5; - font-weight:700; - overflow:hidden; - text-align:left; - white-space:nowrap; + background:#f5f5f5; + font-weight:700; + overflow:hidden; + text-align:left; + white-space:nowrap; } /* todo: (heskew) hook back up */ table.items tr.hover { @@ -721,11 +721,11 @@ table.items tr.hover { table.items tr.critical {background:#e68585; border:inherit;} table.items tr.warning {background:#fdf5bc; border:inherit;} table.items th, table.items td { - border-bottom:1px solid #eaeaea; - border-spacing:0px; - display:table-cell; - padding:8px 12px; - vertical-align:middle; + border-bottom:1px solid #eaeaea; + border-spacing:0px; + display:table-cell; + padding:8px 12px; + vertical-align:middle; } /* Content item lists @@ -829,7 +829,7 @@ table.items th, table.items td { border-style:dashed; margin-left:0; margin-right:2em; - width:350px; + width:350px; } .permalink input.text:focus { background:#FFF; @@ -858,12 +858,12 @@ table.items th, table.items td { padding:6px; /*CSS3 properties*/ - filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5'); - background: -webkit-gradient(linear, 0 0, 0 100%, from(#f7f7f7), to(#f5f5f5)); - background: -moz-linear-gradient(top, #f7f7f7, #f5f5f5); - border-radius: 3px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; + filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5'); + background: -webkit-gradient(linear, 0 0, 0 100%, from(#f7f7f7), to(#f5f5f5)); + background: -moz-linear-gradient(top, #f7f7f7, #f5f5f5); + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; } .edit-item-sidebar fieldset { @@ -911,7 +911,7 @@ fieldset.publish-later-datetime input { } /* todo: needed? */ .clearBoth { - clear:both; + clear:both; } .placeholderd { color:#ccc; diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml index d4afca4ed..cab73e6c7 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Layout.cshtml @@ -7,7 +7,7 @@ @{ Style.Include("site.css"); - Script.Require("jQuery"); + Script.Require("jQuery"); Script.Require("ShapesBase"); Script.Include("admin.js"); RegisterLink(new LinkEntry { Condition = "lte IE 8", Rel = "stylesheet", Type = "text/css", Href = Url.Content("../Styles/ie.css") }.AddAttribute("media", "screen, projection")); diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml index 715be0e3b..12ddff3ab 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml @@ -1,7 +1,7 @@ @using System.Web.Routing; @using Orchard.Utility.Extensions; @{ - Script.Require("jQuery"); + Script.Require("jQuery"); Script.Include("admin.js"); IEnumerable firstLevelMenuItems = Model; @@ -9,7 +9,7 @@ var tag = Tag(Model, "ul"); } @tag.StartElement - @foreach(var firstLevelMenuItem in Model) { + @foreach(var firstLevelMenuItem in Model) { IEnumerable secondLevelMenuItems = firstLevelMenuItem; string sectionHeaderText = firstLevelMenuItem.Text; @@ -33,7 +33,7 @@

@sectionHeaderMarkup

if (secondLevelMenuItems.Count() > 1) {
    - @foreach(var secondLevelMenuItem in secondLevelMenuItems) { + @foreach(var secondLevelMenuItem in secondLevelMenuItems) {
  • @secondLevelMenuItem.Text
    • diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index 820ba98a1..fc59d7d89 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -29,15 +29,15 @@ small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-weight: inherit; + font-style: inherit; + font-size: 100%; + font-family: inherit; + vertical-align: baseline; } /* Remember focus styles! */ @@ -64,20 +64,20 @@ header, footer, aside, nav, article { display: block; } .group:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } .zone:after /* Self clears every zone container */ { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } @@ -88,26 +88,26 @@ header, footer, aside, nav, article { display: block; } /* Default font settings. The font-size 81.3% sets the base font to 13px -Pixels EMs Percent Points -6px 0.462em 46.2% 5pt -7px 0.538em 53.8% 5pt -8px 0.615em 61.5% 6pt -9px 0.692em 69.2% 7pt -10px 0.769em 76.9% 8pt -11px 0.846em 84.6% 8pt -12px 0.923em 92.3% 9pt -13px 1em 100% 10pt -14px 1.077em 107.7% 11pt -15px 1.154em 115.4% 11pt -16px 1.231em 123.1% 12pt -17px 1.308em 130.8% 13pt -18px 1.385em 138.5% 14pt -19px 1.462em 146.2% 14pt -20px 1.538em 153.8% 15pt -21px 1.615em 161.5% 16pt -22px 1.692em 169.2% 17pt -23px 1.769em 176.9% 17pt -24px 1.846em 184.6% 18pt +Pixels EMs Percent Points +6px 0.462em 46.2% 5pt +7px 0.538em 53.8% 5pt +8px 0.615em 61.5% 6pt +9px 0.692em 69.2% 7pt +10px 0.769em 76.9% 8pt +11px 0.846em 84.6% 8pt +12px 0.923em 92.3% 9pt +13px 1em 100% 10pt +14px 1.077em 107.7% 11pt +15px 1.154em 115.4% 11pt +16px 1.231em 123.1% 12pt +17px 1.308em 130.8% 13pt +18px 1.385em 138.5% 14pt +19px 1.462em 146.2% 14pt +20px 1.538em 153.8% 15pt +21px 1.615em 161.5% 16pt +22px 1.692em 169.2% 17pt +23px 1.769em 176.9% 17pt +24px 1.846em 184.6% 18pt */ body { @@ -172,7 +172,7 @@ acronym { border-bottom: 1px dotted #666; } address { margin: 0 0 0.923em; font-style: italic; } 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; } @@ -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; } input[type="text"], input[type="password"] { - display: block; + display: block; padding: 0.3em; } 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; } @@ -205,61 +205,61 @@ fieldset ol li { margin: 0 0 6px 0; } #layout-wrapper { } #layout-header, #layout-featured, #layout-before-main, #layout-main, #layout-footer, #layout-after-main, #layout-tripel { - width:960px; - margin:0 auto; + width:960px; + margin:0 auto; } /* Navigation */ #layout-navigation { - width: 960px; - margin: 0 auto; - display: block; - border-bottom: 1px solid #dbdbdb; + width: 960px; + margin: 0 auto; + display: block; + border-bottom: 1px solid #dbdbdb; } nav ul { - padding: 0px; - margin: 0px; + padding: 0px; + margin: 0px; } - nav ul li - { - border:1px solid #dbdbdb; - background:#f6f6f6; - display:block; - float:left; - margin:0 2px -1px 0; - } - nav ul li.current - { - border-bottom: 1px solid #fff; - background:#fff; - } - nav ul a - { - padding:0 18px; - display:block; - float:left; - color: #333; - font-size: 1.077em; - text-decoration:none; - line-height:24px; - } + nav ul li + { + border:1px solid #dbdbdb; + background:#f6f6f6; + display:block; + float:left; + margin:0 2px -1px 0; + } + nav ul li.current + { + border-bottom: 1px solid #fff; + background:#fff; + } + nav ul a + { + padding:0 18px; + display:block; + float:left; + color: #333; + font-size: 1.077em; + text-decoration:none; + line-height:24px; + } #layout-header {} - #branding - { - font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif; - font-size: 2.9em; - padding: 0; - margin: 0; - } - #branding a - { - text-decoration:none; - color: #434343; - } + #branding + { + font-family: 'Lobster', Tahoma, Arial, Helvetica, sans-serif; + font-size: 2.9em; + padding: 0; + margin: 0; + } + #branding a + { + text-decoration:none; + color: #434343; + } #layout-navigation {} #layout-featured {} #layout-before-main {} @@ -278,22 +278,22 @@ nav ul #tripel-third {} #layout-footer {} #footer-quad {} - #footer-quad-first {} - #footer-quad-second {} - #footer-quad-third {} - #footer-quad-forth {} - #footer-sig {} - + #footer-quad-first {} + #footer-quad-second {} + #footer-quad-third {} + #footer-quad-forth {} + #footer-sig {} + /* Zones */ .zone { padding: 12px; /* Enable this to see zone visualizations - background-color: yellow; - box-shadow:inset 0 0 1px purple; - -moz-box-shadow:inset 0 0 1px purple; - -webkit-box-shadow:inset 0 0 1px purple; + background-color: yellow; + box-shadow:inset 0 0 1px purple; + -moz-box-shadow:inset 0 0 1px purple; + -webkit-box-shadow:inset 0 0 1px purple; */ } .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 { - color:#333; - background:#F5F5F5; - background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb)); - background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb); - border:1px solid #999; - cursor:pointer; - margin:.2em 0 2em 0; - padding:.3em 1.8em; - text-align:center; + color:#333; + background:#F5F5F5; + background: -webkit-gradient(linear, left top, left bottom, from(#F5F5F5), to(#cbcbcb)); + background:-moz-linear-gradient(top , #F5F5F5, #cbcbcb); + border:1px solid #999; + cursor:pointer; + margin:.2em 0 2em 0; + padding:.3em 1.8em; + text-align:center; } 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:active, .button:active, button:focus, .button:focus { - text-decoration:none; - background: #ebebeb; - background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb)); - background:-moz-linear-gradient(top , #e1e1e1, #ebebeb); + text-decoration:none; + background: #ebebeb; + background: -webkit-gradient(linear, left top, left bottom, from(#e1e1e1), to(#ebebeb)); + background:-moz-linear-gradient(top , #e1e1e1, #ebebeb); } diff --git a/src/Orchard/Mvc/Html/ContainerExtensions.cs b/src/Orchard/Mvc/Html/ContainerExtensions.cs index 88ab0a38f..0e104904d 100644 --- a/src/Orchard/Mvc/Html/ContainerExtensions.cs +++ b/src/Orchard/Mvc/Html/ContainerExtensions.cs @@ -1,7 +1,5 @@ using System; using System.Web.Mvc; -using Autofac; -using Autofac.Integration.Web; namespace Orchard.Mvc.Html { public static class ContainerExtensions { diff --git a/src/Orchard/Mvc/ViewPage.cs b/src/Orchard/Mvc/ViewPage.cs index 89cf799d2..9fbc51b7a 100644 --- a/src/Orchard/Mvc/ViewPage.cs +++ b/src/Orchard/Mvc/ViewPage.cs @@ -48,7 +48,7 @@ namespace Orchard.Mvc { } } - public override void InitHelpers() { + public override void InitHelpers() { base.InitHelpers(); _workContext = ViewContext.GetWorkContext(); diff --git a/src/Orchard/UI/Resources/ResourceManager.cs b/src/Orchard/UI/Resources/ResourceManager.cs index 86c30bca3..aa6b85525 100644 --- a/src/Orchard/UI/Resources/ResourceManager.cs +++ b/src/Orchard/UI/Resources/ResourceManager.cs @@ -6,7 +6,6 @@ using System.Globalization; using System.Linq; using System.Web; using Autofac.Features.Metadata; -using Orchard.DisplayManagement.Descriptors; using Orchard.Environment.Extensions.Models; namespace Orchard.UI.Resources {