Added new license and started making home page

Author: tommygod3

LICENSE

@@ -1,25 +1,26 @@
-BSD 2-Clause License
+Copyright 2018 United Kingdom Research and Innovation
 
-Copyright (c) 2018, Centre for Environmental Data Analysis Developers
-All rights reserved.
+Authors: Tommy Godfrey
 
-Redistribution and use in source and binary forms, with or without
+Redistribution and use in source and binary forms, with or without 
 modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution.
+3. Neither the name of the copyright holder nor the names of its contributors 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission.
 
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.

download_stats/settings.py

@@ -33,7 +33,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, 'download_stats/templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [

download_stats/templates/index.html

@@ -0,0 +1,22 @@
+{% extends "fwtheme_django/layout.html" %}
+
+{% load staticfiles %}
+
+{% block stylesheets_extra %}
+<link rel="shortcut icon" href="{% static 'favicon.ico' %}">
+{% endblock %}
+
+{% block head_title %}
+Access stats
+{% endblock %}
+
+{% block page_title %}
+{% endblock %}
+
+{% block content %}
+<a href="downloads">Downloads</a>
+<a href="deposits">Deposits</a>
+{% endblock %}
+
+{% block tail_js_extra %}
+{% endblock %}

download_stats/urls.py

@@ -1,5 +1,8 @@
 from django.urls import path, include
 
+from .views import IndexView
+
 urlpatterns = [
+    path('', IndexView.as_view(), name='index'),
     path('downloads/', include('downloads.urls')),
 ]

download_stats/views.py

@@ -0,0 +1,10 @@
+from django.shortcuts import render
+from django.http import HttpResponse, JsonResponse, HttpResponseNotFound
+from django.views.generic import TemplateView
+
+class IndexView(TemplateView):
+    template_name = "index.html"
+    
+    def get(self, request):
+        
+        return render(request, self.template_name, {})

downloads/static/downloads/js/downloads.js

@@ -1,4 +1,5 @@
 // On default page load, get values in filters and add them to query in url
+console.log(window.location.search)
 if (!window.location.search)
 {
     var start = $("#id_start").val()

downloads/templates/downloads/index.html

@@ -329,7 +329,7 @@
                                 <tr>
                                     <th scope="col">User</th>
                                     <th scope="col">Country</th>
-                                    <th scope="col">Institiute type</th>
+                                    <th scope="col">Institute type</th>
                                     <th scope="col">Field</th>
                                     <th scope="col">Methods</th>
                                     <th scope="col">Datasets</th>

downloads/views.py

@@ -4,6 +4,7 @@
 from django.shortcuts import render
 from django.http import HttpResponse, JsonResponse, HttpResponseNotFound
 from django.views.generic import TemplateView
+
 from xlsxwriter.workbook import Workbook
 
 from .forms import FilterForm