archive/theorangeone.net-legacy
Archived
1
Fork 0
Code Releases Packages Activity

Refactor robotics pages

Browse source
This commit is contained in:
Jake Howard 2016-01-28 21:09:19 +00:00
parent fb3f88e5d5
commit a482b0824a
5 changed files with 9 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
project/pages/urls/robotics.py
View file

@ -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")
]

1
static/src/less/navbar.less
View file

@ -40,7 +40,6 @@
&.dropdown {
top: 100%;
bottom: initial;
height: @navbar-height;
}
.open & {
opacity: 1;

32
templates/robotics/2014-index.html
View file

@ -2,15 +2,6 @@
{% block pageTitle %}Student Robotics 2014{% endblock %}
{% block headercontent %}
<div class="row">
<h1>Student Robotics 2014</h1>
</div>
<div class="row">
<h4>The home of Lucy. <small>(No it doesnt stand for anything)</small></h4>
</div>
{% endblock %}
{% block content%}
<div class="container">
<div class="row">
@ -18,29 +9,8 @@
<img style="border-radius: 12px;" class="full-width" src="https://farm1.staticflickr.com/737/20984044320_ccbba155f9_o.gif" />
</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>
<p>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! </p>
<p></p>
</div>
</div>
</div>
<div class="container">
<h2>The Competition</h2>
<p>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.</p>
<p>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!</p>
<p>To see a copy of the rules from the competition, Click Here!</p>
</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>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>
<li>'Abnormally Lame and Innacurate Control-less Engine'</li>
<li>'Anti-Losing Immaculate Competitive Extravaganza'</li>
</ul></p>
<p>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:</p>
<p><h3 class="center-text">'Autonomous Logistics and Inevitable Collision Engine'</h3></p>
</div>
{% endblock %}

13
templates/robotics/2015-index.html
View file

@ -2,15 +2,6 @@
{% block pageTitle %}Student Robotics 2015{% endblock %}
{% block headercontent %}
<div class="row">
<h1>Student Robotics 2015</h1>
</div>
<div class="row">
<h4>The home of the Autonomous Logistics and Inevitable Collision Engine!</h4>
</div>
{% endblock %}
{% block content%}
<div class="container">
<div class="row">
@ -30,13 +21,13 @@
<h2>The Competition</h2>
<p>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.</p>
<p>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!</p>
<p>To see a copy of the rules from the competition, <a>Click Here!</a></p>
<p>To see a copy of the rules from the competition, <a href="">Click Here!</a></p>
</div>
<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="#" class="list-group-item">The Code</a>
<a href="" class="list-group-item">The Code</a>
<a href="#" class="list-group-item">Gallery</a>
<a href="#" class="list-group-item">Blog</a>
<a href="#" class="list-group-item">Competition Information</a>

13
templates/robotics/2015-robot.html
View file

@ -2,15 +2,6 @@
{% block pageTitle %}The Robot | SR 2015{% endblock %}
{% block headercontent %}
<div class="row">
<h1>A.L.I.C.E</h1>
</div>
<div class="row">
<h4>The Autonomous Logistics and Inevitable Collision Engine!</h4>
</div>
{% endblock %}
{% block content%}
<div class="container">
<p>
@ -26,7 +17,7 @@
</div>
</div>
<p>
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.
</p>
<p>
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 @@
<li>'Abnormally Lame and Innacurate Control-less Engine'</li>
<li>'Anti-Losing Immaculate Competitive Extravaganza'</li>
</ul></p>
<p>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:</p>
<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>
{% endblock %}