Merge pull request #177 from CodeForPhilly/develop

Release: laddr v2.3.10
CodeForPhilly · Aug 28, 2017 · ebb9533 · ebb9533
2 parents 5c72b3d + 52f9144
commit ebb9533
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/html-templates/contact/contact.tpl b/html-templates/contact/contact.tpl
@@ -18,6 +18,8 @@
                 <h1>Contact Us</h1>
             </div>
 
+            {contentBlock "contact-introduction"}
+
             <form action="/contact" method="POST" class="contact-form">
                 {if $validationErrors}
                     <div class="alert alert-danger">

diff --git a/html-templates/people/people.tpl b/html-templates/people/people.tpl
@@ -14,6 +14,8 @@
         <h1>{_ "Registered Members"} <span class="badge">{$membersTotal|number_format}</span></h1>
     </div>
 
+    {contentBlock "members-browse-introduction"}
+
     <div class="row">
         <div class="col-sm-4 col-md-3">
             <div class="tags-ct">

diff --git a/html-templates/projects/projectEdit.tpl b/html-templates/projects/projectEdit.tpl
@@ -25,6 +25,8 @@
                     </h1>
                 </div>
 
+                {contentBlock "projects-create-introduction"}
+
                 {if !$Project->isValid}
                 <div class="error well">
                     <strong>{_ "There were problems with your entry:"}</strong>

diff --git a/html-templates/projects/projects.tpl b/html-templates/projects/projects.tpl
@@ -20,6 +20,9 @@
         </div>
         <h1>{_ "Civic Projects Directory"} <span class="badge">{$projectsTotal|number_format}</span></h1>
     </header>
+
+    {contentBlock "projects-browse-introduction"}
+
     <div class="row">
         <div class="col-sm-4 col-md-3 tags-ct">
             <div class="btn-group btn-group-justified btn-group-xs margin-bottom" role="group">

diff --git a/html-templates/register/register.tpl b/html-templates/register/register.tpl
@@ -13,13 +13,14 @@
 {block "content"}
     {$User = $data}
 
-    {contentBlock "register-introduction"}
-
     <div class="row">
         <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
             <div class="page-header">
                 <h1>{_("Register with %s")|sprintf:Laddr::$siteName|escape}!</h1>
             </div>
+
+            {contentBlock "register-introduction"}
+
             <form method="POST" id="register">
                 {strip}
                     {if $User->validationErrors}