From 0898eeafb0687d5cfb97f1b5038e665a7d01ec60 Mon Sep 17 00:00:00 2001 From: Maciej Tronowski Date: Fri, 20 Mar 2015 13:30:03 +0100 Subject: [PATCH] add gridftp view --- plgng/settings_common.py | 1 + plgng/urls.py | 1 + qcg/static/qcg/main.css | 49 +++++++++++++++--- qcg/templates/qcg/base.html | 3 ++ qcg/templates/qcg/gridftp.html | 107 ++++++++++++++++++++++++++++++++++++++++ qcg/urls.py | 4 +- qcg/views.py | 4 ++ 7 files changed, 161 insertions(+), 8 deletions(-) create mode 100644 qcg/templates/qcg/gridftp.html diff --git a/plgng/settings_common.py b/plgng/settings_common.py index 503c0a5..84a0283 100644 --- a/plgng/settings_common.py +++ b/plgng/settings_common.py @@ -31,6 +31,7 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django.contrib.webdesign', 'qcg', + 'filex', 'django_openid_auth', 'bootstrap3', ) diff --git a/plgng/urls.py b/plgng/urls.py index d4e6ead..e4324f9 100644 --- a/plgng/urls.py +++ b/plgng/urls.py @@ -5,5 +5,6 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), url(r'^grappelli/', include('grappelli.urls')), # grappelli URLS + url(r'^filex/', include('filex.urls', namespace='filex')), url(r'^', include('qcg.urls')), ) diff --git a/qcg/static/qcg/main.css b/qcg/static/qcg/main.css index f3ee656..881ed0c 100644 --- a/qcg/static/qcg/main.css +++ b/qcg/static/qcg/main.css @@ -17,44 +17,40 @@ footer.navbar-fixed-bottom { margin-top: 0; } + +/* new job view */ + textarea { resize: vertical; min-height: 34px; } - .modal-body > *:last-child { margin-bottom: 0; } - #env-controls .form-group { display: inline-block; margin: 0; vertical-align: middle; } - #env-controls > div { margin-bottom: 7px; } - #env-controls > div:last-of-type { margin: 0; } - #env-controls input[type="text"] { width: 160px; } - #add-env-form { padding-top: 7px; } - .timerange input { display: inline-block; width: 67%; @@ -66,3 +62,42 @@ textarea { width: 30%; float: right; } + + +/* GridFTP view */ + +#filex { + /* needed for positioning spinner */ + position: relative; +} + +#host-controls .change { + display: none; +} + +#host-controls.editing .view { + display: none; +} + +#host-controls.editing .change { + display: initial; +} + +.path.breadcrumb > li + li::before { + content: "› "; +} + +#spinner-overlay { + background: url('/static/filex/spinner.gif') white center 100px no-repeat; + opacity: 0.5; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + display: none; +} + +.busy #spinner-overlay { + display: initial; +} diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html index 19841b4..9accb20 100644 --- a/qcg/templates/qcg/base.html +++ b/qcg/templates/qcg/base.html @@ -34,6 +34,9 @@ Zleć zadanie + + GridFTP + {% endif %} diff --git a/qcg/templates/qcg/gridftp.html b/qcg/templates/qcg/gridftp.html new file mode 100644 index 0000000..7b2cd65 --- /dev/null +++ b/qcg/templates/qcg/gridftp.html @@ -0,0 +1,107 @@ +{% extends 'qcg/base.html' %} +{% load staticfiles %} + +{% block extra_css %} + +{% endblock %} + +{% block extra_js %} + + + + + + + + + + + + +{% endblock extra_js %} + +{% block container %} +

{% block title %}Zarządzanie plikami GridFTP{% endblock %}

+ +
+
+
+
+
+ + +
+ +
+
+ +
+
    +
    + +
    +
    + +
    +
    +
    + + + + + + + + + + + +
    NazwaRozmiarData
    + + + + + +
    +
    + +{% endblock container %} diff --git a/qcg/urls.py b/qcg/urls.py index 085bfd3..a45e85d 100644 --- a/qcg/urls.py +++ b/qcg/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url, include +from django.conf.urls import patterns, url from qcg import views @@ -12,4 +12,6 @@ urlpatterns = patterns('', url(r'^job/new/$', views.job_new, name='job_new'), url(r'^job/(?P[\w]+)/?$', views.job_details, name='job'), url(r'^job/(?P[\w]+)/(?P[\w]+)/?$', views.task_details, name='task'), + + url(r'^gridftp/$', views.gridftp, name='gridftp'), ) diff --git a/qcg/views.py b/qcg/views.py index 3da9dfe..b8947b3 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -202,3 +202,7 @@ def job_new(request): errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors}) + + +def gridftp(request): + return render(request, 'qcg/gridftp.html') -- 1.7.9.5