JPT
/
citavi_mapper
0
0
Fork 0
Code Issues Pull Requests Activity

[TASK] Add jquery 2.1.1.

This commit is contained in:
Jan Philipp Timme 2014-07-28 15:27:39 +02:00
parent e965a76fb8
commit daf535a5f3
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "contrib/bootstrap"]
path = contrib/bootstrap
url = https://github.com/twbs/bootstrap.git
[submodule "contrib/jquery"]
path = contrib/jquery
url = https://github.com/jquery/jquery.git

4
contrib/jquery/jquery-2.1.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

14
frontend/templates/layout/base.html
View File

@ -1,4 +1,3 @@
{% load staticfiles compressed %}
<!DOCTYPE html>
<html>
<head>
@ -7,6 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Merging Citavi projects and mapping existing datasets.">
<title>{% block title %}{{page.name}} :: {{page.title}}{% endblock %}</title>
{% load staticfiles compressed %}
<!-- jQuery -->
<script type="application/javascript" src="{% static 'jquery/jquery-2.1.1.min.js' %}" charset="utf-8"></script>
<!-- Bootstrap -->
{% compressed_css 'bootstrap' %}
{% compressed_js 'bootstrap' %}
@ -25,9 +27,9 @@
<li><a href="/register">Register</a></li>
<li>
{% if user.is_anonymous %}
<a href="/login">Login</a>
<a href="/login">Login</a>
{% else %}
<a href="/logout">Logout</a>
<a href="/logout">Logout</a>
{% endif %}
</li>
</ul>
@ -36,7 +38,9 @@
</nav>
<div class="page-header">
<div id="header" class="container">
{% block header %}<h1>{{page.title}}</h1>{% endblock %}
{% block header %}
<h1>{{page.title}}</h1>
{% endblock %}
</div>
</div>
<div id="content" class="container">
@ -44,7 +48,7 @@
</div>
<div id="footer" class="footer">
<div class="container">
<p class="text-muted">{% block footer %}This software proudly presented by: <a href="http://hs-hannocer.de">Hochschule Hannover</a>{% endblock %}</p>
<p class="text-muted">{% block footer %}This software proudly presented by <a href="http://hs-hannocer.de">Hochschule Hannover</a>{% endblock %}</p>
</div>
</div>
</body>