1
Fork 0

cleanup old templates

This commit is contained in:
Jake Howard 2016-06-13 21:52:59 +01:00
parent 346b4faa76
commit febd035da3
Signed by: jake
GPG key ID: 57AFB45680EDD477
12 changed files with 47 additions and 63 deletions

View file

@ -1,6 +1,7 @@
<head> <head>
<meta name="slug" content="about" /> <meta name="slug" content="about" />
<meta name="title" content="About Me" /> <meta name="title" content="About Me" />
<meta name="no_container" content="true">
</head> </head>
<body> <body>
<section class="bg-primary"> <section class="bg-primary">

View file

@ -113,7 +113,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12 text-left"> <div class="col-xs-12 text-left">
<h3>{{ article.title }}</h3> <h3>{{ article.title }}</h3>
<p>{{ article.summary|raw|limit(30) }}</p> <p>{{ article.summary|striptags|e|limit(30) }}</p>
</div> </div>
</div> </div>
<hr class="light"> <hr class="light">

View file

@ -1,6 +1,5 @@
<head> <head>
<meta name="title" content="Student Robotics 2014"> <meta name="title" content="Student Robotics 2014">
<meta name="template" content="page-title">
<meta name="slug" content="robotics/2014"> <meta name="slug" content="robotics/2014">
</head> </head>
<body> <body>

View file

@ -1,8 +1,6 @@
title: The Code title: The Code
html_title: The Code | SR2015 html_title: The Code | SR2015
slug: robotics/2015/code slug: robotics/2015/code
template: page-title
The code used for this competition was by far the most complicated and advanced code that had ever been written by a Collyer's team. The code used for this competition was by far the most complicated and advanced code that had ever been written by a Collyer's team.

View file

@ -1,7 +1,6 @@
<head> <head>
<meta name="title" content="Student Robotics 2015"> <meta name="title" content="Student Robotics 2015">
<meta name="slug" content="robotics/2015"> <meta name="slug" content="robotics/2015">
<meta name="template" content="page-title">
</head> </head>
<body> <body>
<div class="row"> <div class="row">

View file

@ -1,4 +1,3 @@
template: page-title
title: The Robot - A.L.I.C.E title: The Robot - A.L.I.C.E
html_title: The Robot | SR2015 html_title: The Robot | SR2015
slug: robotics/2015/robot slug: robotics/2015/robot

View file

@ -1,5 +1,4 @@
title: Student Robotics title: Student Robotics
template: page-title
slug: robotics slug: robotics

View file

@ -5,7 +5,7 @@
{% endblock %} {% endblock %}
{% block metadata %} {% block metadata %}
{% for tag, value in page.ogtags %} {% for tag, value in article.ogtags %}
<meta property="{{ tag }}" content="{{ value|striptags|e }}" /> <meta property="{{ tag }}" content="{{ value|striptags|e }}" />
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}

View file

@ -33,7 +33,7 @@
{{ article.title }} {{ article.title }}
</div> </div>
<div class="project-name"> <div class="project-name">
{{ article.summary|raw }} {{ article.summary|striptags|e }}
</div> </div>
</div> </div>
</div> </div>

View file

@ -10,12 +10,8 @@
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}
{% block content %}
{{ page.content }}
{% endblock %}
{% block navbar %} {% block navbar %}
<nav id="main-nav" class="navbar navbar-default navbar-fixed-top index-nav"> <nav id="main-nav" class="navbar navbar-default navbar-fixed-top index-nav">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
@ -25,7 +21,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand page-scroll" href="#page-top"> <a class="navbar-brand page-scroll" href="#page-top">
TheOrangeOne {{ SITENAME }}
</a> </a>
</div> </div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@ -38,5 +34,9 @@
</ul> </ul>
</div> </div>
</div> </div>
</nav> </nav>
{% endblock %}
{% block content %}
{{ page.content }}
{% endblock %} {% endblock %}

View file

@ -1,25 +0,0 @@
{% extends "base.html" %}
{% block htmltitle %}
{{ page.html_title or page.title }}
{% endblock %}
{% block metadata %}
{% for tag, value in page.ogtags %}
<meta property="{{ tag }}" content="{{ value|striptags|e }}" />
{% endfor %}
{% endblock %}
{% block content %}
<section class="bg-primary">
<div class="container text-center text-uppercase">
<h1 class="section-heading uppercase">{{ page.title }}</h1>
<hr class="light">
</div>
</section>
<section>
<div class="container">
{{ page.content }}
</div>
</section>
{% endblock %}

View file

@ -1,7 +1,7 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block htmltitle %} {% block htmltitle %}
{{ page.title }} {{ page.html_title or page.title }}
{% endblock %} {% endblock %}
{% block metadata %} {% block metadata %}
@ -11,5 +11,19 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if not page.no_container %}
<section class="bg-primary">
<div class="container text-center text-uppercase">
<h1 class="section-heading uppercase">{{ page.title }}</h1>
<hr class="light">
</div>
</section>
<section>
<div class="container">
{{ page.content }} {{ page.content }}
</div>
</section>
{% else %}
{{ page.content }}
{% endif %}
{% endblock %} {% endblock %}