projects / pgdutmpltest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf62f08)
2019 changes
authorgary <garyevans.au@gmail.com>
Thu, 13 Jun 2019 00:01:59 +0000 (10:01 +1000)
committergary <garyevans.au@gmail.com>
Thu, 13 Jun 2019 00:01:59 +0000 (10:01 +1000)
template/base.html patch | blob | blame | history
template/base_pgdu.html patch | blob | blame | history
template/index.html patch | blob | blame | history
template/orig.html patch | blob | blame | history

diff --git a/template/base.html b/template/base.html
index 80ceabe4188ac4af39eee1f17f537ee4a6bea140..402363a32e2a8b9bec2abb37a3b8def2866b6154 100644 (file)
--- a/template/base.html
+++ b/template/base.html
@@ -3,7 +3,7 @@
    <head>
        <meta charset="UTF-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-       <meta name="description" content="PGDU 2018" />
+       <meta name="description" content="PGDU 2019" />
        <meta name="keywords" content="PostgreSQL" />
        <meta name="author" content="PostgreSQL Down Under, Inc." />
 
@@ -39,7 +39,7 @@
                        <ul class="nav navbar-nav navbar-right">
                            <li><a href="/">Home</a></li>
               <li><a href="https://docs.google.com/forms/d/1ZSmUMgLcZSdyAyr_qkoUQM7FBEyHQVuV8uUJ_dywJZ8/edit">Become a member</a></li>
-              <li><a href="https://2018.pgdu.org/">PGDay 2018</a></li>
+              <li><a href="https://2019.pgdu.org/">PGDay 2019</a></li>
             {%if user.is_authenticated %}
               <li><a href="/logout">Log Out</a></li>
             {%endif%}
@@ -61,7 +61,7 @@
            <!-- Footer -->
            <footer id="side">
                <p>
-               <a href="/code-of-conduct">Code of Conduct</a> | @PGDayAU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2018 PostgreSQL Down Under Inc.
+               <a href="/code-of-conduct">Code of Conduct</a> | @PGDayAU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2019 PostgreSQL Down Under Inc.
          </p>
       </footer>
 
diff --git a/template/base_pgdu.html b/template/base_pgdu.html
index 68fdb218fa4c4ffb00168a3f2defcff6aa413816..b44812fc8962b2e2bd9fa6ba4000a832d5acf8ab 100644 (file)
--- a/template/base_pgdu.html
+++ b/template/base_pgdu.html
@@ -3,7 +3,7 @@
    <head>
        <meta charset="UTF-8">
        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-       <meta name="description" content="PGDU 2018" />
+       <meta name="description" content="PGDU 2019" />
        <meta name="keywords" content="PostgreSQL" />
        <meta name="author" content="PostgreSQL Down Under, Inc." />
 
@@ -39,7 +39,7 @@
                        <ul class="nav navbar-nav navbar-right">
                            <li><a href="/">Home</a></li>
               <li><a href="https://docs.google.com/forms/d/1ZSmUMgLcZSdyAyr_qkoUQM7FBEyHQVuV8uUJ_dywJZ8/edit">Become a member</a></li>
-              <li><a href="https://2018.pgdu.org/">PGDay 2018</a></li>
+              <li><a href="https://2019.pgdu.org/">PGDay 2019</a></li>
             {%if user.is_authenticated %}
               <li><a href="/logout">Log Out</a></li>
             {%endif%}
@@ -53,7 +53,7 @@
            <!-- Footer -->
            <footer>
                <p>
-               <a href="/code-of-conduct">Code of Conduct</a> | @PGDayAU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2018 PostgreSQL Down Under Inc.
+               <a href="/code-of-conduct">Code of Conduct</a> | @PGDayAU | <a href="mailto:pgdu-committee@lists.pgdu.org">pgdu-committee@lists.pgdu.org</a> | © 2019 PostgreSQL Down Under Inc.
          </p>
       </footer>
 
diff --git a/template/index.html b/template/index.html
index 8b02474e317f95a852a284716d59362a07905110..084e3a2f37b8dbabfcaca446b8d9e0b506686da6 100644 (file)
--- a/template/index.html
+++ b/template/index.html
@@ -71,61 +71,92 @@
 
         <div class="col-sm-2">
           <div class="pic">
-            <img src="/media/pgdu/images/team1.jpg">
+            <img src="/media/pgdu/images/team4.jpg">
           </div>
-          <h3 class="title">Tyson Clugg</h3>
+          <h3 class="title">Rajni Baliyan</h3>
           <span class="post">President</span>
         </div>
 
         <div class="col-sm-2">
           <div class="pic">
-            <img src="/media/pgdu/images/team2.jpg">
+            <img src="/media/pgdu/images/team7.jpg">
           </div>
