projects / pgdutmpl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cf62f08)
update to 2019
authorgary <garyevans.au@gmail.com>
Mon, 15 Jul 2019 05:33:04 +0000 (15:33 +1000)
committergary <garyevans.au@gmail.com>
Mon, 15 Jul 2019 05:33:04 +0000 (15:33 +1000)
code/pgduinvoices.py patch | blob | blame | history
code/skin_settings.py patch | blob | blame | history
media/pgdu/css/style.css patch | blob | blame | history
media/pgdu/images/conference2018.jpg [new file with mode: 0644] patch | blob
media/pgdu/images/garyhead.jpg [new file with mode: 0644] patch | blob
media/pgdu/images/rajnihead.jpg [new file with mode: 0644] patch | blob
template/base.html patch | blob | blame | history
template/base_pgdu.html patch | blob | blame | history
template/index.html patch | blob | blame | history

diff --git a/code/pgduinvoices.py b/code/pgduinvoices.py
index 125aa74c69e10705656dfc008217502958588db5..761296052b93b4368871d9a7c2bd87ab1b762750 100644 (file)
--- a/code/pgduinvoices.py
+++ b/code/pgduinvoices.py
@@ -6,10 +6,9 @@ from postgresqleu.util.misc.baseinvoice import BaseInvoice,BaseRefund
 class PGDUBase(object):
     logo = os.path.join(settings.PROJECT_ROOT, '../media/img/PostgreSQL_logo.1color_blue.300x300.png')
     headertext = """PostgreSQL Down Under
-Unit 8
-66 Bent Street,
-McKinnon
-VIC 3204
+1-19 Smith Road
+Park Ridge South
+QLD 4125
 Australia
 """
     sendertext = """Your contact: Randal McDonnell
diff --git a/code/skin_settings.py b/code/skin_settings.py
index 0de574eec3d3cf2918795110789b57c86230ab9c..5d8df2ef9756d3d94d07842eb24359a05aac424a 100644 (file)
--- a/code/skin_settings.py
+++ b/code/skin_settings.py
@@ -5,7 +5,7 @@ SERVER_EMAIL="webmaster@pgdu.org"
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'Australia/Melbourne'
+TIME_ZONE = 'Australia/Sydney'
 
 INVOICE_SENDER_EMAIL="treasurer@pgdu.org"
 MEMBERSHIP_SENDER_EMAIL="treasurer@pgdu.org"
diff --git a/media/pgdu/css/style.css b/media/pgdu/css/style.css
index 6ca2fc8d5316368d41c37facb6cd7393e61b4794..12f4230afa2d9f2e363b73b977ff95dcad6d5f06 100644 (file)
--- a/media/pgdu/css/style.css
+++ b/media/pgdu/css/style.css
@@ -210,7 +210,7 @@ div#side {
 }
 
 #banner {
-       background-image: url(../images/conference.jpg);
+       background-image: url(../images/conference2018.jpg);
        background-position: bottom;
        background-size: cover;
        background-repeat: no-repeat;
diff --git a/media/pgdu/images/conference2018.jpg b/media/pgdu/images/conference2018.jpg
new file mode 100644 (file)
index 0000000..86e8e45
Binary files /dev/null and b/media/pgdu/images/conference2018.jpg differ
diff --git a/media/pgdu/images/garyhead.jpg b/media/pgdu/images/garyhead.jpg
new file mode 100644 (file)
index 0000000..e210f13
Binary files /dev/null and b/media/pgdu/images/garyhead.jpg differ
diff --git a/media/pgdu/images/rajnihead.jpg b/media/pgdu/images/rajnihead.jpg
new file mode 100644 (file)
index 0000000..9a0a45d
Binary files /dev/null and b/media/pgdu/images/rajnihead.jpg differ
diff --git a/template/base.html b/template/base.html
index 80ceabe4188ac4af39eee1f17f537ee4a6bea140..cd049683a36a68ef50cf8db7ab634f7f87f45a4b 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.beta.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..c5e6e459315bd189c46d62e3243c1eef1b3ab3ad 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.beta.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..96b0696666bd1174e5fe7ed8877b97f821b03a31 100644 (file)
--- a/template/index.html
+++ b/template/index.html
@@ -71,63 +71,95 @@
 
         <div class="col-sm-2">
           <div class="pic">
-            <img src="/media/pgdu/images/team1.jpg">
+            <img src="/media/pgdu/images/rajnihead.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/garyhead.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>
     </div>
   </div>
PgDU Templates