From a482b0824a9f996b11f1d814aa34f1f605637361 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 28 Jan 2016 21:09:19 +0000 Subject: [PATCH] Refactor robotics pages --- project/pages/urls/robotics.py | 8 ++++---- static/src/less/navbar.less | 1 - templates/robotics/2014-index.html | 32 +----------------------------- templates/robotics/2015-index.html | 13 ++---------- templates/robotics/2015-robot.html | 13 ++---------- 5 files changed, 9 insertions(+), 58 deletions(-) diff --git a/project/pages/urls/robotics.py b/project/pages/urls/robotics.py index c74adc4..2eed5b5 100644 --- a/project/pages/urls/robotics.py +++ b/project/pages/urls/robotics.py @@ -3,8 +3,8 @@ from project.pages.views import robotics urlpatterns = [ - url(r'^robotics/$', robotics.IndexView.as_view(), name="index"), - url(r'^robotics/2014/$', robotics.Index2014View.as_view(), name="2014-index"), - url(r'^robotics/2015/robot/$', robotics.Robot2015View.as_view(), name="2015-robot"), - url(r'^robotics/2015/$', robotics.Index2015View.as_view(), name="2015-index") + url(r'^$', robotics.IndexView.as_view(), name="index"), + url(r'^2014/$', robotics.Index2014View.as_view(), name="2014-index"), + url(r'^2015/robot/$', robotics.Robot2015View.as_view(), name="2015-robot"), + url(r'^2015/$', robotics.Index2015View.as_view(), name="2015-index") ] diff --git a/static/src/less/navbar.less b/static/src/less/navbar.less index f42c96c..7ab35d4 100644 --- a/static/src/less/navbar.less +++ b/static/src/less/navbar.less @@ -40,7 +40,6 @@ &.dropdown { top: 100%; bottom: initial; - height: @navbar-height; } .open & { opacity: 1; diff --git a/templates/robotics/2014-index.html b/templates/robotics/2014-index.html index a5738e9..944fd4c 100644 --- a/templates/robotics/2014-index.html +++ b/templates/robotics/2014-index.html @@ -2,15 +2,6 @@ {% block pageTitle %}Student Robotics 2014{% endblock %} -{% block headercontent %} -
-

Student Robotics 2014

-
-
-

The home of Lucy. (No it doesnt stand for anything)

-
-{% endblock %} - {% block content%}
@@ -18,29 +9,8 @@
-

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.

-

This website is here to bridge the gap between the team and the outside world, and also to document everything that we do so that parents and Blue Shirts can see what we have been getting up to! Not only is the website for this, but it's also in the competition too! There is a prize (Awarded at the competition itself), for the best online presence. Hopefully no one else that has entered has their own domain name with dedicated section for the competition!

+

- -
-

The Competition

-

As was announced at kickstart, the game for this year is a take on the classic gamemode Capture the Flag. 4 teams compete over 5 flags to move as many of them as they can into their scoring zones. The person with the most flags in their scoring zone wins.

-

The flags are 25cm cubes of wood on caster wheels weighing roughly 2kg. The rules prevent us from lifting them, so the idea is to drag them around!

-

To see a copy of the rules from the competition, Click Here!

-
- -
-

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.

-

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:

-

-

One idea was also suggested that we name the robot after the first sponsor we got, but as we didnt get one util 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/2015-index.html b/templates/robotics/2015-index.html index 34cb88c..99945a8 100644 --- a/templates/robotics/2015-index.html +++ b/templates/robotics/2015-index.html @@ -2,15 +2,6 @@ {% block pageTitle %}Student Robotics 2015{% endblock %} -{% block headercontent %} -
-

Student Robotics 2015

-
-
-

The home of the Autonomous Logistics and Inevitable Collision Engine!

-
-{% endblock %} - {% block content%}
@@ -30,13 +21,13 @@

The Competition

As was announced at kickstart, the game for this year is a take on the classic gamemode Capture the Flag. 4 teams compete over 5 flags to move as many of them as they can into their scoring zones. The person with the most flags in their scoring zone wins.

The flags are 25cm cubes of wood on caster wheels weighing roughly 2kg. The rules prevent us from lifting them, so the idea is to drag them around!

-

To see a copy of the rules from the competition, Click Here!

+

To see a copy of the rules from the competition, Click Here!

Quick Links The Robot - A.L.I.C.E - The Code + The Code Gallery Blog Competition Information diff --git a/templates/robotics/2015-robot.html b/templates/robotics/2015-robot.html index a4f0f84..8f75a90 100644 --- a/templates/robotics/2015-robot.html +++ b/templates/robotics/2015-robot.html @@ -2,15 +2,6 @@ {% block pageTitle %}The Robot | SR 2015{% endblock %} -{% block headercontent %} -
-

A.L.I.C.E

-
-
-

The Autonomous Logistics and Inevitable Collision Engine!

-
-{% endblock %} - {% block content%}

@@ -26,7 +17,7 @@

- The entire chassis was made from custom, in-house cut, sheets of plywood, which allowed us to be very precise in the design of the robot to make sure that all the pieces would fit together properly, making the chassis less likely to break. + The entire chassis was made from sheets of plywood, which we laser cut in college, allowing us to be very precise in the design of the robot to make sure that all the pieces would fit together properly, making the chassis less likely to break.

The initial design was concieved by Ben, at kickstart, and was then refined over the coming weeks by me and the rest of the building team. This was made much easier from the use of the 3d model (See Right), that ben made, which helped us visualize any changes that were to be made, as well as work out strategy by seeing the measurements we had to work with. @@ -45,7 +36,7 @@

  • 'Abnormally Lame and Innacurate Control-less Engine'
  • 'Anti-Losing Immaculate Competitive Extravaganza'

    • -

    One idea was also suggested that we name the robot after the first sponsor we got, but as we didnt get one util 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:

    +

    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 %}