From 6e51f6ddbd0bede8804a60bb6834b4f1810355ca Mon Sep 17 00:00:00 2001 From: Gavin Pickin Date: Sun, 10 Jul 2016 20:17:08 -0700 Subject: [PATCH 1/4] Renamed to Theme.cfc and updated --- bootswatch/{bootswatch.cfc => Theme.cfc} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bootswatch/{bootswatch.cfc => Theme.cfc} (98%) diff --git a/bootswatch/bootswatch.cfc b/bootswatch/Theme.cfc similarity index 98% rename from bootswatch/bootswatch.cfc rename to bootswatch/Theme.cfc index c4f706e..59684f1 100644 --- a/bootswatch/bootswatch.cfc +++ b/bootswatch/Theme.cfc @@ -28,6 +28,7 @@ A layout is composed of the following pieces + blog.cfm (Mandatory layout used for all blog views by convention) + pages.cfm (Mandatory layout used for all pages by convention) + maintenance.cfm (Optional used when in maintenance mode) + + search.cfm (Optional used when doing searches, else defaults to pages) / views (The folder that contains views for rendering) + archives.cfm (MANDATORY: The view used to render out blog archives.) + entry.cfm (MANDATORY: The view used to render out a single blog entry with comments, etc.) @@ -79,7 +80,7 @@ component{ // Layout Variables this.name = "Bootswatch"; this.description = "Bootswatch layout for ContentBox"; - this.version = "1.1"; + this.version = "1.2"; this.author = "Computer Know How"; this.authorURL = "http://www.compknowhow.com"; // Screenshot URL, can be absolute or locally in your layout package. @@ -114,5 +115,4 @@ component{ function onDelete(){ } - } \ No newline at end of file From b62312ea938679401c5575ea7031ff32bd07f0e4 Mon Sep 17 00:00:00 2001 From: Gavin Pickin Date: Sun, 10 Jul 2016 20:17:41 -0700 Subject: [PATCH 2/4] Fixed search side bar --- bootswatch/views/_blogsidebar.cfm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bootswatch/views/_blogsidebar.cfm b/bootswatch/views/_blogsidebar.cfm index e914e99..77fb080 100644 --- a/bootswatch/views/_blogsidebar.cfm +++ b/bootswatch/views/_blogsidebar.cfm @@ -30,7 +30,7 @@ #cb.widget("Archives")#
  • Entries Search
    • - #cb.widget("SearchForm")# + #cb.widget(name="SearchForm", args={ querycss="blogSideBarSearchField" } )# @@ -38,4 +38,9 @@ #cb.event("cbui_afterSideBar")# - \ No newline at end of file + + \ No newline at end of file From 79a66980f3a1d015890f135353f6873cc10b61c4 Mon Sep 17 00:00:00 2001 From: Gavin Pickin Date: Sun, 10 Jul 2016 20:17:51 -0700 Subject: [PATCH 3/4] Added footer event --- bootswatch/views/_footer.cfm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootswatch/views/_footer.cfm b/bootswatch/views/_footer.cfm index 1fcd5e1..7e91d17 100644 --- a/bootswatch/views/_footer.cfm +++ b/bootswatch/views/_footer.cfm @@ -1,5 +1,7 @@

    Copyright © 2013 #cb.siteName()#. All rights reserved.

    + + #cb.event("cbui_footer")#
    \ No newline at end of file From addb9fb20e9822adf69d95a436ec8fc72f105c38 Mon Sep 17 00:00:00 2001 From: Gavin Pickin Date: Sun, 10 Jul 2016 20:17:59 -0700 Subject: [PATCH 4/4] Removed minification --- bootswatch/layouts/blog.cfm | 5 +++-- bootswatch/layouts/pages.cfm | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bootswatch/layouts/blog.cfm b/bootswatch/layouts/blog.cfm index bcce42a..1470aac 100644 --- a/bootswatch/layouts/blog.cfm +++ b/bootswatch/layouts/blog.cfm @@ -11,6 +11,7 @@ + @@ -40,10 +41,10 @@ - + #cb.minify(assets="#cb.layoutRoot()#/includes/css/less/blog.less,#cb.layoutRoot()#/includes/css/less/messagebox.less,#cb.layoutRoot()#/includes/css/less/paging.less,#cb.layoutRoot()#/includes/css/less/breadcrumbs.less", location="#cb.layoutRoot()#/includes/css")# - #cb.minify(assets="#cb.layoutRoot()#/includes/css/main.css", location="#cb.layoutRoot()#/includes/css")# + #html.addAsset( "#cb.layoutRoot()#/includes/css/main.css" )# diff --git a/bootswatch/layouts/pages.cfm b/bootswatch/layouts/pages.cfm index d84b6fe..8dd9076 100644 --- a/bootswatch/layouts/pages.cfm +++ b/bootswatch/layouts/pages.cfm @@ -11,6 +11,7 @@ + @@ -40,10 +41,10 @@ - + #cb.minify(assets="#cb.layoutRoot()#/includes/css/less/blog.less,#cb.layoutRoot()#/includes/css/less/messagebox.less,#cb.layoutRoot()#/includes/css/less/paging.less,#cb.layoutRoot()#/includes/css/less/breadcrumbs.less", location="#cb.layoutRoot()#/includes/css")# - #cb.minify(assets="#cb.layoutRoot()#/includes/css/main.css", location="#cb.layoutRoot()#/includes/css")# + #html.addAsset( "#cb.layoutRoot()#/includes/css/main.css" )#