Skip to content

Patch content box3 update gp #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Patch content box3 update gp #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e51f6d
Renamed to Theme.cfc and updated
gpickin Jul 11, 2016
b62312e
Fixed search side bar
gpickin Jul 11, 2016
79a6698
Added footer event
gpickin Jul 11, 2016
addb9fb
Removed minification
gpickin Jul 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bootswatch/bootswatch.cfc → bootswatch/Theme.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -114,5 +115,4 @@ component{
function onDelete(){

}

}
5 changes: 3 additions & 2 deletions bootswatch/layouts/blog.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</title>
<meta name="generator" content="ContentBox powered by ColdBox" />
<meta name="robots" content="index,follow" />
<meta name="description" content="">
<meta name="author" content="">
<!--- Meta per page or index --->
<cfif cb.isEntryView() AND len(cb.getCurrentEntry().getHTMLDescription())>
Expand Down Expand Up @@ -40,10 +41,10 @@
<!--- Minify & Cache Our Assets --->
<cfif cb.layoutsetting('minifyCacheAssets',true)>
<!--- Use LESS --->
<cfif cb.layoutsetting('useLESS',true)>
<cfif 1 eq 0 and cb.layoutsetting('useLESS',true)>
#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")#
<cfelse>
#cb.minify(assets="#cb.layoutRoot()#/includes/css/main.css", location="#cb.layoutRoot()#/includes/css")#
#html.addAsset( "#cb.layoutRoot()#/includes/css/main.css" )#
</cfif>
<cfelse>
<!--- Include our unminified, unLESSified, non cached version of the stylesheet --->
Expand Down
5 changes: 3 additions & 2 deletions bootswatch/layouts/pages.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
</title>
<meta name="generator" content="ContentBox powered by ColdBox" />
<meta name="robots" content="index,follow" />
<meta name="description" content="">
<meta name="author" content="">
<!--- Meta per page or index --->
<cfif cb.isEntryView() AND len(cb.getCurrentEntry().getHTMLDescription())>
Expand Down Expand Up @@ -40,10 +41,10 @@
<!--- Minify & Cache Our Assets --->
<cfif cb.layoutsetting('minifyCacheAssets',true)>
<!--- Use LESS --->
<cfif cb.layoutsetting('useLESS',true)>
<cfif 1 eq 0 and cb.layoutsetting('useLESS',true)>
#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")#
<cfelse>
#cb.minify(assets="#cb.layoutRoot()#/includes/css/main.css", location="#cb.layoutRoot()#/includes/css")#
#html.addAsset( "#cb.layoutRoot()#/includes/css/main.css" )#
</cfif>
<cfelse>
<!--- Include our unminified, unLESSified, non cached version of the stylesheet --->
Expand Down
9 changes: 7 additions & 2 deletions bootswatch/views/_blogsidebar.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,17 @@
#cb.widget("Archives")#

<li class="nav-header" style="padding-top:10px;">Entries Search</li>
#cb.widget("SearchForm")#
#cb.widget(name="SearchForm", args={ querycss="blogSideBarSearchField" } )#

<!---#cb.widget("Meta",{titleLevel="4"})#--->

</ul>

<!--- ContentBoxEvent --->
#cb.event("cbui_afterSideBar")#
</cfoutput>
</cfoutput>
<style>
.blogSideBarSearchField {
width:100%;
}
</style>
2 changes: 2 additions & 0 deletions bootswatch/views/_footer.cfm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<cfoutput>
<footer id="footer">
<p>Copyright &copy; 2013 #cb.siteName()#. All rights reserved.</p>
<!--- contentboxEvent --->
#cb.event("cbui_footer")#
</footer>
</cfoutput>