diff --git a/static/src/img/SR-logo-banner.png b/static/src/img/SR-logo-banner.png new file mode 100644 index 0000000..a4d9434 Binary files /dev/null and b/static/src/img/SR-logo-banner.png differ diff --git a/static/src/js/globals.js b/static/src/js/globals.js index 6b8a964..e168513 100644 --- a/static/src/js/globals.js +++ b/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()); +} diff --git a/static/src/less/components.less b/static/src/less/components.less index f53b0ec..456dc46 100644 --- a/static/src/less/components.less +++ b/static/src/less/components.less @@ -4,4 +4,5 @@ background-repeat: no-repeat; background-position: center; width: 100%; + margin-top: 20px; } diff --git a/static/src/less/style.less b/static/src/less/style.less index 59b90a3..2c969f5 100644 --- a/static/src/less/style.less +++ b/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 { diff --git a/templates/content_base.html b/templates/content_base.html index 0668263..e8ad6f0 100644 --- a/templates/content_base.html +++ b/templates/content_base.html @@ -8,9 +8,11 @@

{% block pageTitle %}{% endblock %}

- {% if header_image %} -
- {% endif %} + {% block header_image %} + {% if header_image %} +
+ {% endif %} + {% endblock %}
diff --git a/templates/robotics/2014/index.html b/templates/robotics/2014/index.html index f8301ac..295ff5a 100644 --- a/templates/robotics/2014/index.html +++ b/templates/robotics/2014/index.html @@ -2,6 +2,8 @@ {% block pageTitle %}Student Robotics 2014{% endblock %} +{% block header_image %}
{% endblock %} + {% block content%}
@@ -26,8 +28,8 @@
Quick Links The Code - Gallery - Blog + Gallery + Blog Competition Information
diff --git a/templates/robotics/2015/index.html b/templates/robotics/2015/index.html index 06924a3..96d8705 100644 --- a/templates/robotics/2015/index.html +++ b/templates/robotics/2015/index.html @@ -6,7 +6,7 @@
- +

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.

@@ -25,8 +25,8 @@
Quick Links - The Robot - A.L.I.C.E - The Code + The Robot - A.L.I.C.E + The Code Gallery Blog Competition Information @@ -34,4 +34,5 @@
+
{% endblock %} diff --git a/templates/robotics/2015/robot.html b/templates/robotics/2015/robot.html index 8b82a0f..dd6401f 100644 --- a/templates/robotics/2015/robot.html +++ b/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%}
@@ -27,9 +27,12 @@

+
+

Why call it 'ALICE'?

-

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.

+

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.

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:

  • 'Automated Laser-cut Interactive Capturing Entity'
    • @@ -39,7 +42,6 @@

    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:

    'Autonomous Logistics and Inevitable Collision Engine'

-
- -
+ +
{% endblock %} diff --git a/templates/robotics/index.html b/templates/robotics/index.html index 6c69b20..56fa05c 100644 --- a/templates/robotics/index.html +++ b/templates/robotics/index.html @@ -1,16 +1,18 @@ {% extends 'content_base.html' %} - +{% load static %} {% block pageTitle %}Student Robotics{% endblock %} -{% block content%} +{% block header_image %}
{% endblock %} + +{% block content %}

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.

What is Student Robotics?

-

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.

-

To find out more, visit their website Here.

+
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.
+

More information can be found on their website.

@@ -24,10 +26,10 @@
Lucy
-

Student Robotics 2014

+

Student Robotics 2014

Robot Name: Lucy
(No, it doesn't stand for anything) -

More Info

+

More Info

@@ -36,14 +38,27 @@
A.L.I.C.E
-

Student Robotics 2015

+

Student Robotics 2015

Robot Name : A.L.I.C.E
(Autonomous Logistics and Inevitable Collision Engine)

-

More Info

+

More Info

-
+
+ +
+

Adult volunteer

+

+ 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. +

+

+ Years +

+ +
{% endblock %}