diff options
| -rw-r--r-- | src/templates/macros/common-page.ftl | 2 | ||||
| -rw-r--r-- | src/templates/pages/index.html.ftl | 33 | ||||
| -rw-r--r-- | src/templates/templates/header.ftl | 12 | ||||
| -rw-r--r-- | src/templates/templates/nav.ftl | 38 | ||||
| -rw-r--r-- | web/images/foursquarelg.png | bin | 0 -> 5616 bytes | |||
| -rw-r--r-- | web/images/foursquaresm.png | bin | 0 -> 1884 bytes | |||
| -rw-r--r-- | web/style.css | 7 |
7 files changed, 62 insertions, 30 deletions
diff --git a/src/templates/macros/common-page.ftl b/src/templates/macros/common-page.ftl index 92b508f..512128b 100644 --- a/src/templates/macros/common-page.ftl +++ b/src/templates/macros/common-page.ftl @@ -12,7 +12,7 @@ </head> <body> <div id="notfooter"> - <#include "/templates/nav.ftl"> + <#include "/templates/header.ftl"> <#nested> diff --git a/src/templates/pages/index.html.ftl b/src/templates/pages/index.html.ftl index 785e729..94eaec3 100644 --- a/src/templates/pages/index.html.ftl +++ b/src/templates/pages/index.html.ftl @@ -1,7 +1,25 @@ <#include "/macros/common.ftl"> -<#include "/macros/common-page.ftl"> +<!doctype html> +<html> +<head> + <title>Grow Process</title> + + <link href="http://fonts.googleapis.com/css?family=Arvo:400,700" rel="stylesheet"> + <link rel="stylesheet" href="${staticRoot}/style.css" /> + <script src="${staticRoot}/scripts/jquery.min.js"></script> + <script src="${staticRoot}/scripts/jquery-ui.js"></script> + <script src="${staticRoot}/scripts/growth.js"></script> +</head> +<body> +<div id="notfooter"> + <header> + <h1> + <a href="http://myfoursquarechurch.com"><img src="${staticRoot}/images/foursquarelg.png"></a> + </h1> + + <#include "/templates/nav.ftl"> + </header> -<@commonpage> <#include "/templates/index-hero.ftl"> <@content> @@ -10,7 +28,7 @@ GROW is an on-line web based spiritual formation process created by Foursquare Puyallup church with you in mind, to assist you in your journey to discover God, and to be an effective - follower of Jesus Christ. + follower of Jesus Christ. </p> </@content> @@ -18,4 +36,11 @@ <div id="getstarted"> <a class="greenbutton" href="learnmore.html">Learn More! ➙</a> </div> -</@commonpage> + + <div id="push"></div> +</div> + +<#include "/templates/footer.ftl"> + +</body> +</html> diff --git a/src/templates/templates/header.ftl b/src/templates/templates/header.ftl new file mode 100644 index 0000000..8d568bf --- /dev/null +++ b/src/templates/templates/header.ftl @@ -0,0 +1,12 @@ +<header> + <h1> + <#if user??> + <a href="${dynamicRoot}/account"><img src="${staticRoot}/images/logo.png"> Grow Process</a> + <#else> + <a href="${dynamicRoot}/index.html"><img src="${staticRoot}/images/logo.png"> Grow Process</a> + </#if> + <a id="foursquarefloat" href="http://myfoursquarechurch.com"><img src="${staticRoot}/images/foursquaresm.png" alt="Foursqaure Church" /></a> + </h1> + + <#include "/templates/nav.ftl"> +</header> diff --git a/src/templates/templates/nav.ftl b/src/templates/templates/nav.ftl index 6816568..c1f22ae 100644 --- a/src/templates/templates/nav.ftl +++ b/src/templates/templates/nav.ftl @@ -6,28 +6,16 @@ href="${href}"><#nested></a></li> </#macro> -<header> - <h1> - <#if user??> - <a href="${dynamicRoot}/account"><img src="${staticRoot}/images/logo.png"> Grow Process</a> - <#else> - <a href="${dynamicRoot}/index.html"><img src="${staticRoot}/images/logo.png"> Grow Process</a> - </#if> - </h1> - - <nav class="primary"> - <ul> - <@navLink href="${dynamicRoot}/index.html">Home</@navLink> - <@navLink href="${dynamicRoot}/learnmore.html">Learn More</@navLink> - <@navLink href="${dynamicRoot}/contact.html">Contact</@navLink> - <#if user??> - <@navLink href="${dynamicRoot}/account">Keep Growing</@navLink> - <@navLink href="${dynamicRoot}/account/logout">Logout</@navLink> - <#else> - <@navLink href="${dynamicRoot}/login.html">Login / Sign Up</@navLink> - </#if> - <a href="http://myfoursquarechurch.com">Foursquare Church</a> - </ul> - </nav> -</header> - +<nav class="primary"> + <ul> + <@navLink href="${dynamicRoot}/index.html">Home</@navLink> + <@navLink href="${dynamicRoot}/learnmore.html">Learn More</@navLink> + <@navLink href="${dynamicRoot}/contact.html">Contact</@navLink> + <#if user??> + <@navLink href="${dynamicRoot}/account">Keep Growing</@navLink> + <@navLink href="${dynamicRoot}/account/logout">Logout</@navLink> + <#else> + <@navLink href="${dynamicRoot}/login.html">Login / Sign Up</@navLink> + </#if> + </ul> +</nav> diff --git a/web/images/foursquarelg.png b/web/images/foursquarelg.png Binary files differnew file mode 100644 index 0000000..bb01365 --- /dev/null +++ b/web/images/foursquarelg.png diff --git a/web/images/foursquaresm.png b/web/images/foursquaresm.png Binary files differnew file mode 100644 index 0000000..263e0d9 --- /dev/null +++ b/web/images/foursquaresm.png diff --git a/web/style.css b/web/style.css index 17489f9..b6a83f0 100644 --- a/web/style.css +++ b/web/style.css @@ -64,10 +64,17 @@ header h1 img { vertical-align: middle; } +#foursquarefloat { + position: relative; + left: -140px; + top: -20px; +} + header nav { display: inline; float: right; margin-top: 2em; + margin-bottom: 2em; } nav ul { |
