Move libraries into their own directory

Resolves #50
2017-05-19 15:39:50 +03:00
parent a34a44ed95
commit bb70c101d6
37 changed files with 37029 additions and 4263 deletions
@@ -1,4 +1,4 @@
-members/static/js/lib/*.js
-infoscreen/static/js/lib/*.js
-webapp/static/js/lib/*.js
-global_static/js/lib/*.js
+members/static/js/lib
+infoscreen/static/js/lib
+webapp/static/js/lib
+global_static/js/lib
@@ -1,5 +1,6 @@
 from django.contrib import admin
-from infoscreen.models import Rotation, InfoItem, InfoInstance, ImageInfoItem, ExternalImageInfoItem, ABBInfoItem
+from infoscreen.models import Rotation, InfoItem, InfoInstance
+from infoscreen.models import ImageInfoItem, ExternalImageInfoItem, ABBInfoItem
 from infoscreen.models import ExternalWebsiteInfoItem

 # Register your models here.
@@ -9,4 +10,4 @@ admin.site.register(ImageInfoItem)
 admin.site.register(ExternalImageInfoItem)
 admin.site.register(ABBInfoItem)
 admin.site.register(InfoInstance)
-admin.site.register(ExternalWebsiteInfoItem)
+admin.site.register(ExternalWebsiteInfoItem)
@@ -1,4 +1,4 @@
-    var app = angular.module('infoAdmin',['ngFileUpload']);
+var app = angular.module('infoAdmin', [ 'ngFileUpload' ]);

 app.config(['$httpProvider', function ($httpProvider) {
    $httpProvider.defaults.xsrfCookieName = 'csrftoken';
@@ -1,4 +1,4 @@
-var app = angular.module('infoApp', ['ngAnimate', 'ngRoute', 'monospaced.qrcode']);
+var app = angular.module('infoApp', ['ngAnimate', 'ngRoute']);
 app.controller('infoscreen_main', function($scope,$http,$timeout){
    var templates = [];
    $scope.init = function(rot){
@@ -6,13 +6,14 @@
    <head>
        <meta charset="utf-8">
        <title>Infoscreen admin</title>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular.js"></script>
-        <script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"></link>
-        <script src="/static/js/ng-file-upload-bower-12.2.11/ng-file-upload-all.js"></script>
-        <script src="/static/js/infoadmin_controllers.js"></script>
+        <script src="{% static "js/lib/angular.js" %}"></script>
+        <script src="{% static "js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js" %}"></script>
+        <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
+        <script src="{% static "js/lib/bootstrap.min.js" %}"></script>
+        <script src="{% static "js/lib/underscore-min.js" %}"></script>
+        <script src="{% static "js/infoadmin_controllers.js" %}"></script>
+
+        <link rel="stylesheet" href="{% static "css/lib/bootstrap.min.css" %}"></link>
        <link rel="stylesheet" href="{% static "css/base.css" %}"></link>
        <link rel="stylesheet" href="{% static "css/infoscreen_admin.css" %}"></link>
    </head>
@@ -1,3 +1,5 @@
+{% load static %}
+
 <!DOCTYPE html>
 <html ng-app="infoApp">
    <head>
@@ -5,19 +7,17 @@
        <meta name="viewport" content="width=device-width, initial-scale=1">

        <title>Infoscreen</title>
-        <script src="/static/js/moment.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.8/angular.js"></script>
-        <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-route.js"></script>
-        <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.8/angular-animate.js"></script>
-        <script src="https://code.jquery.com/jquery-3.1.0.min.js"></script>
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
-        <script src="/static/js/qrcode.js"></script>
-        <script src="/static/js/qrcode_UTF8.js"></script>
-        <script src="/static/js/angular-qrcode.js"></script>
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"></link>
-        <link rel="stylesheet" href="/static/css/infoscreen.css">
-        <script src="/static/js/infoscreen_controllers.js"></script>
+        <script src="{% static "js/lib/moment.js" %}"></script>
+        <script src="{% static "js/lib/angular.js" %}"></script>
+        <script src="{% static "js/lib/angular-route.js" %}"></script>
+        <script src="{% static "js/lib/angular-animate.js" %}"></script>
+        <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
+        <script src="{% static "js/lib/bootstrap.min.js" %}"></script>
+        <script src="{% static "js/lib/underscore-min.js" %}"></script>
+        <script src="{% static "js/infoscreen_controllers.js" %}"></script>
+
+        <link rel="stylesheet" href="{% static "css/lib/bootstrap.min.css" %}"></link>
+        <link rel="stylesheet" href="{% static "css/infoscreen.css" %}"></link>
    </head>
    <body>
        <div class="container ng-scope" ng-controller="infoscreen_main" ng-init="init({{ rotation }})">
@@ -1,5 +1,4 @@
 from django.apps import AppConfig

-
 class MembersConfig(AppConfig):
    name = 'members'