Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move bootstrap.js and jQuery into head 

(imported from commit 8deddd6178f5612be275509bea0a23d20fb4693c)
This commit is contained in:
Keegan McAllister 2012-08-28 16:52:23 -04:00
parent 54622c9101
commit 9849cc91e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/zephyr/base.html
View File

@ -6,10 +6,12 @@
<title>Zephyr</title> <title>Zephyr</title>
<link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/styles/zephyr.css" rel="stylesheet"> <link href="/static/styles/zephyr.css" rel="stylesheet">
{# We need to import jQuery before Bootstrap #}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="/static/bootstrap/js/bootstrap.min.js"></script>
</head> </head>
<body> <body>
<script src="/static/bootstrap/js/bootstrap.min.js"></script>
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">

2
templates/zephyr/index.html
View File

@ -7,8 +7,6 @@
{% block content %} {% block content %}
<h1>Hello {{ user_profile.user.username }}!</h1> <h1>Hello {{ user_profile.user.username }}!</h1>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$.ajaxSetup({ $.ajaxSetup({
beforeSend: function(xhr, settings) { beforeSend: function(xhr, settings) {