]> de.git.xonotic.org Git - xonotic/xonstat.git/commitdiff
projects / xonotic / xonstat.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: deace91)
Add new assets to the base template.
authorAnt Zucaro <azucaro@gmail.com>
Sun, 24 Mar 2013 23:42:33 +0000 (19:42 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sun, 24 Mar 2013 23:42:33 +0000 (19:42 -0400)
xonstat/templates/base.mako patch | blob | history

diff --git a/xonstat/templates/base.mako b/xonstat/templates/base.mako
index 5a48696524d37d20abd57a3072bc26f2a29760b9..280db96ba3db052e61dffef5da52da74972e47bd 100644 (file)
--- a/xonstat/templates/base.mako
+++ b/xonstat/templates/base.mako
@@ -11,14 +11,13 @@
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
+    <link rel="shortcut icon" href="/static/favicon.ico">
+
     <%block name="css">
     <link href="/static/css/bootstrap.min.css" rel="stylesheet">
     <link href="/static/css/bootstrap-responsive.min.css" rel="stylesheet">
     <link href="/static/css/app.css" rel="stylesheet">
     <%block name="css">
     <link href="/static/css/bootstrap.min.css" rel="stylesheet">
     <link href="/static/css/bootstrap-responsive.min.css" rel="stylesheet">
     <link href="/static/css/app.css" rel="stylesheet">
-    <link rel="shortcut icon" href="/static/favicon.ico">
     </%block>
     </%block>
-
-    <script src="/static/js/jquery-1.7.1.min.js"></script>
   </head>
 
   <body>
   </head>
 
   <body>
@@ -43,7 +42,8 @@
       </%block>
 
       <%block name="js">
       </%block>
 
       <%block name="js">
-      <script src="/static/js/jquery-1.7.1.min.js"></script>
+      <script type='text/javascript' src='//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js'></script>
+      <script type='text/javascript' src='/static/js/bootstrap.min.js'></script>
       </%block>
 
       <!-- RELATIVE TIME CONVERSION -->
       </%block>
 
       <!-- RELATIVE TIME CONVERSION -->