Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git

Etienne Pallier
2 parents 90db2cdb 8d15936a
Showing 14 changed files with 211 additions and 1 deletions Show diff stats
src/dashboard/templates/dashboard/alerts.html
src/dashboard/templates/dashboard/devices.html
src/dashboard/templates/dashboard/home.html
src/dashboard/templates/dashboard/quotas.html
src/dashboard/templates/dashboard/routines.html
src/dashboard/templates/dashboard/schedule.html
src/dashboard/templates/dashboard/site.html
src/dashboard/templates/dashboard/system.html
src/dashboard/templates/dashboard/users.html
src/dashboard/templates/dashboard/weather.html
src/dashboard/urls.py
src/dashboard/views.py
src/pyros/settings.py
src/pyros/urls.py
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Alerts</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">ALERTS</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Devices</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">DEVICES</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,31 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Dashboard</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">PYROS DASHBOARD</h1>
+		<div class="container text-center" style="magin-left:-20px" role="main">
+			<p class="row">
+				<a href="{% url "dashboard.views.users" %}" class="btn btn-lg btn-primary col-md-2" type="a">Users</a>
+				<a href="{% url "dashboard.views.alerts" %}" class="btn btn-lg btn-primary col-md-2 col-md-offset-3" type="a">Alerts</a>
+				<a href="{% url "dashboard.views.routines" %}" class="btn btn-lg btn-primary col-md-2 col-md-offset-3" type="a">Routines</a>
+			</p>
+			<p class="row">
+				<a href="{% url "dashboard.views.weather" %}" class="btn btn-lg btn-primary col-md-2" type="a">Weather</a>
+				<a href="{% url "dashboard.views.site" %}" class="btn btn-lg btn-primary col-md-2 col-md-offset-3" type="a">Site</a>
+				<a href="{% url "dashboard.views.devices" %}" class="btn btn-lg btn-primary col-md-2 col-md-offset-3" type="a">Devices</a>
+			</p>
+			<p class="row">
+				<a href="{% url "dashboard.views.system" %}" class="btn btn-lg btn-primary col-md-2" type="a">System</a>
+				<a href="{% url "dashboard.views.schedule" %}" class="btn btn-lg btn-primary col-md-2 col-md-offset-3" type="a">Schedule</a>
+				<a href="{% url "dashboard.views.quotas" %}" class="btn btn-lg btn-primary col-md-2 col-md-offset-3" type="a">Quotas & Priorities</a>
+			</p>
+		</div>		
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Quotas and Priorities</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">QUOTAS & PRIORITIES</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Routines</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">ROUTINES</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Schedule</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">SCHEDULE</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Site</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">SITE</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>System</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">SYSTEM</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Users</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">USERS</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,14 @@
+{% load bootstrap3 %}
+
+{% bootstrap_css %}
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<title>Weather</title>
+	</head>
+	<body>
+		<h1 class="text-center page-header">WEATHER</h1>	
+	</body>
+</html>
 \ No newline at end of file
@@ -0,0 +1,15 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+            url(r'^$', views.home),
+            url(r'^users$', views.users, name="users"),
+            url(r'^alerts$', views.alerts, name="alerts"),
+            url(r'^routines$', views.routines, name="routines"),
+            url(r'^weather$', views.weather, name="weather"),
+            url(r'^site$', views.site, name="site"),
+            url(r'^devices$', views.devices, name="devices"),
+            url(r'^system$', views.system, name="system"),
+            url(r'^schedule$', views.schedule, name="schedule"),
+            url(r'^quotas$', views.quotas, name="quotas"),
+              ]
 \ No newline at end of file
 from django.shortcuts import render
-# Create your views here.
+def home(request):
+    # je passe par une vue et pas par un routage statique
+    # pour prévoir la gestion des permissions
+    return render(request, 'dashboard/home.html')
+
+def users(request):
+    return render(request, 'dashboard/users.html')
+
+def alerts(request):
+    return render(request, 'dashboard/alerts.html')
+
+def routines(request):
+    return render(request, 'dashboard/routines.html')
+
+def weather(request):
+    return render(request, 'dashboard/weather.html')
+
+def site(request):
+    return render(request, 'dashboard/site.html')
+
+def devices(request):
+    return render(request, 'dashboard/devices.html')
+
+def system(request):
+    return render(request, 'dashboard/system.html')
+
+def schedule(request):
+    return render(request, 'dashboard/schedule.html')
+
+def quotas(request):
+    return render(request, 'dashboard/quotas.html')
@@ -40,7 +40,9 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'bootstrap3',
     'pyrosapp',
+    'dashboard',
 ]
 MIDDLEWARE_CLASSES = [
@@ -138,6 +140,11 @@ USE_TZ = True
 STATIC_URL = '/static/'
+# uncomment if staticfiles are needed at src/static
+# STATICFILES_DIRS = (
+#                     os.path.join(BASE_DIR, "static"),
+#                     )
+
 # dit ou se trouve la racine de tous les fichiers statiques
 #STATIC_ROOT = '/home/formation/src/'
 STATIC_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'public', 'static')
@@ -26,6 +26,7 @@ urlpatterns = [
 '''
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'^dashboard/', include('dashboard.urls')),
 #    url(r'^pyrosapp/', include('pyrosapp.urls', namespace="pyros", app_name="pyros")),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)