From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 20 Feb 2014 16:09:48 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-1.1~331
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=3d16aa36af64e8e0e5ce3a48c34df158fbfaae29

Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
	portal/slicerequestview.py
	portal/usersview.py
---

3d16aa36af64e8e0e5ce3a48c34df158fbfaae29
diff --cc portal/slicerequestview.py
index 9d7a9702,b9601846..cf818dc7
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@@ -12,8 -12,10 +12,10 @@@ from portal.actions              impor
  from portal.forms                import SliceRequestForm
  from unfold.loginrequired        import LoginRequiredAutoLogoutView
  from ui.topmenu                  import topmenu_items_live, the_user
- from theme import ThemeView
+ 
+ import json
+ 
 -class SliceRequestView (LoginRequiredAutoLogoutView):
 +class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
      def __init__ (self):
          self.user_email = ''
          self.errors = []
@@@ -101,10 -122,9 +122,10 @@@
            'number_of_nodes': request.POST.get('number_of_nodes', ''),
            'purpose': request.POST.get('purpose', ''),
            'email': self.user_email,
-           'user_hrn': self.user_hrn,
+           'user_hrn': user_hrn,
            'cc_myself': True,
            'authorities': authorities,
 +          'theme': self.theme
          }
          template_env.update(page.prelude_env ())
          return render(request, 'slicerequest_view.html',template_env)
diff --cc portal/usersview.py
index 6560d9d2,8dfd9156..8d7f37e7
--- a/portal/usersview.py
+++ b/portal/usersview.py
@@@ -10,8 -10,8 +10,8 @@@ from theme import ThemeVie
  import json
  
  # View for platforms
- class AdminView(LoginRequiredAutoLogoutView, ThemeView):
-     template_name = "adminview.html"
 -class UsersView(LoginRequiredAutoLogoutView):
++class UsersView(LoginRequiredAutoLogoutView, ThemeView):
+     template_name = "usersview.html"
  
      def get_context_data(self, **kwargs):
          page = Page(self.request)
@@@ -77,10 -77,10 +77,10 @@@
          # more general variables expected in the template
          context['title'] = 'Users in MySlice'
          # the menu items on the top
-         context['topmenu_items'] = topmenu_items_live('Admin', page)
+         context['topmenu_items'] = topmenu_items_live('Users', page)
          # so we can sho who is logged
          context['username'] = the_user(self.request)
 -
 +        context['theme'] = self.theme
          context.update(page.prelude_env())
  
          context['layout_1_or_2']="layout-unfold2.html" if not context['username'] else "layout-unfold1.html"