From 2c87fb19d34739e5f6a91b43a29f338ee766e9b3 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Jul 29 2016 21:20:54 +0000
Subject: merge conflicting commits and we are ready to go - thx ryanlerch


---
diff --git a/fedoraproject.org/data/content/join-fedora.html b/fedoraproject.org/data/content/join-fedora.html
index 172f74b..569941b 100644
--- a/fedoraproject.org/data/content/join-fedora.html
+++ b/fedoraproject.org/data/content/join-fedora.html
@@ -3,10 +3,10 @@
 fpp = feedparse('http://fedoraplanet.org/rss20.xml')
 
 # Announce List
-fda = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.core.announce')
+# fda = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.core.announce')
 
 # Devel List
-fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.devel.announce')
+# fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedora.devel.announce')
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -88,7 +88,7 @@ fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedor
                     <img src="${path}/static/images/join-people.png" alt="people_person" /></a>
                     <h5><a href="https://fedoraproject.org/wiki/Join#People_Person">${_('People Person')}</a></h5>
                     <p><a href="https://fedoraproject.org/wiki/Join#People_Person">${_('Outgoing and persuasive, these folks thrive interacting with folks at events and online!')}</a></p>
-		    
+
                     <a href="https://fedoraproject.org/wiki/Join#People_Person">${_('Learn more &gt;')}</a>
                 </div>
                 <div class="grid_2">
@@ -96,7 +96,7 @@ fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedor
                     <img src="${path}/static/images/join-osdevel.png" alt="os_dev"/></a>
                     <h5><a href="https://fedoraproject.org/wiki/Join#OS_Developer">${_('OS Developer')}</a></h5>
                     <p><a href="https://fedoraproject.org/wiki/Join#OS_Developer">${_('These technically-talented developers write new features, track down bugs, and help package software.')}</a></p>
-                    
+
                     <a href="https://fedoraproject.org/wiki/Join#OS_Developer">${_('Learn more &gt;')}</a>
                 </div>
                 <div class="grid_2">
@@ -104,7 +104,7 @@ fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedor
                     <img src="${path}/static/images/join-translator.png" alt="translator" /></a>
                     <h5><a href="https://fedoraproject.org/wiki/Join#OS_Developer">${_('Translator')}</a></h5>
                     <p><a href="https://fedoraproject.org/wiki/Join#OS_Developer">${_('Multi-lingual and gifted writers, these folks help maintain &amp; expand Fedora\'s supported languages.')}</a></p>
-                    
+
                     <a href="https://fedoraproject.org/wiki/Join#Translator">${_('Learn more &gt;')}</a>
                 </div>
                 <div class="grid_2">
@@ -112,7 +112,7 @@ fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedor
                     <img src="${path}/static/images/join-webdevel.png" alt="web-dev" /></a>
                     <h5><a href="https://fedoraproject.org/wiki/Join#Web_Developer_or_Administrator">${_('Web Developer or Administrator')}</a></h5>
                     <p><a href="https://fedoraproject.org/wiki/Join#Web_Developer_or_Administrator">${_('These system administrators and web-savvy developers build the infrastructure that runs Fedora.')}</a></p>
-		    
+
                     <a href="https://fedoraproject.org/wiki/Join#Web_Developer_or_Administrator">${_('Learn more &gt;')}</a>
                 </div>
             </div>
