Ensure the flow of examples builds on previous

* Remove controller stuff from layout example -- it should build only on linked view example. * Add layouts to controller example -- it should build on the layout example. * Make the views consistent across examples.
framework-one · Jul 10, 2015 · fbaf04f · fbaf04f
1 parent e8a62ef
commit fbaf04f
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 12 deletions.
diff --git a/examples/3hellolayout/controllers/main.cfc b/examples/3hellolayout/controllers/main.cfc
diff --git a/examples/3hellolayout/views/main/default.cfm b/examples/3hellolayout/views/main/default.cfm
@@ -1 +1,4 @@
-<cfoutput>Hello #rc.name#!</cfoutput>
+<cfoutput>
+  <p>Hello FW1!</p>
+  <p><a href="#buildURL('main.other')#">Go away</a>!</p>
+</cfoutput>
diff --git a/examples/4hellocontroller/layouts/default.cfm b/examples/4hellocontroller/layouts/default.cfm
@@ -0,0 +1,5 @@
+<cfoutput>
+  <div style="border: solid green 2px; padding: 20px;">
+    #body#
+  </div>
+</cfoutput>
diff --git a/examples/4hellocontroller/layouts/main.cfm b/examples/4hellocontroller/layouts/main.cfm
@@ -0,0 +1 @@
+<cfoutput><div style="border: solid blue 1px;">#body#</div></cfoutput>
diff --git a/examples/4hellocontroller/layouts/main/default.cfm b/examples/4hellocontroller/layouts/main/default.cfm
@@ -0,0 +1,2 @@
+<h1>Welcome to FW/1!</h1>
+<cfoutput>#body#</cfoutput>
diff --git a/examples/4hellocontroller/views/main/default.cfm b/examples/4hellocontroller/views/main/default.cfm
@@ -1 +1,4 @@
-<cfoutput>Hello #rc.name#!</cfoutput>
+<cfoutput>
+  <p>Hello #rc.name#!</p>
+  <p><a href="#buildURL('main.other&name=#rc.name#')#">Go away</a>!</p>
+</cfoutput>
diff --git a/examples/4hellocontroller/views/main/other.cfm b/examples/4hellocontroller/views/main/other.cfm
@@ -1,4 +1,4 @@
 <cfoutput>
-  <p>Goodbye FW/1!</p>
-  <p><a href="#buildURL('main')#">Come back</a>!</p>
+  <p>Goodbye #rc.name#!</p>
+  <p><a href="#buildURL( action = 'main', queryString = 'name=#rc.name#' )#">Come back</a>!</p>
 </cfoutput>
diff --git a/examples/5helloservice/views/main/default.cfm b/examples/5helloservice/views/main/default.cfm
@@ -1 +1,4 @@
-<cfoutput>Hello #rc.name#!</cfoutput>
+<cfoutput>
+  <p>Hello #rc.name#!</p>
+  <p><a href="#buildURL('main.other&name=#rc.name#')#">Go away</a>!</p>
+</cfoutput>
diff --git a/examples/5helloservice/views/main/other.cfm b/examples/5helloservice/views/main/other.cfm
@@ -1,4 +1,4 @@
 <cfoutput>
-  <p>Goodbye FW/1!</p>
-  <p><a href="#buildURL('main')#">Come back</a>!</p>
+  <p>Goodbye #rc.name#!</p>
+  <p><a href="#buildURL( action = 'main', queryString = 'name=#rc.name#' )#">Come back</a>!</p>
 </cfoutput>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<cfoutput><div style="border: solid blue 1px;">#body#</div></cfoutput>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<h1>Welcome to FW/1!</h1>
		<cfoutput>#body#</cfoutput>