From 39d697b619c5b836da38d3ae457fee8999055c45 Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Mon, 3 Jun 2013 17:50:17 -0700
Subject: Template Changes and Login Page

Changing templates to have .html in their name to reflect the links on
the site. Also adding a placeholder about page and a rough cut of the
login page.
---
 src/templates/pages/about.html.ftl | 26 ++++++++++++++++++++++++++
 src/templates/pages/index.ftl      | 25 -------------------------
 src/templates/pages/index.html.ftl | 25 +++++++++++++++++++++++++
 src/templates/pages/login.html.ftl | 22 ++++++++++++++++++++++
 4 files changed, 73 insertions(+), 25 deletions(-)
 create mode 100644 src/templates/pages/about.html.ftl
 delete mode 100644 src/templates/pages/index.ftl
 create mode 100644 src/templates/pages/index.html.ftl
 create mode 100644 src/templates/pages/login.html.ftl

diff --git a/src/templates/pages/about.html.ftl b/src/templates/pages/about.html.ftl
new file mode 100644
index 0000000..65a1f1d
--- /dev/null
+++ b/src/templates/pages/about.html.ftl
@@ -0,0 +1,26 @@
+<#include "/macros/common.ftl">
+<#include "/macros/common-page.ftl">
+
+<@commonpage>
+    <@noticebox>
+        The Grow Process focuses on the topic that you want to learn
+        about.  Out 'Assessment' test will give you the right courses
+        fit for your level.
+    </@noticebox>
+
+    <@content>
+        <img src="images/buckets.png" />
+
+        <h1>About</h1>
+        <p>
+            Curabitur mattis molestie ligula, ac vestibulum Curabitur
+            mattis facillisis vel. Iacus facillisis vel. Nam dignissim
+            massa luctus ipsum adipiscing dignissim.
+        </p>
+    </@content>
+
+    <div id="getstarted">
+        <a class="greenbutton" href="index.html">Get Started! &#x2799;</a>
+    </div>
+</@commonpage>
+
diff --git a/src/templates/pages/index.ftl b/src/templates/pages/index.ftl
deleted file mode 100644
index 1505289..0000000
--- a/src/templates/pages/index.ftl
+++ /dev/null
@@ -1,25 +0,0 @@
-<#include "/macros/common.ftl">
-<#include "/macros/common-page.ftl">
-
-<@commonpage>
-    <@noticebox>
-        The Grow Process focuses on the topic that you want to learn
-        about.  Out 'Assessment' test will give you the right courses
-        fit for your level.
-    </@noticebox>
-
-    <@content>
-        <img src="images/buckets.png" />
-
-        <h1>Grow "Buckets"</h1>
-        <p>
-            Curabitur mattis molestie ligula, ac vestibulum Curabitur
-            mattis facillisis vel. Iacus facillisis vel. Nam dignissim
-            massa luctus ipsum adipiscing dignissim.
-        </p>
-    </@content>
-
-    <div id="getstarted">
-        <a class="greenbutton" href="index.html">Get Started! &#x2799;</a>
-    </div>
-</@commonpage>
diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl
new file mode 100644
index 0000000..1505289
--- /dev/null
+++ b/src/templates/pages/index.html.ftl
@@ -0,0 +1,25 @@
+<#include "/macros/common.ftl">
+<#include "/macros/common-page.ftl">
+
+<@commonpage>
+    <@noticebox>
+        The Grow Process focuses on the topic that you want to learn
+        about.  Out 'Assessment' test will give you the right courses
+        fit for your level.
+    </@noticebox>
+
+    <@content>
+        <img src="images/buckets.png" />
+
+        <h1>Grow "Buckets"</h1>
+        <p>
+            Curabitur mattis molestie ligula, ac vestibulum Curabitur
+            mattis facillisis vel. Iacus facillisis vel. Nam dignissim
+            massa luctus ipsum adipiscing dignissim.
+        </p>
+    </@content>
+
+    <div id="getstarted">
+        <a class="greenbutton" href="index.html">Get Started! &#x2799;</a>
+    </div>
+</@commonpage>
diff --git a/src/templates/pages/login.html.ftl b/src/templates/pages/login.html.ftl
new file mode 100644
index 0000000..29e30e9
--- /dev/null
+++ b/src/templates/pages/login.html.ftl
@@ -0,0 +1,22 @@
+<#include "/macros/common.ftl">
+<#include "/macros/common-page.ftl">
+
+<@commonpage>
+    <@noticebox>
+        <#if errorMessage??>
+            ${errorMessage}
+        <#else>
+            Welcome!
+        </#if>
+    </@noticebox>
+
+    <@content>
+        <p>Welcome! You will need to login with your Foursquare Church InFellowship login.</p>
+        <form action="login.html" method="post">
+        <p><label for="emailField">Email:</label> <input id="emailField" type="text" name="email" /></p>
+        <p><label for="passwordField">Password:</label> <input id="passwordField" type="password" name="password" /></p>
+        <p><input type="submit" value="Login" /></p>
+        </form>
+    </@content>
+</@commonpage>
+
-- 
cgit v1.2.3