Merge branch 'master' into dev

Author: dmolsen

views/partials/general-footer.twig

@@ -1,5 +1,5 @@
 <script>
-	var patternData = {{{ patternData }}};
+	var patternData = {{ patternData | raw }};
 </script>
 
 <script>

views/partials/patternSection.twig

@@ -1,23 +1,23 @@
-<div id="{{ patternPartial }}" class="sg-pattern">
+<div id="{{ partial.patternPartial }}" class="sg-pattern">
 	<div class="sg-pattern-head">
-		<h3><a href="../../patterns/{{ patternLink }}" class="patternLink" data-patternpartial="{{ patternPartial }}">{{ patternName }}</a></h3>
+		<h3><a href="../../patterns/{{ partial.patternLink }}" class="patternLink" data-patternpartial="{{ partial.patternPartial }}">{{ partial.patternName }}</a></h3>
 		<div class="sg-pattern-head-actions">
 			Pattern header options
 		</div>
 	</div>
-	{% if patternDescExists %}
+	{% if partial.patternDescExists %}
 		<div class="sg-pattern-desc">
-			<p>{{{ patternDesc }}}</p>
-			{% for patternDescAddition in patternDescAdditions %}
-				{{{ patternDescAddition }}}
+			<p>{{ partial.patternDesc | raw }}</p>
+			{% for patternDescAddition in partial.patternDescAdditions %}
+				{{ patternDescAddition | raw }}
 			{% endfor %}
 		</div>
 	{% endif %}
 	<div class="sg-pattern-example">
-		{{{ patternPartialCode }}}
+		{{ patternPartialCode | raw }}
 	</div>
-	{% for patternExampleAddition in patternExampleAdditions %}
-		{{{ patternExampleAddition }}}
+	{% for patternExampleAddition in partial.patternExampleAdditions %}
+		{{ patternExampleAddition | raw }}
 	{% endfor %}
 	<div class="sg-pattern-extra">
 		<div class="sg-pattern-extra-annotations" style="display: none">
@@ -29,49 +29,49 @@
 			<span class="sg-pattern-extra-name">HTML</span>
 			<pre>
 				<code id="sg-pattern-extra-html-container">
-					{{{ patternPartialCodeE }}}
+					{{ partial.patternPartialCodeE | raw }}
 				</code>
 			</pre>
 		</div>
 		<div class="sg-pattern-extra-engine" style="display: none">
-			<span class="sg-pattern-extra-name">{{ patternEngineName }}</span>
+			<span class="sg-pattern-extra-name">{{ partial.patternEngineName }}</span>
 			<pre>
 				<code id="sg-pattern-extra-engine-container">
 				</code>
 			</pre>
 		</div>
 		<div class="sg-pattern-extra-lineage" style="display: none">
 			<span class="sg-pattern-extra-name">Lineages</span>
-			{% if patternLineageExists %}
+			{% if partial.patternLineageExists %}
 				<div class="sg-pattern-extra-lineage">
-					The <span class="sg-pattern-extra-lineage-name">{{ patternPartial }}</span> pattern contains the following pattern(s): 
+					The <span class="sg-pattern-extra-lineage-name">{{ partial.patternPartial }}</span> pattern contains the following pattern(s): 
 					<ul>
-					{% for patternLineage in patternLineages %}
+					{% for patternLineage in partial.patternLineages %}
 						<li> <a href="{{ patternLineage.lineagePath }}" class="{% if patternLineage.lineageState %}sg-pattern-state {{ patternLineage.lineageState }} {% endif %}" data-patternpartial="{{ patternLineage.lineagePattern }}">{{ patternLineage.lineagePattern }}</a></li>
 					{% endfor %}
 					</ul>
 				</div>
 			{% endif %}
-			{% if patternLineageRExists %}
+			{% if partial.patternLineageRExists %}
 				<div class="sg-pattern-extra-lineage">
-					The <span class="sg-pattern-extra-lineage-name">{{ patternPartial }}</span> pattern is included in the following pattern(s): 
+					The <span class="sg-pattern-extra-lineage-name">{{ partial.patternPartial }}</span> pattern is included in the following pattern(s): 
 					<ul>
-					{% for patternLineageR in patternLineagesR %}
+					{% for patternLineageR in partial.patternLineagesR %}
 						<li> <a href="{{ patternLineageR.lineagePath }}" class="{% if patternLineageR.lineageState %}sg-pattern-state {{ patternLineageR.lineageState }} {% endif %}" data-patternpartial="{{ patternLineageR.lineagePattern }}">{{ patternLineageR.lineagePattern }}</a></li>
 					{% endfor %}
 					</ul>
 				</div>
 			{% endif %}
-			{% if not patternLineageEExists %}
-				The <span class="sg-pattern-extra-lineage-name">{{ patternPartial }}</span> pattern doesn't have any lineage information.
+			{% if not partial.patternLineageEExists %}
+				The <span class="sg-pattern-extra-lineage-name">{{ partial.patternPartial }}</span> pattern doesn't have any lineage information.
 			{% endif %}
 		</div>
-		{% if patternCSSExists %}
+		{% if partial.patternCSSExists %}
 			<div class="sg-pattern-extra-css" style="display: none">
-				<span class="sg-pattern-extra-name">{{ patternEngineName }}</span>
+				<span class="sg-pattern-extra-name">{{ partial.patternEngineName }}</span>
 				<pre>
 					<code id="sg-pattern-extra-engine-container">
-						{{ patternCSS }}
+						{{ partial.patternCSS }}
 					</code>
 				</pre>
 			</div>

views/partials/patternSectionSubtype.twig

@@ -1,6 +1,6 @@
-<div id="{{ patternPartial }}" class="sg-subtype">
-	<h2><a href="../../patterns/{{ patternLink }}" class="patternLink" data-patternpartial="{{ patternPartial }}">{{ patternName }}</a></h2>
+<div id="{{ partial.patternPartial }}" class="sg-subtype">
+	<h2><a href="../../patterns/{{ partial.patternLink }}" class="patternLink" data-patternpartial="{{ partial.patternPartial }}">{{ partial.patternName }}</a></h2>
 	<div class="sg-pattern-body">
-		{{{ patternDesc }}}
+		{{ partial.patternDesc | raw }}
 	</div>
 </div>

views/viewall.twig

@@ -6,9 +6,9 @@
 	<div id="sg-patterns">
 		{% for partial in partials %}
 			{% if partial.patternSectionSubtype }}
-				{% include patternSectionSubtype %}
+				{% include "patternSectionSubtype.twig" %}
 			{% else %}
-				{% include patternSection %}
+				{% include "patternSection.twig" %}
 			{% endif %}
 		{% endfor %}
 	</div> <!--end #sg-patterns-->