fmartingr
/
minecraftcodex
mirror of https://github.com/fmartingr/minecraftcodex.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added blocks header and footer to the main layout, also container div is now inside the content block, so it's optional

This commit is contained in:
Felipe Martín 2013-05-30 11:49:51 +02:00
parent 46244b9add
commit 718c3729f6
10 changed files with 139 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minecraftcodex/blog/templates/blog.html
View File

@ -1,6 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div class="container">
<h1>Blog</h1> <h1>Blog</h1>
{% for item in page.object_list %} {% for item in page.object_list %}
<hr /> <hr />
@ -30,4 +31,5 @@
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/blog/templates/blog_entry.html
View File

@ -1,6 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div class="container">
<p><a href="{{ url('blog_list') }}"><i class="icon-arrow-left"></i> Go back</a></p> <p><a href="{{ url('blog_list') }}"><i class="icon-arrow-left"></i> Go back</a></p>
<article class="blog-entry"> <article class="blog-entry">
<h1>{{ item.title }}</h1> <h1>{{ item.title }}</h1>
@ -13,4 +14,5 @@
{{ item.content|safe }} {{ item.content|safe }}
</div> </div>
</article> </article>
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/database/templates/about.html
View File

@ -5,6 +5,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container">
<h1>About</h1> <h1>About</h1>
<!-- PROJECT SECTION --> <!-- PROJECT SECTION -->
<h2>The project</h1> <h2>The project</h1>
@ -71,4 +72,5 @@
</div> </div>
#} #}
</div> </div>
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/database/templates/blocks.html
View File

@ -1,6 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div class="container">
<h1>Blocks</h1> <h1>Blocks</h1>
<hr /> <hr />
<div class="row-fluid"> <div class="row-fluid">
@ -70,4 +71,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/database/templates/blocks_detail.html
View File

@ -9,6 +9,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container">
<div class="row-fluid"> <div class="row-fluid">
<div class="span9"> <div class="span9">
<h1>{{ item.name() }}</h1> <h1>{{ item.name() }}</h1>
@ -39,4 +40,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/database/templates/items.html
View File

@ -1,6 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div class="container">
<h1>Items</h1> <h1>Items</h1>
<hr /> <hr />
<div class="row-fluid"> <div class="row-fluid">
@ -70,4 +71,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/database/templates/items_detail.html
View File

@ -1,6 +1,7 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% block content %} {% block content %}
<div class="container">
<div class="row-fluid"> <div class="row-fluid">
<div class="span9"> <div class="span9">
<h1>{{ item.name() }}</h1> <h1>{{ item.name() }}</h1>
@ -24,4 +25,5 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{% endblock %} {% endblock %}

11
minecraftcodex/database/templates/layout.html
View File

@ -31,6 +31,7 @@ Thank you!
<title>{% block head_title %}{{ site_title }}{% endblock %}</title> <title>{% block head_title %}{{ site_title }}{% endblock %}</title>
</head> </head>
<body> <body>
{% block header %}
<div class="alert alert-info margin-none text-center"> <div class="alert alert-info margin-none text-center">
<strong> <strong>
Lack of information? Lack of information?
@ -81,10 +82,11 @@ Thank you!
</div><!-- /navbar-inner --> </div><!-- /navbar-inner -->
</div> </div>
</header> </header>
<div class="container">
{% block content %}
{% endblock %} {% endblock %}
</div> {% block content %}
<div class="container"></div>
{% endblock %}
{% block footer %}
<footer class="container-fluid"> <footer class="container-fluid">
<hr style="margin: 0" /> <hr style="margin: 0" />
<div class="pull-left"> <div class="pull-left">
@ -103,7 +105,7 @@ Thank you!
</a> </a>
</div> </div>
</footer> </footer>
{% if google_analytics %} {% if google_analytics and not user.is_authenticated() %}
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@ -114,5 +116,6 @@ Thank you!
ga('send', 'pageview'); ga('send', 'pageview');
</script> </script>
{% endif %} {% endif %}
{% endblock %}
</body> </body>
</html> </html>

2
minecraftcodex/database/templates/version.html
View File

@ -5,6 +5,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container">
<h1>Minecraft versions</h1> <h1>Minecraft versions</h1>
<hr /> <hr />
<a href="/versions/"><i class="icon-arrow-left"></i> Go back</a> <a href="/versions/"><i class="icon-arrow-left"></i> Go back</a>
@ -24,4 +25,5 @@
<h3>Changelog</h3> <h3>Changelog</h3>
<p>{{ version.changelog|nl2br }}</p> <p>{{ version.changelog|nl2br }}</p>
{% endfor %} {% endfor %}
</div>
{% endblock %} {% endblock %}

2
minecraftcodex/database/templates/versions.html
View File

@ -5,6 +5,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="container">
<h1>Minecraft versions</h1> <h1>Minecraft versions</h1>
<hr /> <hr />
<table class="table table-condensed table-hover"> <table class="table table-condensed table-hover">
@ -58,4 +59,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div>
{% endblock %} {% endblock %}