From 83f63bc7bcc53032b0e06f39f477d077ee0e8223 Mon Sep 17 00:00:00 2001 From: Lombiq Date: Sun, 18 Jan 2015 16:57:43 +0100 Subject: [PATCH] Formatting Orchard.Modules templates --- .../Orchard.Modules/Views/Admin/Index.cshtml | 7 ++- .../Views/Admin/Recipes.cshtml | 56 +++++++++---------- .../Orchard.Modules/Views/ModuleEntry.cshtml | 36 ++++++------ 3 files changed, 51 insertions(+), 48 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml index eb8dc793a..3a8b0c424 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.cshtml @@ -17,8 +17,8 @@ if (Model.InstallModules) { - @Html.ActionLink(T("Install a module from your computer").ToString(), "AddModule", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null) -} + @Html.ActionLink(T("Install a module from your computer").ToString(), "AddModule", "PackagingServices", new { area = "Orchard.Packaging", returnUrl = HttpContext.Current.Request.RawUrl }, null) + } if (Model.Modules.Any()) { - } else { + } + else {

@T("No modules available").ToString()

} diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Recipes.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Recipes.cshtml index a9166145d..5170a5f0c 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Recipes.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Recipes.cshtml @@ -6,34 +6,34 @@ } @using (Html.BeginFormAntiForgeryPost()) { if (Model.Modules.Any()) { - + } + else { +

@T("No modules available").ToString()

+ } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml index d7af93e12..b2d91953d 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/ModuleEntry.cshtml @@ -9,28 +9,30 @@ }
- @if (module.Notifications != null && module.Notifications.Count > 0) { -
+ @if (module.Notifications != null && module.Notifications.Count > 0) { +
@foreach (string notification in module.Notifications) {
@Html.Raw(notification)
} -
- } +
+ }
- class="@moduleClasses"}}>@module.Descriptor.Name - @T("Version: {0}", !string.IsNullOrEmpty(module.Descriptor.Version) ? module.Descriptor.Version : T("1.0").ToString()) + class="@moduleClasses" }}> + @module.Descriptor.Name - @T("Version: {0}", !string.IsNullOrEmpty(module.Descriptor.Version) ? module.Descriptor.Version : T("1.0").ToString()) - @if (!string.IsNullOrEmpty(module.Descriptor.Description)) { -

@module.Descriptor.Description

- } + @if (!string.IsNullOrEmpty(module.Descriptor.Description)) { +

@module.Descriptor.Description

+ } -
    - @{ IEnumerable features = module.Descriptor.Features; } -
  • @T("Features: {0}", MvcHtmlString.Create(string.Join(", ", features.Select(f => Html.Link(string.IsNullOrEmpty(f.Name) ? f.Id : f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Id.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray())))
  • -
  •  | @T("Author: {0}", !string.IsNullOrEmpty(module.Descriptor.Author) ? module.Descriptor.Author : T("Unknown").ToString())
  • -
  •  | @T("Website: ") - @if (!string.IsNullOrEmpty(module.Descriptor.WebSite)) { @module.Descriptor.WebSite } - else { @T("Unknown").ToString() } -
  • -
+
    + @{ IEnumerable features = module.Descriptor.Features; } +
  • @T("Features: {0}", MvcHtmlString.Create(string.Join(", ", features.Select(f => Html.Link(string.IsNullOrEmpty(f.Name) ? f.Id : f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Id.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray())))
  • +
  •  | @T("Author: {0}", !string.IsNullOrEmpty(module.Descriptor.Author) ? module.Descriptor.Author : T("Unknown").ToString())
  • +
  • +  | @T("Website: ") + @if (!string.IsNullOrEmpty(module.Descriptor.WebSite)) { @modu>@module.Descriptor.WebSite } + else { @T("Unknown").ToString() } +
  • +
\ No newline at end of file