Merge pull request #125 from jmohler1970/ColdFusion-2016

ColdFusion 2016
jmohler1970 · Sep 14, 2016 · 7e0f8f9 · 7e0f8f9
2 parents f19b630 + 83e72a1
commit 7e0f8f9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore Mac DS_Store files
+.DS_Store
diff --git a/layouts/default.cfm b/layouts/default.cfm
@@ -7,6 +7,7 @@
 
 <b:head key="brand">
 
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<meta name="author" content="James Mohler" />
 	<meta name="description" content="Bootstrap tags for ColdFusion, a powerful tag libary that takes the best from Bootstrap for next-gen Front-end Enterprise Applications fast and easy supporting HTML5." />
 	<meta name="KEYWORDS" content="ColdFusion, bootstrap, framework, java, enterprise, server, faces, jquery, usability, next-gen, web, html5, easy, modern, well-designed, website, state-of-the-art" />

diff --git a/vendor/tags/bootstrap/bootstrap.cfc b/vendor/tags/bootstrap/bootstrap.cfc
@@ -79,7 +79,7 @@ void function setupRequest()	{
 
 	if(application.Bootstrap.arLang.isEmpty())	{
 		for(local.langFile in DirectoryList(application.Bootstrap.langRoot, false, "path", "*.php"))	{
-			application.Bootstrap.arLang.append(local.langFile.listLast("/").listFirst("."));
+			application.Bootstrap.arLang.append(local.langFile.listLast("/").listLast("\").listFirst("."));
 			}
 		}	
 

diff --git a/vendor/tags/bootstrap/jumbotron.cfm b/vendor/tags/bootstrap/jumbotron.cfm
@@ -16,7 +16,9 @@ case "start" :
 	variables.crlf 	= chr(13) & chr(10);
 	variables.tagStack	= getBaseTagList().listToArray();
  
+	
 	param attributes.processed 		= true;
+	param attributes.rendered 		= true; 
 
    
 

diff --git a/views/docs/jumbotron.cfm b/views/docs/jumbotron.cfm
@@ -204,7 +204,7 @@ This is a Jumbotron
 
 
 <b:jumbotron>
-    <b:h1>#rc.content#</b:jumbotron>
+    <b:h1 value="#rc.content#" />
     <b:p>O Fortuna
 velut luna
 statu variabilis,