STATIC Page: support/documentation (FAQ)

diff --git a/portal/documentationview.py b/portal/documentationview.py
new file mode 100644 (file)
index 0000000..e5c00ff
--- /dev/null
+++ b/portal/documentationview.py
@@ -0,0 +1,16 @@
+from django.shortcuts           import render
+from django.views.generic       import View
+
+from unfold.loginrequired       import FreeAccessView
+from ui.topmenu                 import topmenu_items
+
+
+# splitting the 2 functions done here
+# GET is for displaying the empty form
+# POST is to process it once filled - or show the form again if anything is missing
+class DocumentationView (FreeAccessView):
+    template_name = "documentationview.html"
+    def _display (self, request):
+        return render(request, 'documentationview.html', {
+                'topmenu_items': topmenu_items('FAQ', request),
+                })

diff --git a/portal/experimentview.py b/portal/experimentview.py
index ddd10d7..b4c20b0 100644 (file)
--- a/portal/experimentview.py
+++ b/portal/experimentview.py
@@ -1,4 +1,19 @@
-from django.shortcuts import render_to_response
+from django.shortcuts           import render
+from django.views.generic       import View
+
+from unfold.loginrequired       import FreeAccessView
+from ui.topmenu                 import topmenu_items
+
+
+# splitting the 2 functions done here
+# GET is for displaying the empty form
+# POST is to process it once filled - or show the form again if anything is missing
+class ExperimentView (FreeAccessView):
+    template_name = "experimentview.html"
+    def _display (self, request):
+        return render(request, 'experimentview.html', {
+                'topmenu_items': topmenu_items('experiment', request),
+                })
+
+

 
 

-def experiment_view(request):
-   return render_to_response('experimentview.html')

diff --git a/portal/templates/documentationview.html b/portal/templates/documentationview.html
new file mode 100644 (file)
index 0000000..344c8d3
--- /dev/null
+++ b/portal/templates/documentationview.html
@@ -0,0 +1,15 @@
+{% extends "layout-unfold1.html" %}
+
+{% block head %}
+{{ wizard.form.media }}
+{% endblock %}
+
+{% block unfold_main %}
+
+<h1>OneLab Portal Documentation<h1>
+<h2>FAQ<h2>
+<h3>Users</h3>
+<h3>Managers</h3>
+
+{% endblock %}
+

diff --git a/portal/urls.py b/portal/urls.py
index dd0b1c8..790e927 100644 (file)
--- a/portal/urls.py
+++ b/portal/urls.py
@@ -36,8 +36,8 @@ from portal.registrationview    import RegistrationView
 from portal.joinview            import JoinView
 from portal.sliceview           import SliceView
 from portal.validationview      import ValidatePendingView
 from portal.joinview            import JoinView
 from portal.sliceview           import SliceView
 from portal.validationview      import ValidatePendingView

-from portal.experimentview      import experiment_view
-
+from portal.experimentview      import ExperimentView
+from portal.documentationview   import DocumentationView

 # hopefully these should move in dedicated source files too
 from portal.views               import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
 from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete 
 # hopefully these should move in dedicated source files too
 from portal.views               import PresViewView, pres_view_static, pres_view_methods, pres_view_animation
 from portal.django_passresetview import password_reset, password_reset_done, password_reset_confirm, password_reset_complete 


@@ -73,7 +73,8 @@ urlpatterns = patterns('',
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),
     url(r'^join/?$', JoinView.as_view(), name='join'),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),
     url(r'^join/?$', JoinView.as_view(), name='join'),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),

-    url(r'^experiment?$', experiment_view),
+    url(r'^experiment?$', ExperimentView.as_view(), name='experiment'),
+    url(r'^support/documentation?$', DocumentationView.as_view(), name='FAQ'),

     #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # Slice request
     url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),
     #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'),
     # Slice request
     url(r'^slice_request/?$', SliceRequestView.as_view(), name='slice_request'),