@@ -141,14 +141,7 @@ fdd = feedparse('http://rss.gmane.org/messages/excerpts/gmane.linux.redhat.fedor
             </div>
             <div class="grid_5">
                 <h4>${_('Latest Announcements')}</h4>
-                <ul>
-                    <li py:for="entry in fda[:2]" py:if="'title' in entry">
-                        <h5><a href="${entry['link']}">${entry['title']}</a></h5>
-                    </li>
-                    <li py:for="entry in fdd[:2]" py:if="'title' in entry">
-                        <h5><a href="${entry['link']}">${entry['title']}</a></h5>
-                    </li>
-                </ul>
+
             </div>
             <div class="grid_6">
                 <h4>${_('Latest Fedora Planet posts')}</h4>
diff --git a/flocktofedora.org/data/content/index.html b/flocktofedora.org/data/content/index.html
index 2dd937b..0d649b4 100644
--- a/flocktofedora.org/data/content/index.html
+++ b/flocktofedora.org/data/content/index.html
@@ -10,19 +10,33 @@
 
   <body class="home" data-spy="scroll" data-target="#flocknav">
     <xi:include href="../templates/head.html" />
-    <div id="welcome" class="jumbotron flock-groupimg text-center">
+    <div id="welcome" class="non-jumbo flock-groupimg text-center">
   	  <div class="container">
         <div class="row">
-          <div class="col-xs-10 col-xs-offset-1 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">
-          <img src="${path}/static/images/index/coverimage.png" width="100%"/>
-          </div>
           <div class="col-xs-12 col-md-8 col-md-offset-2">
-            <h2>Welcome to Flock 2016</h2>
+            <div class="alert alert-info" role="alert">
+              <strong>Flock Travel Advisory:</strong> due to World Youth Day festivities in Krakow, Poland will
+              <a href="http://www.pope2016.com/en/wyd-2016/security/news,458023,poland-to-restore-border-controls-july-2-31.html">impose border controls at all of its national borders from
+              July 4 to August 2.</a>
+            </div>
             <p>
               Welcome to Flock 2016 in Krakow! Now in its fourth year, Flock is a fun and productive
               event which brings the Fedora community together to discuss new ideas — and to put
               those ideas into practice in hackfests and workshops.
             </p>
+            <br/>
+          </div>
+          <div class="col-xs-10 col-xs-offset-1 col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">
+          <img src="${path}/static/images/index/coverimage.png" width="100%"/>
+          </div>
+          <div class="col-xs-12 col-md-8 col-md-offset-2">
+            <br/>
+            <p>
+              <small><strong>Attendance at Flock is free and open to all.</strong> Pre-registration is closed but
+              anyone is still welcome to attend. However, unregistered attendees may miss out on swag
+              or the evening events as these are booked based on pre-registration. If you did pre-register, can view
+              your information on the <a href="https://register.flocktofedora.org/">registration page.</a></small>
+            </p>
           </div>
         </div>
   	  </div>
@@ -92,7 +106,7 @@
 	  </p>
         </div>
       </div>
-      </div>
+    </div>
     </div>
 
     <div id="venue" class="non-jumbo text-center">
diff --git a/flocktofedora.org/data/content/sponsorship/index.html b/flocktofedora.org/data/content/sponsorship/index.html
index 3c41bb1..7adbf43 100644
--- a/flocktofedora.org/data/content/sponsorship/index.html
+++ b/flocktofedora.org/data/content/sponsorship/index.html
@@ -52,7 +52,7 @@
 	    <div class="panel-body">
 	      <div class="row">
 		<div class="col-xs-12 col-sm-2">
-		  <img src="../../../static/images/sponsors/redhat.png"/>
+		  <a href="https://redhat.com"><img src="../../../static/images/sponsors/redhat.png"/></a>
 		</div>
 	      </div>
 	    </div>
@@ -69,7 +69,7 @@
 	    <div class="panel-body">
 	      <div class="row">
 		<div class="col-xs-12 col-sm-2">
-		  <img src="../../../static/images/opensuse.png"/>
+		  <a href="http://opensuse.org"><img src="../../../static/images/opensuse.png"/></a>
 		</div>
 	      </div>
 	    </div>
@@ -103,7 +103,13 @@
 	    <div class="panel-body">
 	      <div class="row">
 		<div class="col-xs-12 col-sm-2">
-		  <img src="../../../static/images/LF_logo_NEW_Pantone.png"/>
+		  <a href="https://linuxfoundation.org"><img src="../../../static/images/LF_logo_NEW_Pantone.png"/></a>
+		</div>
+		<div class="col-xs-12 col-sm-2">
+		  <a href="https://www.stickermule.com"><img src="../../../static/images/sticker-mule.png"/></a>
+		</div>
+		<div class="col-xs-12 col-sm-2">
+		  <a href="https://www.unixstickers.com"><img src="../../../static/images/unixstickers.png"/></a>
 		</div>
 		<div class="col-xs-12 col-sm-2">
 		  <img src="../../../static/images/sticker-mule.png"/>
diff --git a/flocktofedora.org/data/templates/head.html b/flocktofedora.org/data/templates/head.html
index 02fc77a..619793d 100644
--- a/flocktofedora.org/data/templates/head.html
+++ b/flocktofedora.org/data/templates/head.html
@@ -18,7 +18,7 @@
             <span class="icon-bar"></span>
           </button>
           <a id="index_menu" class="navbar-brand" href="/">
-            <img src="${path}/static/images/flocklogo.png" height="40px"/>
+            <img src="${path}/static/images/flocklogo.png" height="30px"/>
           </a>
         </div>
         <div class="collapse navbar-collapse">
diff --git a/flocktofedora.org/static/css/flock.css b/flocktofedora.org/static/css/flock.css
index dd7b221..96cb7fc 100644
--- a/flocktofedora.org/static/css/flock.css
+++ b/flocktofedora.org/static/css/flock.css
@@ -1,6 +1,6 @@
 body{
   position:relative;
-  margin-top:70px;
+  margin-top:55px;
 }
 
 .flock-groupimg {
@@ -15,13 +15,21 @@ body{
 }
 
 .flock-navbar ul.nav {
-    margin-top:0.4em;
+    margin-top:0.6em;
 }
 
 .navbar {
   margin-bottom: 0 !important;
 }
 
+.nav > li > a {
+  padding: 5px 10px;
+}
+
+.navbar-brand{
+  padding: 10px 15px;
+}
+
 .flock-info-item {
   text-align: center;
 }
@@ -58,7 +66,7 @@ font-size: 50px;
 }
 
 .non-jumbo p{
-  font-size: 1.3em;
+  font-size: 1.1em;
 }
 
 
@@ -86,3 +94,8 @@ hr
   border-top: 2px solid white;
 
 }
+
+#welcome
+{
+  padding-top: 1em;
+}

