Update robotics images

static/src/js/globals.js

@@ -1,3 +1,7 @@
 window.updateTitle = function (value) {
   document.title = value + ' | TheOrangeOne';
 };
+
+if ($('.header h1').length) {
+  window.updateTitle($('.header h1').text());
+}

static/src/less/components.less

@@ -4,4 +4,5 @@
   background-repeat: no-repeat;
   background-position: center;
   width: 100%;
+  margin-top: 20px;
 }

static/src/less/style.less

@@ -35,6 +35,10 @@ ol , ul{
   }
 }
 
+blockquote {
+  font-size: @font-size-base + 1px;
+}
+
 a.no-color-change {
   color: inherit;
   &:hover {

templates/content_base.html

@@ -8,9 +8,11 @@
   <div class="jumbotron header">
     <div class="container">
       <h1>{% block pageTitle %}{% endblock %}</h1>
+      {% block header_image %}
         {% if header_image %}
           <div class="image" style="background-image: url({{ header_image }});"></div>
         {% endif %}
+      {% endblock %}
       <div id="breadcrumbs"></div>
     </div>
     <navbar></navbar>

templates/robotics/2014/index.html

@@ -2,6 +2,8 @@
 
 {% block pageTitle %}Student Robotics 2014{% endblock %}
 
+{% block header_image %}<div class="image" style="background-image: url(https://farm9.staticflickr.com/8806/17113612128_0f51767744_k_d.jpg);"></div>{% endblock %}
+
 {% block content%}
   <div class="container">
     <div class="row">
@@ -26,8 +28,8 @@
         <div class="list-group">
           <a class="list-group-item active h4">Quick Links</a>
           <a href="https://github.com/SR-CLY/2014" class="list-group-item">The Code</a>
-          <a href="" class="list-group-item">Gallery</a>
+          <a href="https://www.flickr.com/photos/theorangeone/albums/72157651820386449" class="list-group-item">Gallery</a>
-          <a href="" class="list-group-item">Blog</a>
+          <a href="http://collyers-robotics14.tumblr.com/" class="list-group-item">Blog</a>
           <a href="https://www.studentrobotics.org/schools/game#2014" class="list-group-item">Competition Information</a>
         </div>
       </div>

templates/robotics/2015/index.html

@@ -6,7 +6,7 @@
   <div class="container">
     <div class="row">
       <div class="col-sm-4">
-        <img class="img-rounded" src="https://farm1.staticflickr.com/737/20984044320_ccbba155f9_o.gif" />
+        <img class="img-rounded" src="https://c2.staticflickr.com/8/7726/17309695331_584e7de16c_z.jpg" />
       </div>
       <div class="col-sm-8">
         <p>Welcome to the homepage of Collyer's Student Robotics Team 2015 (The 'A' Team) - Creators of 'A.L.I.C.E'! Here you can see everything that goes on throughout the competition.</p>
@@ -25,8 +25,8 @@
       <div class="col-sm-4">
         <div class="list-group">
           <a class="list-group-item active h4">Quick Links</a>
-          <a href="{% url 'robotics:2015-robot' %}" class="list-group-item">The Robot - A.L.I.C.E</a>
+          <a href="/robotics/2015/robot/" class="list-group-item">The Robot - A.L.I.C.E</a>
-          <a href="{% url 'robotics:2015-code'%}" class="list-group-item">The Code</a>
+          <a href="/robotics/2015/code/" class="list-group-item">The Code</a>
           <a href="https://flic.kr/s/aHska26DoH" class="list-group-item">Gallery</a>
           <a href="http://collyersstudentrobotics.blogspot.co.uk/" class="list-group-item">Blog</a>
           <a href="https://www.studentrobotics.org/schools/game#2015" class="list-group-item">Competition Information</a>
@@ -34,4 +34,5 @@
       </div>
     </div>
   </div>
+  <div class="image-panel" data-image="https://c2.staticflickr.com/8/7674/17308375182_a172a341d6_h.jpg"></div>
 {% endblock %}

templates/robotics/2015/robot.html

@@ -1,6 +1,6 @@
 {% extends 'content_base.html' %}
 
-{% block pageTitle %}The Robot | SR 2015{% endblock %}
+{% block pageTitle %}The Robot - A.L.I.C.E{% endblock %}
 
 {% block content%}
   <div class="container">
@@ -27,9 +27,12 @@
     </p>
   </div>
 
+  <div class="image-panel" data-image="https://farm1.staticflickr.com/737/20984044320_ccbba155f9_o.gif"></div>
+
   <div class="container">
     <h2>Why call it 'ALICE'?</h2>
-    <p>The decision to name the robot 'Alice' was a decision made by the whole group. Thats a lie, Ben suggested it and as no one had any better ideas and because he gets overruling vote on this, for some reason , it stuck.</p>
+    <p>The decision to name the robot 'Alice' was a decision made by the whole group!</p>
+    <p>Thats a lie, Ben suggested it and as no one had any better ideas and because he gets overruling vote on this, for some reason , it stuck.</p>
     <p>After this decisions was made, I decided to set out to find the cheesiest acronym we could for 'Alice', to make the name slightly more interesting, and not some random girls name pulled from thin air on the bus ride home from kickstart. There were a few rather good ideas, most of them coming from Sam:</p>
     <p><ul>
       <li>'Automated Laser-cut Interactive Capturing Entity'</li>
@@ -39,7 +42,6 @@
     <p>One idea was also suggested that we name the robot after the first sponsor we got, but as we didnt get one until after the team split, the other team took that name instead. In the end we decided to go with one that Sam initially suggested, so 'ALICE' officially stands for:</p>
     <p><h3 class="center-text">'Autonomous Logistics and Inevitable Collision Engine'</h3></p>
   </div>
-  <div class="container">
+
-    <img src="https://c1.staticflickr.com/9/8700/17404219256_30ed381651_b.jpg" class="img-rounded center"/>
+  <div class="image-panel" data-image="https://c2.staticflickr.com/8/7656/16687742984_ee1c76d1d9_h.jpg"></div>
-  </div>
 {% endblock %}

templates/robotics/index.html

@@ -1,16 +1,18 @@
 {% extends 'content_base.html' %}
-
+{% load static %}
 {% block pageTitle %}Student Robotics{% endblock %}
 
-{% block content%}
+{% block header_image %}<div class="image" style="background-image: url(https://farm9.staticflickr.com/8779/16687725664_13993f35d1_o_d.jpg);"></div>{% endblock %}
+
+{% block content %}
   <div class="container">
     <p>Student Robotics is the the place where my development knowledge really started to grow. Thanks to the other people in my team teaching me. I had never done anything robotics related, and so when my computing teacher initially told us about it, I wasnt really interested. After I found out that my friend was also doing it, I signed up, and went along to the kickstart. From then on I was hooked, getting involved with all aspects of the development and design, as well as helping out other teams on the IRC room.</p>
   </div>
 
   <div class="container">
     <h2>What is Student Robotics?</h2>
-    <p>Student Robotics is a volunteer organisation that runs an annual robotics competition for 16-18 year olds. It was originally founded by students from the University of Southampton in 2006, and now includes volunteers (“Blue Shirts”) from multiple other universities, including the University of Bristol and Grenoble INP. It primarily takes teams and volunteers from the UK, but also some from Germany and France.</p>
+    <blockquote cite="https://www.studentrobotics.org/about/">Student Robotics is a volunteer organisation that runs an annual robotics competition for 16-18 year olds. It was originally founded by students from the University of Southampton in 2006, and now includes volunteers (“Blue Shirts”) from multiple other universities, including the University of Bristol and Grenoble INP. It primarily takes teams and volunteers from the UK, but also some from Germany and France.</blockquote>
-    <p>To find out more, visit their website <a href="https://studentrobotics.org">Here.</a></p>
+    <p>More information can be found on <a href="https://studentrobotics.org">their website</a>.</p>
   </div>
 
   <div class="container">
@@ -24,10 +26,10 @@
         <div class="thumbnail">
           <img src="https://c2.staticflickr.com/8/7670/17115168179_1ef30ac6e9_b.jpg" alt="Lucy">
           <div class="caption">
-            <h2>Student Robotics 2014</h2>
+            <h3>Student Robotics 2014</h3>
             <p><strong>Robot Name:</strong> Lucy
             <br /><small>(No, it doesn't stand for anything)</small>
-            <p><a href="/robotics/2014" class="btn btn-srobo btn-block">More Info</a></p>
+            <p><a href="/robotics/2014/" class="btn btn-srobo btn-block">More Info</a></p>
           </div>
         </div>
       </div>
@@ -36,14 +38,27 @@
         <div class="thumbnail">
           <img src="https://c2.staticflickr.com/8/7726/17309695331_584e7de16c_b.jpg" alt="A.L.I.C.E">
           <div class="caption">
-            <h2>Student Robotics 2015</h2>
+            <h3>Student Robotics 2015</h3>
             <p><strong>Robot Name : </strong> A.L.I.C.E
             <br /><small>(<strong>A</strong>utonomous <strong>L</strong>ogistics and <strong>I</strong>nevitable <strong>C</strong>ollision <strong>E</strong>ngine)</small></p>
-            <p><a href="/robotics/2015" class="btn btn-srobo btn-block" >More Info</a></p>
+            <p><a href="/robotics/2015/" class="btn btn-srobo btn-block" >More Info</a></p>
           </div>
         </div>
       </div>
     </div>
   </div>
-  <div class="image-panel" data-image="https://farm9.staticflickr.com/8779/16687725664_13993f35d1_o_d.jpg"></div>
+  <div class="image-panel" data-image="{% static 'img/SR-logo-banner.png' %}"></div>
+
+  <div class="container">
+    <h2>Adult volunteer</h2>
+    <p>
+      Unfortunately, after I left college, I also left behind entering Student Robotics as a competitor. Fortunately for me however, they're always looking for volunteers to help run the competition itself.
+    </p>
+    <h4>
+      Years
+    </h4>
+    <ul>
+      <li>2016</li>
+    </ul>
+  </div>
 {% endblock %}