Mergefix

netman92 · netman92 · commit ce92b2089e62 · 2015-10-05T21:40:20.000+02:00
diff --git a/static/gulpfile.litcoffee b/static/gulpfile.litcoffee
@@ -19,7 +19,7 @@ Configuration:
 Build destinations -- whole website is static build from jade templates
 and static files are inside `static` directory.
 
-    BuildRoot = 'build'
+    BuildRoot = 'build/2015'
 
     Destination =
       all: BuildRoot + '/**'
diff --git a/static/jade/components/footer.jade b/static/jade/components/footer.jade
@@ -1,7 +1,7 @@
 footer
   .container
     footer
-      a(href='/coc.html')
+      a(href='/'+year+'/coc.html')
         | Code of Conduct
 
       p.psf-trademark
@@ -11,5 +11,5 @@ footer
         | .
 
       p
-        a(href="mailto:info@pycon.cz")
+        a(href="mailto:"+contactEmail)
           | Feel free to contact us!
diff --git a/static/jade/components/head.jade b/static/jade/components/head.jade
@@ -1,20 +1,22 @@
 meta(charset='utf-8')
-title PyCon CZ 2015
+title PyCon CZ
+  = ' '+ year
+base(href='/'+year+'/')
 meta(name='viewport', content='width=device-width, initial-scale=1.0')
 meta(name='keywords', content='Python, PyCon, Brno, Django, conference, Česká Republika, konference')
 meta(name='description', content='The very first Python conference in the Czech Republic')
-link(rel='shortcut icon', href='/static/images/pycon-cz-logo-icon.svg', type='image/svg+xml')
-link(rel='shortcut icon', href='/static/images/pycon-cz-logo-icon.png', type='image/png')
+link(rel='shortcut icon', href='/'+year+'/static/images/pycon-cz-logo-icon.svg', type='image/svg+xml')
+link(rel='shortcut icon', href='/'+year+'/static/images/pycon-cz-logo-icon.png', type='image/png')
 //if lt IE 9
   script(src='https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.2/html5shiv.min.js')
 link(href='https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css', rel='stylesheet')
-link(href='/static/css/pyconcz.css', rel='stylesheet')
+link(href='/'+year+'/static/css/pyconcz.css', rel='stylesheet')
 
 
 //Facebook Meta
 meta( property="og:title",    content="PyCon CZ 2015" )
 meta( property="og:site_name",  content="cz.pycon.org" )
 meta( property="og:description", content="The very first Python conference in the Czech Republic" )
-meta( property="og:image", content="http://cz.pycon.org/static/images/pycon-cz-logo-fb.png" )
-meta( property="og:url", content="http://cz.pycon.org/" )
+meta( property="og:image", content="http://cz.pycon.org/" + year+ "/static/images/pycon-cz-logo-fb.png" )
+meta( property="og:url", content="http://cz.pycon.org/" +year+"/" )
 meta( property="og:type", content="website" )
