From 52e1db7e850a63b8271e348c487bd60853ed73e8 Mon Sep 17 00:00:00 2001 From: Maciej Tronowski Date: Thu, 12 Feb 2015 13:02:41 +0100 Subject: [PATCH] mock views for job list and detail --- plgng/settings.py | 1 + qcg/static/qcg/main.css | 18 +++++ qcg/templates/qcg/base.html | 110 +++++++++++++++++++--------- qcg/templates/qcg/job.html | 53 ++++++++++++++ qcg/templates/qcg/jobs.html | 171 +++++++++++++++++++++++++++++++++++++++++++ qcg/urls.py | 2 + qcg/views.py | 8 ++ 7 files changed, 330 insertions(+), 33 deletions(-) create mode 100644 qcg/static/qcg/main.css create mode 100644 qcg/templates/qcg/job.html create mode 100644 qcg/templates/qcg/jobs.html diff --git a/plgng/settings.py b/plgng/settings.py index afad91e..7971690 100644 --- a/plgng/settings.py +++ b/plgng/settings.py @@ -41,6 +41,7 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.contrib.webdesign', 'qcg', ) diff --git a/qcg/static/qcg/main.css b/qcg/static/qcg/main.css new file mode 100644 index 0000000..57a2b84 --- /dev/null +++ b/qcg/static/qcg/main.css @@ -0,0 +1,18 @@ +html { + /* needed to push down footer */ + position: relative; + min-height: 100%; +} + +body { + /* space for footer */ + margin-bottom: 70px; +} + +footer.navbar-fixed-bottom { + position: absolute; +} + +.page-header { + margin-top: 0; +} diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html index c05ddbe..c711581 100644 --- a/qcg/templates/qcg/base.html +++ b/qcg/templates/qcg/base.html @@ -1,44 +1,88 @@ -{% load staticfiles %} +{% load staticfiles webdesign %} - - - - - Portal QCG - - - - - + + + + + {% block title %}Strona główna{% endblock %} - Portal QCG + + + {% block extra_css %}{% endblock %} + + + + +
+ {% block container %} -
+

Hello, cruel world!

+ + {% lorem 1 p %} +
+ +
+
+

PL-GRID jest super!

+ + {% lorem 1 p %} +
+
+
+ +
+
+
+

QosCosGrid jest super!

+ + {% lorem 1 p %} +
-
+

+ Zaloguj się korzystając z OpenID +

+ + {% endblock container %} +
+ + - - - + + + {% block extra_js %}{% endblock %} + diff --git a/qcg/templates/qcg/job.html b/qcg/templates/qcg/job.html new file mode 100644 index 0000000..3a0f787 --- /dev/null +++ b/qcg/templates/qcg/job.html @@ -0,0 +1,53 @@ +{% extends 'qcg/base.html' %} + +{% block container %} +

{% block title %}Zadanie J1372950219798__8575{% endblock %}

+ +

Szczegóły

+ +
+
Note
+
urban
+
+
+
TaskType
+
SINGLE
+
+
+
SubmissionTime
+
Fri Jul 19 11:54:20 CEST 2013
+
+
+
FinishTime
+
Fri Jul 19 12:02:33 CEST 2013
+
+
+
Status
+
FINISHED
+
+
+
Purged
+
false
+
+ + +

Alokacja

+ +
+
HostName
+
hydra.icm.edu.pl
+
+
+
ProcessesCount
+
16
+
+
+
SubmissionTime
+
Fri Jul 19 11:54:20 CEST 2013
+
+
+
FinishTime
+
Fri Jul 19 12:02:33 CEST 2013
+
+ +{% endblock container %} diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html new file mode 100644 index 0000000..747d382 --- /dev/null +++ b/qcg/templates/qcg/jobs.html @@ -0,0 +1,171 @@ +{% extends 'qcg/base.html' %} + +{% load staticfiles %} + +{% block extra_css %} + + + +{% endblock %} + +{% block extra_js %} + + + +{% endblock %} + +{% block container %} +

+ {% block title %}Lista zadań{% endblock %} +

+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
OpisWysłaneStartKoniecStatusHostUwagi
+ + + + urban04.07.13 17:03PENDINGhydra
+ + + + urban04.07.13 17:03RUNNINGinula
+ + + + urban04.07.13 17:03FINISHEDinula
+ + + + urban04.07.13 17:03CANCELEDinula
+ + + +{% endblock container %} diff --git a/qcg/urls.py b/qcg/urls.py index 249bdf5..caa6139 100644 --- a/qcg/urls.py +++ b/qcg/urls.py @@ -4,4 +4,6 @@ from qcg import views urlpatterns = patterns('', url(r'^$', views.index, name='index'), + url(r'^jobs/$', views.jobs_list, name='jobs'), + url(r'^job/$', views.job_details, name='job'), ) diff --git a/qcg/views.py b/qcg/views.py index e7be90a..9476197 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -3,3 +3,11 @@ from django.shortcuts import render def index(request): return render(request, 'qcg/base.html') + + +def jobs_list(request): + return render(request, 'qcg/jobs.html') + + +def job_details(request): + return render(request, 'qcg/job.html') -- 1.7.9.5