Fix double template application problem in the default project template.

adinapoli · Jul 19, 2012 · f41a4c2 · f41a4c2
1 parent 2caefe7
commit f41a4c2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/project_template/default/snaplets/heist/templates/_login.tpl b/project_template/default/snaplets/heist/templates/_login.tpl
@@ -0,0 +1,9 @@
+<h1>Snap Example App Login</h1>
+
+<p><loginError/></p>
+
+<bind tag="postAction">/login</bind>
+<bind tag="submitText">Login</bind>
+<apply template="userform"/>
+
+<p>Don't have a login yet? <a href="/new_user">Create a new user</a></p>
diff --git a/project_template/default/snaplets/heist/templates/_new_user.tpl b/project_template/default/snaplets/heist/templates/_new_user.tpl
@@ -0,0 +1,5 @@
+<h1>Register a new user</h1>
+
+<bind tag="postAction">/new_user</bind>
+<bind tag="submitText">Add User</bind>
+<apply template="userform"/>
diff --git a/project_template/default/snaplets/heist/templates/index.tpl b/project_template/default/snaplets/heist/templates/index.tpl
@@ -13,7 +13,7 @@
   </ifLoggedIn>
 
   <ifLoggedOut>
-    <apply template="login"/>
+    <apply template="_login"/>
   </ifLoggedOut>
 
 </apply>
diff --git a/project_template/default/snaplets/heist/templates/login.tpl b/project_template/default/snaplets/heist/templates/login.tpl
@@ -1,11 +1,3 @@
 <apply template="base">
-      <h1>Snap Example App Login</h1>
-
-      <p><loginError/></p>
-
-      <bind tag="postAction">/login</bind>
-      <bind tag="submitText">Login</bind>
-      <apply template="userform"/>
-
-      <p>Don't have a login yet? <a href="/new_user">Create a new user</a></p>
+  <apply template="_login"/>
 </apply>
diff --git a/project_template/default/snaplets/heist/templates/new_user.tpl b/project_template/default/snaplets/heist/templates/new_user.tpl
@@ -1,9 +1,3 @@
 <apply template="base">
-
-      <h1>Register a new user</h1>
-
-      <bind tag="postAction">/new_user</bind>
-      <bind tag="submitText">Add User</bind>
-      <apply template="userform"/>
-
+  <apply template="_new_user" />
 </apply>
diff --git a/snap.cabal b/snap.cabal
@@ -27,7 +27,9 @@ extra-source-files:
   project_template/default/static/screen.css,
   project_template/default/snaplets/heist/templates/base.tpl,
   project_template/default/snaplets/heist/templates/index.tpl,
+  project_template/default/snaplets/heist/templates/_login.tpl,
   project_template/default/snaplets/heist/templates/login.tpl,
+  project_template/default/snaplets/heist/templates/_new_user.tpl,
   project_template/default/snaplets/heist/templates/new_user.tpl,
   project_template/default/snaplets/heist/templates/userform.tpl,
   project_template/default/src/Application.hs,