diff --git a/static/jade/components/js.jade b/static/jade/components/js.jade
@@ -2,7 +2,7 @@ script(type='text/javascript', src='https://code.jquery.com/jquery-2.1.4.min.js'
 script(type='text/javascript', src='https://maps.google.com/maps/api/js?sensor=true')
 script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/gmaps.js/0.4.12/gmaps.js')
 script(type='text/javascript', src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js')
-script(type='text/javascript', src='/static/js/main.min.js')
+script(type='text/javascript', src='/'+year+'/static/js/main.min.js')
 script.
   (function (i, s, o, g, r, a, m) {
     i['GoogleAnalyticsObject'] = r;
diff --git a/static/jade/components/logo.jade b/static/jade/components/logo.jade
@@ -3,7 +3,7 @@
     h1
       span.label PyCon CZ 2015
       //- img.python-logo(src="/static/images/pycon-cz-logo.png")
-      img.python-logo.img-responsive(alt="PyCon CZ", src="/static/images/pycon-cz-logo.svg", onerror="this.onerror = null; this.src = '/static/images/pycon-cz-logo.png'")
+      img.python-logo.img-responsive(alt="PyCon CZ", src='/'+year+"/static/images/pycon-cz-logo.svg", onerror="this.onerror = null; this.src = '/2015/static/images/pycon-cz-logo.png'")
     .row
       .col-md-6
         p.event-location Brno, Czech Republic
diff --git a/static/jade/components/navbar.jade b/static/jade/components/navbar.jade
@@ -7,22 +7,22 @@ div
           .icon-bar
           .icon-bar
           .icon-bar
-        a.navbar-brand(href="/") PyCon CZ
+        a.navbar-brand(href="/"+year+'/') PyCon CZ
 
       .collapse.navbar-collapse#main-navbar
         ul.nav.navbar-nav
           li
-            a(href='/#speakers') Speakers
+            a(href='/'+year+'/#speakers') Speakers
           li
-            a(href='/#schedule') Schedule
+            a(href='/'+year+'/#schedule') Schedule
           li
-            a(href='/#tickets') Tickets
+            a(href='/'+year+'/#tickets') Tickets
           li
-            a(href='/#sponsors') Sponsors
+            a(href='/'+year+'/#sponsors') Sponsors
           li
-            a(href='/team.html') Team
+            a(href='/'+year+'/team.html') Team
           li
-            a(href='/#venue') Venue
+            a(href='/'+year+'/#venue') Venue
         ul.right.nav
           li
             a(href='https://twitter.com/pyconcz', target='_blank')
diff --git a/static/jade/components/vars.jade b/static/jade/components/vars.jade
@@ -0,0 +1,3 @@
+- var contactEmail = "info@pycon.cz"
+- var year = "2015"
+- var ticketsLink = "https://ti.to/pyvec/pycon-cz-2015/"
diff --git a/static/jade/index.jade b/static/jade/index.jade
@@ -1,4 +1,4 @@
-- var contactEmail = "info@pycon.cz"
+include components/vars
 
 doctype html
 html(lang='en-us')
diff --git a/static/jade/pages/speakers.jade b/static/jade/pages/speakers.jade
@@ -5,39 +5,39 @@
     .col-md-12
       .cfp-notice
         p.lead
-          | We are still looking for speakers! You can 
+          | We are still looking for speakers! You can
           a.cfp-link(href='http://goo.gl/forms/8Tc22glxxc', target='_blank') submit your talk
-          |  until 
+          |  until
           strong 28th September
           | .
-          
+
       p.lead.
         Two very special speakers accepted our invitation for keynotes:
         Amber Brown and Russell Keith-Magee. We're really excited to have
         them both aboard!
 
   .keynote-speaker
     .keynote-avatar
-      img(src='/static/images/speakers/amber_brown.jpg', alt='Avatar of Amber Brown')
+      img(src='/'+year+'/static/images/speakers/amber_brown.jpg', alt='Avatar of Amber Brown')
     .keynote-description
       h3.name
-        | Amber Brown 
+        | Amber Brown
         a.speaker-link(href="https://twitter.com/hawkieowl")
           .fa.fa-twitter
-            
+
       p.short-description Twisted project Core Developer
       p.description.
         Amber, better known as HawkOwl, is a core developer and release manager
         of the Twisted project. In her spare time she writes web applications,
         works on Twisted, and organizes events such as GovHack and Django Girls.
-  
+
   .keynote-speaker
     .keynote-avatar
-      img(src='/static/images/speakers/russell_keith_magee.png', alt='Photo of Russel Keith-Magee')
-      
+      img(src='/'+year+'/static/images/speakers/russell_keith_magee.png', alt='Photo of Russel Keith-Magee')
+
     .keynote-description
       h3.name
-        | Russell Keith-Magee 
+        | Russell Keith-Magee
         a.speaker-link(href="https://twitter.com/freakboy3742")
           .fa.fa-twitter
       p.short-description Django Core Developer
@@ -55,7 +55,7 @@
       p.lead.
         PyCon CZ is community-driven event focused on Python programming language.
         We would like to gather the most interesting talks from various fields.
-        
+
       p.lead.alert-success.alert.
         Call for papers was so successful that we've decided to open #[b second track]
         of talks. This requires an extra work and more preparations, so we're going
diff --git a/static/jade/pages/sponsors.jade b/static/jade/pages/sponsors.jade
@@ -8,7 +8,7 @@ h2 Our sponsors
          designers, and community members from all over.
          This year we expect at least 250 attendees to whom you could present your
          company. If you are interested in sponsoring our event, see our
-         #[a(href="/sponsorship.html") sponsorship packages].
+         #[a(href='/'+year+"/sponsorship.html") sponsorship packages].
 
 .container
   h3 Platinum sponsor
@@ -21,10 +21,10 @@ h2 Our sponsors
   .silver
     .sponsor
       a.sponsor.twisto(href="https://www.twisto.cz", target="_blank")
-        img(src="/static/images/sponsors/logo-twisto.jpg")
+        img(src='/'+year+"/static/images/sponsors/logo-twisto.jpg")
 
   h3 Silver sponsors
   .bronze
     .sponsor
       a.sponsor.imper(href="https://imper.cz", target="_blank")
-        img(src="/static/images/sponsors/logo-imper.png")
+        img(src='/'+year+"/static/images/sponsors/logo-imper.png")
diff --git a/static/jade/pages/tickets.jade b/static/jade/pages/tickets.jade
@@ -1,52 +1,50 @@
--var ticketsLink = "https://ti.to/pyvec/pycon-cz-2015/"
-
 .container
-  
+
   .row
     .col-md-12
       h2 Tickets
-      
+
       p.lead
         a.tickets-link(href=ticketsLink) Ticket sales
-        |  are now open. We have rates for individuals, corporate 
-        | attendees and also for students. It's simple: We want you all to 
-        | attend the first year edition of #[strong PyCon CZ]. 
-      
+        |  are now open. We have rates for individuals, corporate
+        | attendees and also for students. It's simple: We want you all to
+        | attend the first year edition of #[strong PyCon CZ].
+
       .tickets-join
         a.btn-tickets(href=ticketsLink) Join us now!
-      
+
       h3 What's included in ticket price
-      
+
       ul.ticket-features
         li all #[strong two days] of the event - talks, sprints and workshops
         li lunch and refreshments on both days
         li delicious #[strong coffee] with awesome #[strong Czech cakes] during breaks
         li t-shirt, full bag of conference swag and gifts
-    
+
       p.
         Accomodation and travel costs are not covered. However, we'll try to
         find you the best hotel deals in Brno.
-        
+
       h3 What ticket is the right for me?
-      
+
       p.
         We try to keep the ticket prices as low as possible. Every corporate
         ticket allows us to issue two #[strong Student] tickets. If you employer
         is paying for your ticket, please select a #[strong Corporate] rate.
-      
+
       p.
         Do you want to buy more than 10 tickets for your employees? Consider
-        our #[a(href="/sponsorship.html") sponsorship] packages and contact us
+        our #[a(href='/'+year+"/sponsorship.html") sponsorship] packages and contact us
         directly.
-    
+
       h3 Where does all the money go?
-      
+
       p.
         This is non-profit event run by volunteers and driven by the community.
         #[strong Everything] we receive from your ticket purchases goes
         directly towards the costs of running the event and making it enjoyable
         and memorable for all attendees.
-      
+
 
       //script(src="https://js.tito.io/v1", async)
       //tito-widget(event="pyvec/pycon-cz-2015", ssl-check-disabled)
diff --git a/static/jade/real_pages/coc.jade b/static/jade/real_pages/coc.jade
@@ -1,3 +1,4 @@
+include ../components/vars
 doctype html
 html(lang='en-us')
   head
diff --git a/static/jade/real_pages/getting-here.jade b/static/jade/real_pages/getting-here.jade
@@ -1,3 +1,4 @@
+include ../components/vars
 doctype html
 html(lang='en-us')
   head
diff --git a/static/jade/real_pages/sponsorship.jade b/static/jade/real_pages/sponsorship.jade
@@ -1,3 +1,4 @@
+include ../components/vars
 doctype html
 html(lang='en-us')
   head
@@ -9,7 +10,7 @@ html(lang='en-us')
       h2.text-center Become our partner
       .row
         .col-md-8.col-md-push-2
-          p.lead #[a(href="/", ) PyCon CZ] is a two-day conference organized by the Python community for the Python community. The conference will include 1 full day of talks featuring 2 international keynote speakers (all sessions will be held in English), and 1 day of sprints and workshops where Pythonistas can get together and work on their open source projects.
+          p.lead #[a(href='/'+year+"/", ) PyCon CZ] is a two-day conference organized by the Python community for the Python community. The conference will include 1 full day of talks featuring 2 international keynote speakers (all sessions will be held in English), and 1 day of sprints and workshops where Pythonistas can get together and work on their open source projects.
           p.lead This year is the first edition of PyCon CZ, and we look forward to bringing the tradition of diverse and insightful speakers, top-quality venues, and a great atmosphere to the Czech Republic. Regional PyCons are well-known for attracting developers, sysadmins, writers, designers, and community members from all over.
           p.lead These packages are recommendations for your company or organization. If you would like to contribute a different amount or alternative sponsorship format, please let us know and we’ll be happy to discuss custom packages.
 
diff --git a/static/jade/real_pages/team.jade b/static/jade/real_pages/team.jade
@@ -1,3 +1,4 @@
+include ../components/vars
 doctype html
 html(lang='en-us')
   head
@@ -26,7 +27,7 @@ html(lang='en-us')
           p.description Tickets &amp; Mentoring
 
         .col-md-3
-          img(src='/static/images/team/natali.jpg', alt='')
+          img(src='/'+year+'/static/images/team/natali.jpg', alt='')
           p.name
             #[a(href="https://www.facebook.com/natali.debosque", target="_blank") Natália Sedláková]
           p.description DjangoGirls organizer
@@ -57,19 +58,19 @@ html(lang='en-us')
           p.description Speakers
       .row
         .col-md-3
-          img(src='/static/images/team/petr.jpg', alt='')
+          img(src='/'+year+'/static/images/team/petr.jpg', alt='')
           p.name
             #[a(href="http://encukou.cz", target="_blank") Petr Viktorin]
           p.description Sprints &amp; Workshops
 
         .col-md-3
-          img(src='/static/images/team/vehrlich.jpg', alt='')
+          img(src='/'+year+'/static/images/team/vehrlich.jpg', alt='')
           p.name
             #[a(href="https://twitter.com/melront", target="_blank") Václav Ehrlich ]
           p.description Photographer
 
         .col-md-3
-          img(src='/static/images/team/chris.jpg', alt='')
+          img(src='/'+year+'/static/images/team/chris.jpg', alt='')
           p.name
             #[a(href="https://twitter.com/kejbaly2", target="_blank") Chris Ward]
           p.description Sponsors

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+- var contactEmail = "info@pycon.cz"`
	`2`	`+- var year = "2015"`
	`3`	`+- var ticketsLink = "https://ti.to/pyvec/pycon-cz-2015/"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-- var contactEmail = "info@pycon.cz"`
	`1`	`+include components/vars`
`2`	`2`
`3`	`3`	`doctype html`
`4`	`4`	`html(lang='en-us')`