Commit 09cc0600 authored by Romain Loth's avatar Romain Loth

tidying all libs ('js' dir renamed to 'lib' because of new package-based...

tidying all libs ('js' dir renamed to 'lib' because of new package-based hierarchy which mixes filetypes) and refs to them from the templates etc
parent 3c22a8c7
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
var S = window.STATIC_URL; var S = window.STATIC_URL;
$script([ $script([
S + 'js/angular/1.2.29/angular.min.js', S + 'lib/angular/1.2.29/angular.min.js',
S + 'js/bootstrap/3.3.6/js/bootstrap.min.js', S + 'lib/bootstrap/3.3.6/js/bootstrap.min.js',
S + 'js/bootstrap-select/1.7.7/js/bootstrap-select.min.js', S + 'lib/bootstrap-select/1.7.7/js/bootstrap-select.min.js',
S + 'js/angular-loader/1.2.29/angular-loader.min.js', S + 'lib/angular-loader/1.2.29/angular-loader.min.js',
S + 'js/underscore/underscore-1.5.2.js', S + 'lib/underscore/underscore-1.5.2.js',
//'bower_components/angular-route/angular-route.js', //'bower_components/angular-route/angular-route.js',
], function() { ], function() {
$script([ $script([
S + 'js/angular-cookies/1.2.29/angular-cookies.min.js', S + 'lib/angular-cookies/1.2.29/angular-cookies.min.js',
S + 'js/angular-resource/1.2.29/angular-resource.min.js'], function() { S + 'lib/angular-resource/1.2.29/angular-resource.min.js'], function() {
$script([S + 'annotations/http.js', S + 'annotations/highlight.js', $script([S + 'annotations/http.js', S + 'annotations/highlight.js',
S + 'annotations/document.js', S + 'annotations/ngramlist.js', S + 'annotations/document.js', S + 'annotations/ngramlist.js',
S + 'annotations/activelists.js', S + 'annotations/ngramlist.js', S + 'annotations/activelists.js', S + 'annotations/ngramlist.js',
......
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
<title>Gargantext article editor</title> <title>Gargantext article editor</title>
<meta name="description" content="Gargantext"> <meta name="description" content="Gargantext">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{% static 'js/bootstrap/3.3.6/css/bootstrap.min.css' %}"> <link rel="stylesheet" href="{% static 'lib/bootstrap/3.3.6/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'js/bootstrap-select/1.7.7/css/bootstrap-select.min.css' %}"> <link rel="stylesheet" href="{% static 'lib/bootstrap-select/1.7.7/css/bootstrap-select.min.css' %}">
<link rel="stylesheet" href="{% static 'js/angular/1.2.29/angular-csp.css' %}"> <link rel="stylesheet" href="{% static 'lib/angular/1.2.29/angular-csp.css' %}">
<link rel="stylesheet" href="{% static 'annotations/app.css' %}"> <!-- todo --> <link rel="stylesheet" href="{% static 'annotations/app.css' %}"> <!-- todo -->
<script src="{% static 'js/jquery/2.2.0/jquery.min.js' %}"></script> <script src="{% static 'lib/jquery/2.2.0/jquery.min.js' %}"></script>
</head> </head>
<body> <body>
<!-- TODO integrate this later into the any other django template --> <!-- TODO integrate this later into the any other django template -->
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment