Slice-tab-users: Redesigend according to the new style. Fix: Template rend problem

diff --git a/myslice/urls.py b/myslice/urls.py
index 5a8455b..15121bf 100644 (file)
--- 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<slicename>[^/]+)/?$', portal.sliceresourceview.SliceResourceView.as_view()),
-    (r'^users/(?P<slicename>[^/]+)/?$', SliceUserView.as_view()),
+    (r'^users/(?P<slicename>[^/]+)/?$', portal.slicetabusers.SliceUserView.as_view()),
     
     (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
     (r'^info/(?P<slicename>[^/]+)/?$', 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 44c29f0..0105cb1 100644 (file)
--- 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 d1c87e1..1751ce9 100644 (file)
--- 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 %}
        <div class="col-md-2">
                <div id="select-platform" class="list-group">
                </div>
@@ -24,25 +20,6 @@
        </div>
        <div class="col-md-10">
                <div class="row">
-                       {% include theme|add:"_widget-slice-sections.html" %}
-               </div>
-               <div class="row slice-pending">
-                       <ul class="nav nav-pills">
-                               <li><a href="">All users</a></li>
-                               <li><a href="">Users in Slice</a></li>
-                               <li><a href="">Pending<span class="badge">42</span></a></li>
-                               <li>
-                                       <button type="button" class="btn btn-primary apply">Apply</button>
-                                       <button type="button" class="btn btn-default clear">Clear</button>
-                               </li>
-                       </ul>
-               </div>
-               <div class="row">
-                       <ul class="nav nav-tabs">
-                         <li class="active"><a href="#">Users</a></li>
-                         <li><a href="#"></a></li>
-                         <li><a href="#"></a></li>
-                       </ul>
                </div>
                <div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
                <div id="user-tab-loaded" style="display:none;">
@@ -57,11 +34,6 @@
                </div>
 <script>
     $(document).ready(function() {
-               //var selectedValue = $( "#auth_list option:selected" ).val();    
-               //console.log(selectedValue);
-               //console.log("Name of the authority: " + "{{user_details.parent_authority}}");
-               //$("#auth_list").change(function(){
-                       //selectedValue = $(this).find(":selected").val();
                        //console.log("the value you selected: " + selectedValue);
                $.post("/rest/user/",{'filters':{'parent_authority': "{{user_details.parent_authority}}"}}, function( data ) {
                var list_users = [];
@@ -101,4 +73,3 @@
     });
 </script>
 
-{% 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 d1c87e1..1751ce9 100644 (file)
--- 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 %}
        <div class="col-md-2">
                <div id="select-platform" class="list-group">
                </div>
@@ -24,25 +20,6 @@
        </div>
        <div class="col-md-10">
                <div class="row">
-                       {% include theme|add:"_widget-slice-sections.html" %}
-               </div>
-               <div class="row slice-pending">
-                       <ul class="nav nav-pills">
-                               <li><a href="">All users</a></li>
-                               <li><a href="">Users in Slice</a></li>
-                               <li><a href="">Pending<span class="badge">42</span></a></li>
-                               <li>
-                                       <button type="button" class="btn btn-primary apply">Apply</button>
-                                       <button type="button" class="btn btn-default clear">Clear</button>
-                               </li>
-                       </ul>
-               </div>
-               <div class="row">
-                       <ul class="nav nav-tabs">
-                         <li class="active"><a href="#">Users</a></li>
-                         <li><a href="#"></a></li>
-                         <li><a href="#"></a></li>
-                       </ul>
                </div>
                <div id="user-tab-loading"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Useres" /></div>
                <div id="user-tab-loaded" style="display:none;">
@@ -57,11 +34,6 @@
                </div>
 <script>
     $(document).ready(function() {
-               //var selectedValue = $( "#auth_list option:selected" ).val();    
-               //console.log(selectedValue);
-               //console.log("Name of the authority: " + "{{user_details.parent_authority}}");
-               //$("#auth_list").change(function(){
-                       //selectedValue = $(this).find(":selected").val();
                        //console.log("the value you selected: " + selectedValue);
                $.post("/rest/user/",{'filters':{'parent_authority': "{{user_details.parent_authority}}"}}, function( data ) {
                var list_users = [];
@@ -101,4 +73,3 @@
     });
 </script>
 
-{% endblock %}

diff --git a/portal/urls.py b/portal/urls.py
index fb66850..c55c07b 100644 (file)
--- 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'),