add more info to Membership, combine boxes

diff --git a/template/index.html b/template/index.html
index 17eae881f88f7c46d2a7d7902d4e0886f9ae5200..2ccd7d6e841c39724edc9e1beecbb20a908f0200 100644 (file)
--- a/template/index.html
+++ b/template/index.html
@@ -14,50 +14,53 @@
         PostgreSQL Down Under Incorporated, known as PGDU, is a non for profit association. Our purpose is
         to support the growth and education of PostgreSQL, The World's Most Advanced Open Source Database.
       </p>
-    </div>
-    <div class="col-lg-6">
-      <h2>Membership</h2>
+      <hr>
+      <h3>Membership</h3>
       <p>
         Are you interested in PostgreSQL growth and education? Do you support PostgreSQL and want to help? By becoming a member
         you will be helping to support our mission and be able to influence what we do.
       </p>
+      <p>
+        Fill out the form <a href="https://docs.google.com/forms/d/1ZSmUMgLcZSdyAyr_qkoUQM7FBEyHQVuV8uUJ_dywJZ8/viewform?edit_requested=true">found here</a>
+        if you're interested in becoming a member. Please send us an email at <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a>
+        if you have any questions.
+      </p>
     </div>
   </div>
-  <div class="row">
-    <div class="col-lg-12">
-      <h2>Upcoming Events</h2>
-      {%for event in events %}
-      <h3 class="text-left">{{event.conferencename}} | {{event.conferencedatestr}}</h3>
-      <h5>{{event.location}}</h5>
-          <ul>
-      {%if event.active%}
-      <li><a href="/events/{{event.urlname}}/register/">Open for registration</a></li>
-      {%endif%}
-      {%if event.callforpapersopen%}
-      <li><a href="/events/{{event.urlname}}/callforpapers/">Call for papers is open</a></li>
-      {%endif%}
-      {%if event.callforsponsorsopen%}
-      <li><a href="/events/sponsor/signup/{{event.urlname}}/">Call for sponsors is open</a></li>
-      {%endif%}
-          </ul>
-    {%endfor%}
-          <p>Here you can find the PostgreSQL Meetup in Australia & New Zealand</p>
-          <ul>
-            <li>
-              <a href="https://www.meetup.com/en-AU/topics/postgresql/au/melbourne/?_cookie-check=ocrvrv_1gY3A_duw">Melbourne PUG</a>
-            </li>
-            <li>
-              <a href="https://www.meetup.com/en-AU/Sydney-PostgreSQL-User-Group/">Sydney PUG</a>
-            </li>
-            <li>
-              <a href="https://www.meetup.com/en-AU/Brisbane-PostgreSQL-User-Group/">Brisbane PUG</a>
-            </li>
-            <li>
-              <a href="https://www.meetup.com/en-AU/Wellington-PostgreSQL-User-Group/">Wellington PUG</a>
-            </li>
-          </ul>
-    </div>
+  <div class="col-lg-6">
+    <h2>Upcoming Events</h2>
+    {%for event in events %}
+    <h3 class="text-left">{{event.conferencename}} | {{event.conferencedatestr}}</h3>
+    <h5>{{event.location}}</h5>
+        <ul>
+    {%if event.active%}
+    <li><a href="/events/{{event.urlname}}/register/">Open for registration</a></li>
+    {%endif%}
+    {%if event.callforpapersopen%}
+    <li><a href="/events/{{event.urlname}}/callforpapers/">Call for papers is open</a></li>
+    {%endif%}
+    {%if event.callforsponsorsopen%}
+    <li><a href="/events/sponsor/signup/{{event.urlname}}/">Call for sponsors is open</a></li>
+    {%endif%}
+        </ul>
+  {%endfor%}
+        <p>Here you can find the PostgreSQL Meetup in Australia & New Zealand</p>
+        <ul>
+          <li>
+            <a href="https://www.meetup.com/en-AU/topics/postgresql/au/melbourne/?_cookie-check=ocrvrv_1gY3A_duw">Melbourne PUG</a>
+          </li>
+          <li>
+            <a href="https://www.meetup.com/en-AU/Sydney-PostgreSQL-User-Group/">Sydney PUG</a>
+          </li>
+          <li>
+            <a href="https://www.meetup.com/en-AU/Brisbane-PostgreSQL-User-Group/">Brisbane PUG</a>
+          </li>
+          <li>
+            <a href="https://www.meetup.com/en-AU/Wellington-PostgreSQL-User-Group/">Wellington PUG</a>
+          </li>
+        </ul>
   </div>
+
 </div>
 
 <div class="jumbotron">