-          <h3 class="title">Andrea Cucciniello</h3>
+          <h3 class="title">Matthew Kemp</h3>
           <span class="post">Secretary</span>
         </div>
 
         <div class="col-sm-2">
           <div class="pic">
-            <img src="/media/pgdu/images/team3.jpg">
+            <img src="/media/pgdu/images/team1.jpg">
           </div>
-          <h3 class="title">Gary Evans</h3>
+          <h3 class="title">Tyson Clug</h3>
           <span class="post">Vice President</span>
         </div>
 
+        <div class="col-sm-2">
+         <div class="pic">
+           <img src="/media/pgdu/images/team6.jpg">
+         </div>
+         <h3 class="title">Randal McDonnel</h3>
+         <span class="post">Treasurer</span>
+        </div>
+
+        <div class="col-sm-2">
+         <div class="pic">
+           <img src="/media/pgdu/images/team5.jpg">
+         </div>
+         <h3 class="title">James Sewell</h3>
+         <span class="post">Sponsorship Officer</span>
+        </div>
+
         <div class="col-sm-2">
           <div class="pic">
-            <img src="/media/pgdu/images/team4.jpg">
+            <img src="/media/pgdu/images/team3.jpg">
           </div>
-          <h3 class="title">Rajni Baliyan</h3>
+          <h3 class="title">Gary Evans</h3>
           <span class="post">Committee Member</span>
         </div>
+      </div>
+      <div class="row">
 
         <div class="col-sm-2">
          <div class="pic">
-           <img src="/media/pgdu/images/team7.jpg">
+           <img src="/media/pgdu/images/mstile-310x310.png">
          </div>
-         <h3 class="title">Matt Kemp</h3>
-         <span class="post">Committee Member</span>
+         <h3 class="title">Stephen Frost</h3>
+         <span class="post">Committe Member</span>
         </div>
 
         <div class="col-sm-2">
          <div class="pic">
-           <img src="/media/pgdu/images/team5.jpg">
+           <img src="/media/pgdu/images/mstile-310x310.png">
          </div>
-         <h3 class="title">James Sewell</h3>
-         <span class="post">Sponsorship Officer</span>
+         <h3 class="title">Thomas Munro</h3>
+         <span class="post">Committe Member</span>
         </div>
 
-      </div>
-      <div class="row">
+        <div class="col-sm-2">
+         <div class="pic">
+           <img src="/media/pgdu/images/mstile-310x310.png">
+         </div>
+         <h3 class="title">David Micallef</h3>
+         <span class="post">Committe Member</span>
+        </div>
 
         <div class="col-sm-2">
          <div class="pic">
-           <img src="/media/pgdu/images/team6.jpg">
+           <img src="/media/pgdu/images/mstile-310x310.png">
          </div>
-         <h3 class="title">Randal McDonnell</h3>
-         <span class="post">Treasurer</span>
+         <h3 class="title">Craig Ringer</h3>
+         <span class="post">Committe Member</span>
+        </div>
+
+        <div class="col-sm-2">
+         <div class="pic">
+           <img src="/media/pgdu/images/mstile-310x310.png">
+         </div>
+         <h3 class="title">Atif</h3>
+         <span class="post">Committe Member</span>
         </div>
 
       </div>
diff --git a/template/orig.html b/template/orig.html
index 20d94532e35bc6946bb43db982a126f8f8cce027..cd35823eaa1a478e6a4ba936758e93519523309b 100644 (file)
--- a/template/orig.html
+++ b/template/orig.html
@@ -24,7 +24,7 @@
           <a href="mailto:pgdu-committee@lists.pgdu.org">Contact Us</a>
         </li>
         <li>
-          <a href="https://2017.pgday.com.au/">PGDay 2018</a>
+          <a href="https://2019.pgday.com.au/">PGDay 2019</a>
         </li>
       </ul>
     </nav>
@@ -45,13 +45,13 @@
 
         <section>
           <h2>Upcoming Events</h2>
-          <p> PGDay Down Under 2018 - Melbourne, December 8th!
-            <br> Call for Papers is now open. <br>Submit your proposal now!!
+          <p> PGDay Down Under 2019 - Sydney, November 15th!
+        <!--    <br> Call for Papers is now open. <br>Submit your proposal now!!
             <ul>
               <li>
                 <a href="https://docs.google.com/forms/d/1TNEqIbP6XbvKQYBDp85SHzROu2JyiNVkjDKGzfEXV_U/edit">Submit CFP Form</a>
               </li>
-            </ul>
+            </ul>-->
             <p>Here you can find the PostgreSQL Meetup in Australia & New Zealand</p>
             <ul>
               <li>
PgDU Template Test