Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

worked on assets bundling, added admin field

Browse source
This commit is contained in:
Matthew Scragg 2014-09-03 21:29:47 -05:00
parent 0dead5176a
commit ad401da4f1
8 changed files with 37 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
realms/templates/layout.html
View file

@ -8,10 +8,12 @@
<title>Realms</title>
<link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.ico') }}">
<link href="{{ url_for('static', filename='css/bootstrap/flatly.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/font-awesome.min.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='vendor/highlightjs/styles/github.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet">
{% for bundle in g.assets['css'] %}
{% assets bundle %}
<link type="text/javascript" href="{{ ASSET_URL }}" rel="stylesheet">
{% endassets %}
{% endfor %}
{% block css %}{% endblock %}
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@ -32,7 +34,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Realms</a>
<a class="navbar-brand" href="/">{{ config.SITE_TITLE }}</a>
</div>
<div class="navbar-collapse collapse navbar-inverse-collapse">
<ul class="nav navbar-nav">
@ -86,7 +88,7 @@
{% block body %}{% endblock %}
</div>
</div>
{% for bundle in g.assets %}
{% for bundle in g.assets['js'] %}
{% assets bundle %}
<script type="text/javascript" src="{{ ASSET_URL }}"></script>
{% endassets %}