From fbaf04f30a6822841dd1fcf9952c2a6e66f34629 Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Thu, 9 Jul 2015 19:04:33 -0700 Subject: [PATCH] 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. --- examples/3hellolayout/controllers/main.cfc | 5 ----- examples/3hellolayout/views/main/default.cfm | 5 ++++- examples/4hellocontroller/layouts/default.cfm | 5 +++++ examples/4hellocontroller/layouts/main.cfm | 1 + examples/4hellocontroller/layouts/main/default.cfm | 2 ++ examples/4hellocontroller/views/main/default.cfm | 5 ++++- examples/4hellocontroller/views/main/other.cfm | 4 ++-- examples/5helloservice/views/main/default.cfm | 5 ++++- examples/5helloservice/views/main/other.cfm | 4 ++-- 9 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 examples/3hellolayout/controllers/main.cfc create mode 100644 examples/4hellocontroller/layouts/default.cfm create mode 100644 examples/4hellocontroller/layouts/main.cfm create mode 100644 examples/4hellocontroller/layouts/main/default.cfm diff --git a/examples/3hellolayout/controllers/main.cfc b/examples/3hellolayout/controllers/main.cfc deleted file mode 100644 index 24b9914c..00000000 --- a/examples/3hellolayout/controllers/main.cfc +++ /dev/null @@ -1,5 +0,0 @@ -component { - function default( struct rc ) { - param name="rc.name" default="anonymous"; - } -} diff --git a/examples/3hellolayout/views/main/default.cfm b/examples/3hellolayout/views/main/default.cfm index f9031d49..f1b28a0a 100644 --- a/examples/3hellolayout/views/main/default.cfm +++ b/examples/3hellolayout/views/main/default.cfm @@ -1 +1,4 @@ -Hello #rc.name#! + +

Hello FW1!

+

Go away!

+
diff --git a/examples/4hellocontroller/layouts/default.cfm b/examples/4hellocontroller/layouts/default.cfm new file mode 100644 index 00000000..a3515ab9 --- /dev/null +++ b/examples/4hellocontroller/layouts/default.cfm @@ -0,0 +1,5 @@ + +
+ #body# +
+
diff --git a/examples/4hellocontroller/layouts/main.cfm b/examples/4hellocontroller/layouts/main.cfm new file mode 100644 index 00000000..fb060454 --- /dev/null +++ b/examples/4hellocontroller/layouts/main.cfm @@ -0,0 +1 @@ +
#body#
diff --git a/examples/4hellocontroller/layouts/main/default.cfm b/examples/4hellocontroller/layouts/main/default.cfm new file mode 100644 index 00000000..f709c210 --- /dev/null +++ b/examples/4hellocontroller/layouts/main/default.cfm @@ -0,0 +1,2 @@ +

Welcome to FW/1!

+#body# diff --git a/examples/4hellocontroller/views/main/default.cfm b/examples/4hellocontroller/views/main/default.cfm index f9031d49..0a8704d9 100644 --- a/examples/4hellocontroller/views/main/default.cfm +++ b/examples/4hellocontroller/views/main/default.cfm @@ -1 +1,4 @@ -Hello #rc.name#! + +

Hello #rc.name#!

+

Go away!

+
diff --git a/examples/4hellocontroller/views/main/other.cfm b/examples/4hellocontroller/views/main/other.cfm index d6f48eca..99010b3e 100644 --- a/examples/4hellocontroller/views/main/other.cfm +++ b/examples/4hellocontroller/views/main/other.cfm @@ -1,4 +1,4 @@ -

Goodbye FW/1!

-

Come back!

+

Goodbye #rc.name#!

+

Come back!

diff --git a/examples/5helloservice/views/main/default.cfm b/examples/5helloservice/views/main/default.cfm index f9031d49..0a8704d9 100644 --- a/examples/5helloservice/views/main/default.cfm +++ b/examples/5helloservice/views/main/default.cfm @@ -1 +1,4 @@ -Hello #rc.name#! + +

Hello #rc.name#!

+

Go away!

+
diff --git a/examples/5helloservice/views/main/other.cfm b/examples/5helloservice/views/main/other.cfm index d6f48eca..99010b3e 100644 --- a/examples/5helloservice/views/main/other.cfm +++ b/examples/5helloservice/views/main/other.cfm @@ -1,4 +1,4 @@ -

Goodbye FW/1!

-

Come back!

+

Goodbye #rc.name#!

+

Come back!