Merge branch 'dev' of https://github.com/pattern-lab/patternlab-php into dev

Author: dmolsen

.gitignore

@@ -10,3 +10,17 @@ latest-change.txt
 *-ck.js
 
 /core/source/css/.sass-cache/
+
+/public/styleguide/css/styleguide.css
+/public/styleguide/css/styleguide.scss
+
+/core/styleguide/css/.sass-cache/
+
+/public/styleguide/js/styleguide.js
+
+/public/styleguide/js/annotations-viewer.js
+/public/styleguide/js/code-viewer.js
+
+/public/styleguide/css/states.css
+/public/styleguide/css/static.css
+/public/styleguide/css/static.scss

README.md

@@ -1,15 +1,13 @@
 ## About the PHP Version of Pattern Lab
 
-The PHP version of Pattern Lab is, at its core, a static site generator. It combines platform-agnostic assets, like the [Mustache](http://mustache.github.io/)-based patterns and the JavaScript-based viewer, with a PHP-based "builder" that transforms and dynamically builds the Pattern Lab site. By making it a static site generator, the PHP version of Pattern Lab strongly separates patterns, data, and presentation from build logic. The PHP version should be seen as a reference for other developers to improve upon as they build their own Pattern Lab Builders in their language of choice.
+The PHP version of Pattern Lab is, at its core, a static site generator. It combines platform-agnostic assets, like the [Mustache](http://mustache.github.io/)-based patterns and the JavaScript-based viewer, with a PHP-based "builder" that transforms and dynamically builds the Pattern Lab site. By making it a static site generator, Pattern Lab strongly separates patterns, data, and presentation from build logic. 
 
 ## Demo
 
-You can play with a demo of the front-end of the PHP version of Pattern Lab at [demo.pattern-lab.info](http://demo.pattern-lab.info).
+You can play with a demo of the front-end of Pattern Lab at [demo.pattern-lab.info](http://demo.pattern-lab.info).
 
 ## Getting Started
 
-The PHP version of Pattern Lab should be relatively easy for anyone to get up and running. 
-
 * [Requirements](http://pattern-lab.info/docs/requirements.html)
 * [Installing the PHP Version of Pattern Lab](http://pattern-lab.info/docs/installation.html)
 * [Upgrading the PHP Version of Pattern Lab](http://pattern-lab.info/docs/upgrading.html)
@@ -46,7 +44,7 @@ The PHP version of Pattern Lab utilizes Mustache as the template language for pa
 
 ## Using Pattern Lab's Advanced Features
 
-By default, the Pattern Lab assets can be manually generated and the Pattern Lab site manually refreshed but who wants to waste time doing that? Here are some ways that the PHP version of Pattern Lab can make your development workflow a little smoother:
+By default, the Pattern Lab assets can be manually generated and the Pattern Lab site manually refreshed but who wants to waste time doing that? Here are some ways that Pattern Lab can make your development workflow a little smoother:
 
 * [Watching for Changes and Auto-Regenerating Patterns](http://pattern-lab.info/docs/advanced-auto-regenerate.html)
 * [Auto-Reloading the Browser Window When Changes Are Made](http://pattern-lab.info/docs/advanced-reload-browser.html)
@@ -56,4 +54,4 @@ By default, the Pattern Lab assets can be manually generated and the Pattern Lab
 * [Preventing the Cleaning of public/](http://pattern-lab.info/docs/advanced-clean-public.html)
 * [Generating CSS](http://pattern-lab.info/docs/advanced-generating-css.html)
 * [Modifying the Pattern Lab Nav](http://pattern-lab.info/docs/advanced-pattern-lab-nav.html)
-* [Integration with Compass](http://pattern-lab.info/docs/advanced-integration-with-compass.html)
+* [Integration with Compass](http://pattern-lab.info/docs/advanced-integration-with-compass.html)

core/config/config.ini.default

@@ -22,7 +22,7 @@ cleanPublic = "true"
 xipHostname = "http://patternlab.*.xip.io"
 
 // which, if any, controls to hide in the nav
-ishControlsHide = ""
+ishControlsHide = "hay"
 
 // the order of pattern states
 patternStates = "inprogress,inreview,complete"

core/source/_data/_data.json

@@ -75,5 +75,19 @@
 	"author" : {
 		"first-name": "Author",
 		"last-name": "Name"
-	}
+	},
+	"hero": true,
+	"emergency" : false,
+	"touts" : [
+		{ },
+		{ },
+		{ }
+	],
+	"latest-posts" : [
+		{ },
+		{ },
+		{ },
+		{ },
+		{ }
+	]
 }

core/source/_patterns/03-templates/00-homepage.mustache

@@ -2,7 +2,7 @@
 	{{> organisms-header }}
 	<div role="main">
 		{{# emergency }}
-			{{> molecules-alert }}
+			{{> molecules-alert:error }}
 		{{/ emergency }}
 		{{# hero }}
 			{{> molecules-block-hero }}
@@ -23,17 +23,18 @@
 				<section class="section latest-posts">
 					<h2 class="section-title">Latest Posts</h2>
 					<ul class="post-list">
-						{{# latest-posts}}
+						{{# latest-posts }}
 							<li>{{> molecules-media-block }}</li>
-						{{/ latest-posts}}
+						{{/ latest-posts }}
 					</ul>
 					<a href="#" class="text-btn">View more posts</a>
 				</section>
-			</div>
+			</div><!--end .l-main-->
 
 			<div class="l-sidebar">
 				{{> organisms-recent-tweets }}
-			</div><!--end l-sidebar-->
+			</div><!--end .l-sidebar-->
+		</div><!--end .l-two-col-->
 	</div><!--End role=main-->
 	{{> organisms-footer }}
 </div>