diff --git a/WebApplication/App_Data/DB/FlexDotnetCMS.mdf b/WebApplication/App_Data/DB/FlexDotnetCMS.mdf index 93c5928f..26bd8c69 100644 Binary files a/WebApplication/App_Data/DB/FlexDotnetCMS.mdf and b/WebApplication/App_Data/DB/FlexDotnetCMS.mdf differ diff --git a/WebApplication/App_Data/DB/FlexDotnetCMS_log.ldf b/WebApplication/App_Data/DB/FlexDotnetCMS_log.ldf index d74a9c37..3b698ec4 100644 Binary files a/WebApplication/App_Data/DB/FlexDotnetCMS_log.ldf and b/WebApplication/App_Data/DB/FlexDotnetCMS_log.ldf differ diff --git a/WebApplication/Frontend/layouts/mediatype-layouts/home-mediatype.cshtml b/WebApplication/Frontend/layouts/mediatype-layouts/home-mediatype.cshtml index 26b8cd7f..9eb38d6e 100644 --- a/WebApplication/Frontend/layouts/mediatype-layouts/home-mediatype.cshtml +++ b/WebApplication/Frontend/layouts/mediatype-layouts/home-mediatype.cshtml @@ -1,5 +1,6 @@ {IncludeFile:'/Frontend/layouts/includes/header-home.cshtml'} - {Field:MainContent} + + diff --git a/WebApplication/Frontend/layouts/mediatype-layouts/page-mediatype.cshtml b/WebApplication/Frontend/layouts/mediatype-layouts/page-mediatype.cshtml index fa53bab0..67f333ed 100644 --- a/WebApplication/Frontend/layouts/mediatype-layouts/page-mediatype.cshtml +++ b/WebApplication/Frontend/layouts/mediatype-layouts/page-mediatype.cshtml @@ -2,3 +2,5 @@ {IncludeFile:'/Frontend/layouts/includes/header-interior.cshtml'} {Field:MainContent} + + \ No newline at end of file diff --git a/WebApplication/Frontend/layouts/template-layouts/home-page-template.cshtml b/WebApplication/Frontend/layouts/template-layouts/home-page-template.cshtml index 310c3805..fb196f73 100644 --- a/WebApplication/Frontend/layouts/template-layouts/home-page-template.cshtml +++ b/WebApplication/Frontend/layouts/template-layouts/home-page-template.cshtml @@ -14,8 +14,6 @@ {Settings:GlobalCodeInBody} - -
{PageContent} diff --git a/WebApplication/Frontend/layouts/template-layouts/interior-page-template.cshtml b/WebApplication/Frontend/layouts/template-layouts/interior-page-template.cshtml index 0022da23..a735ef21 100644 --- a/WebApplication/Frontend/layouts/template-layouts/interior-page-template.cshtml +++ b/WebApplication/Frontend/layouts/template-layouts/interior-page-template.cshtml @@ -13,7 +13,6 @@ {Settings:GlobalCodeInBody} -
diff --git a/WebApplication/Frontend/scripts/jquery-ajax-loader.js b/WebApplication/Frontend/scripts/jquery-ajax-loader.js index fbcbd75b..38da7ad8 100644 --- a/WebApplication/Frontend/scripts/jquery-ajax-loader.js +++ b/WebApplication/Frontend/scripts/jquery-ajax-loader.js @@ -1,12 +1,11 @@ var ajaxOptions = { - homePagePath: "/home/", targetElement: "#DynamicContent", preloadLinks: false, - animateIn: function (selector, html) { + animateIn: function (selector, html) { $(selector).each(function (index, el) { //$(el).html(html); - $(el).toggle("fade", 250, function () { + $(el).toggle("fade", 250, function () { $(el).html(html); //$(el).css("height", "100%"); // $("#mainNav").effect("fade"); @@ -44,6 +43,8 @@ function preloadLinks() { $(document).ready(function () { + trackPageView(); + if (ajaxOptions.preloadLinks) { preloadLinks(); } @@ -126,11 +127,11 @@ function pushHistory(href, bodyHtml) { function _loadData(href, el, bodyHtml, callBackFunction) { - if ($("#DynamicContent").length > 0 && bodyHtml.indexOf("DynamicContent") != -1) { - var doc = $('').append($.parseHTML(bodyHtml, document, true)); - var dynamicContent = doc.find("#DynamicContent").html(); + var dynamicContent = bodyHtml; - bodyHtml = dynamicContent; + if ($("#DynamicContent").length > 0 && bodyHtml.indexOf("DynamicContent") != -1) { + var doc = $('').append($.parseHTML(bodyHtml, document, true)); + dynamicContent = doc.find("#DynamicContent").html(); } @@ -141,7 +142,7 @@ function _loadData(href, el, bodyHtml, callBackFunction) { updateTitle(href, bodyHtml); pushHistory(href, bodyHtml); - loadeData($(el), bodyHtml); + loadeData($(el), dynamicContent); } if (el != "") {