diff views/maintemplate_local.php @ 58:a11f9103b8db extractapp

New: 1.display messages 2.handle saving conflict:up-to-date or reload text
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 31 Mar 2015 10:59:52 +0200
parents 886f43b26ee2
children c6fa7f83c5bf
line wrap: on
line diff
--- a/views/maintemplate_local.php	Mon Mar 30 17:23:47 2015 +0200
+++ b/views/maintemplate_local.php	Tue Mar 31 10:59:52 2015 +0200
@@ -1,20 +1,18 @@
 <html>
 <head>
 <title></title>
-
 <script src="../../js/jquery-1.10.2.min.js"></script>
 <script src="../../js/jquery-ui.js"></script>
 <script src="../../js/taggingtext.js"></script>
 
 <!-- Bootstrap -->
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-<!--
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 <link href="../../css/bootstrap.min.css" rel="stylesheet">
 <script src="../../js/bootstrap.min.js"></script>
+<!--
 <script src="../../js/bootstrap.js"></script>
 -->
-
 </head>
 <body>