Permalink
Browse files

Merge pull request #33 from georged/master

Try again with comments removed
  • Loading branch information...
2 parents a4264ee + e06975f commit 6985e2c4f89300f34a2f7e72535b70ef3f5bb6a3 @JakeGinnivan JakeGinnivan committed Mar 15, 2013
@@ -22,12 +22,12 @@ public static void RegisterBundles(BundleCollection bundles)
bundles.Add(new ScriptBundle("~/bundles/jsdate").Include("~/Scripts/jsdate.js"));
bundles.Add(new ScriptBundle("~/bundles/showdown").Include("~/Scripts/showdown.js"));
bundles.Add(new ScriptBundle("~/bundles/taggy").Include("~/Scripts/taggy.js"));
- bundles.Add(new ScriptBundle("~/bundles/prettify").Include("~/Scripts/Prettify/prettify.js", "~/Scripts/Prettify/lang-*"));
+ bundles.Add(new Bundle("~/bundles/prettify").Include("~/Scripts/Prettify/prettify.js", "~/Scripts/Prettify/lang-*"));
bundles.Add(new ScriptBundle("~/bundles/site").Include("~/Scripts/site.js"));
bundles.Add(new ScriptBundle("~/bundles/wmd").Include("~/Scripts/wmd.js"));
- bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/themes/base/Base.css"));
- bundles.Add(new StyleBundle("~/Content/adminCss").Include("~/Content/themes/base/Base.css", "~/Content/themes/base/Admin.css"));
+ bundles.Add(new StyleBundle("~/Content/themes/base/baseCss").Include("~/Content/themes/base/Base.css"));
+ bundles.Add(new StyleBundle("~/Content/themes/base/adminCss").Include("~/Content/themes/base/Base.css", "~/Content/themes/base/Admin.css"));
bundles.Add(new StyleBundle("~/Content/themes/base/css").Include(
"~/Content/themes/base/jquery.ui.core.css",
@@ -1,4 +1,4 @@
-@model CommentsModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.CommentsModel
@{
ViewBag.Title = "FunnelWeb Administration - Comments";
Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";
@@ -1,4 +1,4 @@
-@model PageListModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.PageListModel
@{
ViewBag.Title = "FunnelWeb Administration - Page List";
Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";
@@ -1,4 +1,4 @@
-@model PingbacksModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.PingbacksModel
@{
ViewBag.Title = "FunnelWeb Administration - Pingbacks";
Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";
@@ -1,4 +1,4 @@
-@model TaskModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.TaskModel
@{
ViewBag.Title = "FunnelWeb Administration - Task Details";
Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";
@@ -1,4 +1,4 @@
-@model TasksModel
+@model FunnelWeb.Web.Areas.Admin.Views.Admin.TasksModel
@{
ViewBag.Title = "FunnelWeb Administration - Task List";
Layout = "~/Areas/Admin/Views/Shared/_Private.cshtml";
@@ -9,7 +9,7 @@
<title>@(ViewBag.Title == null ? "" : (ViewBag.Title + " - "))@Html.Settings().SiteTitle
</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- @Styles.Render("~/Content/adminCss")
+ @Styles.Render("~/Content/themes/base/adminCss")
@Styles.Render("~/Content/themes/base/css")
@Scripts.Render("~/bundles/jquery")
Oops, something went wrong.
@@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="language" content="english" />
<meta name="viewport" content="width=device-width" />
- @Styles.Render("~/Content/css")
+ @Styles.Render("~/Content/themes/base/baseCss")
@Styles.Render("~/Content/themes/base/css")
<link href="@Html.Qualify(Href("~/content/theme.css"))" rel="stylesheet"/>
@RenderSection("Meta", required: false)
@@ -17,7 +17,7 @@
<link href="@Html.Qualify(Html.ActionUrl("CommentFeed", "Feed", null))" type="application/atom+xml" rel="alternate" title="Comments Feed" />
<link title="RSD" href="@Html.Qualify(Href("~/rsd.xml"))" type="application/rsd+xml" rel="EditURI" />
<link rel="icon" type="image/png" href="@Url.Content("~/Content/Resources/favicon.png")" />
- @Styles.Render("~/Content/css")
+ @Styles.Render("~/Content/themes/base/baseCss")
@Styles.Render("~/Content/themes/base/css")
<link href="@Html.Qualify(Href("~/content/theme.css"))" rel="stylesheet"/>
@RenderSection("Meta", required: false)
@@ -94,6 +94,7 @@
@Scripts.Render("~/bundles/prettify")
@MiniProfiler.RenderIncludes()
+ @MvcHtmlString.Create(Html.Settings().HtmlFooter)
@if (IsSectionDefined("Scripts"))
{
@RenderSection("Scripts")

0 comments on commit 6985e2c

Please sign in to comment.