From 3decb43fcae0a5df9d9c0ccee50e208956453d12 Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 19 Mar 2014 14:04:25 +0100 Subject: [PATCH] Slice-tab-users: Redesigend according to the new style. Fix: Template rend problem --- myslice/urls.py | 7 ++--- portal/{sliceuserview.py => slicetabusers.py} | 4 ++- ....html => onelab_slice-tab-users-view.html} | 29 ------------------- ...er-view.html => slice-tab-users-view.html} | 29 ------------------- portal/urls.py | 4 +-- 5 files changed, 8 insertions(+), 65 deletions(-) rename portal/{sliceuserview.py => slicetabusers.py} (93%) rename portal/templates/onelab/{onelab_slice-user-view.html => onelab_slice-tab-users-view.html} (74%) rename portal/templates/{slice-user-view.html => slice-tab-users-view.html} (74%) diff --git a/myslice/urls.py b/myslice/urls.py index 5a8455bd..15121bfc 100644 --- a/myslice/urls.py +++ b/myslice/urls.py @@ -20,15 +20,14 @@ home_view=portal.homeview.HomeView.as_view() dashboard_view=portal.dashboardview.DashboardView.as_view() platforms_view=portal.platformsview.PlatformsView.as_view() -import portal.testbedlist +#import portal.testbedlist import portal.sliceview import portal.sliceresourceview import portal.slicetabexperiment import portal.slicetabinfo import portal.slicetabtestbeds - -from portal.sliceuserview import SliceUserView +import portal.slicetabusers #### high level choices # main entry point (set to the / URL) @@ -82,7 +81,7 @@ urls = [ # Portal (r'^resources/(?P[^/]+)/?$', portal.sliceresourceview.SliceResourceView.as_view()), - (r'^users/(?P[^/]+)/?$', SliceUserView.as_view()), + (r'^users/(?P[^/]+)/?$', portal.slicetabusers.SliceUserView.as_view()), (r'^slice/(?P[^/]+)/?$', portal.sliceview.SliceView.as_view()), (r'^info/(?P[^/]+)/?$', portal.slicetabinfo.SliceInfoView.as_view()), diff --git a/portal/sliceuserview.py b/portal/slicetabusers.py similarity index 93% rename from portal/sliceuserview.py rename to portal/slicetabusers.py index 44c29f0d..0105cb1d 100644 --- a/portal/sliceuserview.py +++ b/portal/slicetabusers.py @@ -17,11 +17,13 @@ from manifoldapi.manifoldapi import execute_query from theme import ThemeView class SliceUserView (LoginRequiredView, ThemeView): - template_name = "slice-user-view.html" + template_name = "slice-tab-users-view.html" def get(self, request, slicename): if request.user.is_authenticated(): user_query = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn') user_details = execute_query(self.request, user_query) + + print self.template return render_to_response(self.template, {"slice": slicename, "user_details":user_details[0], "theme": self.theme, "username": request.user, "section":"users"}, context_instance=RequestContext(request)) diff --git a/portal/templates/onelab/onelab_slice-user-view.html b/portal/templates/onelab/onelab_slice-tab-users-view.html similarity index 74% rename from portal/templates/onelab/onelab_slice-user-view.html rename to portal/templates/onelab/onelab_slice-tab-users-view.html index d1c87e10..1751ce91 100644 --- a/portal/templates/onelab/onelab_slice-user-view.html +++ b/portal/templates/onelab/onelab_slice-tab-users-view.html @@ -1,7 +1,3 @@ -{% extends "layout_wide.html" %} - - -{% block content %}
@@ -24,25 +20,6 @@
- {% include theme|add:"_widget-slice-sections.html" %} -
-
- -
-
-
Loading Useres
-{% endblock %} diff --git a/portal/templates/slice-user-view.html b/portal/templates/slice-tab-users-view.html similarity index 74% rename from portal/templates/slice-user-view.html rename to portal/templates/slice-tab-users-view.html index d1c87e10..1751ce91 100644 --- a/portal/templates/slice-user-view.html +++ b/portal/templates/slice-tab-users-view.html @@ -1,7 +1,3 @@ -{% extends "layout_wide.html" %} - - -{% block content %}
@@ -24,25 +20,6 @@
- {% include theme|add:"_widget-slice-sections.html" %} -
-
- -
-
-
Loading Useres
-{% endblock %} diff --git a/portal/urls.py b/portal/urls.py index fb66850b..c55c07b9 100644 --- a/portal/urls.py +++ b/portal/urls.py @@ -38,7 +38,7 @@ from portal.registrationview import RegistrationView from portal.joinview import JoinView from portal.sliceviewold import SliceView from portal.validationview import ValidatePendingView -from portal.experimentview import ExperimentView +#from portal.experimentview import ExperimentView from portal.documentationview import DocumentationView from portal.supportview import SupportView @@ -79,7 +79,7 @@ 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'^experiment?$', ExperimentView.as_view(), name='experiment'), + #url(r'^experiment?$', ExperimentView.as_view(), name='experiment'), url(r'^support/?$', SupportView.as_view(), name='support'), url(r'^support/documentation?$', DocumentationView.as_view(), name='FAQ'), #url(r'^pass_reset/?$', PassResetView.as_view(), name='pass_rest'), -- 2.43.0