Fix: merge conflic /portal/views.py

diff --cc portal/views.py
index 16086c2,ac4e7b8..4df9fc8
--- 1/portal/views.py
--- 2/portal/views.py
+++ b/portal/views.py
@@@ -476,16 -472,16 +479,6 @@@ class DashboardView(TemplateView)
  # DEPRECATED #        context.update(page.prelude_env())
  # DEPRECATED #        return context
  
--
- @login_required
 -
--# View for my_account form
--def my_account(request):
--    return render(request, 'my_account.html', {
--        #'form': form,
--        'topmenu_items': topmenu_items('My Account', request),
--        'username': the_user (request)
--    })
--
  # View for platforms
  class PlatformsView(TemplateView):
      template_name = "platforms.html"
@@@ -537,7 -533,64 +530,78 @@@
          context.update(page.prelude_env())
  
          return context
+ 
++
++
+ # View for 1 platform and its details
+ class PlatformView(TemplateView):
+     template_name = "platform.html"
+ 
+     def get_context_data(self, **kwargs):
+         page = Page(self.request)
+ 
+         for key, value in kwargs.iteritems():
+             print "%s = %s" % (key, value)       
+             if key == "platformname":
+                 platformname=value
+                 
+         network_query  = Query().get('local:platform').filter_by('platform', '==', platformname).select('platform','platform_longname','gateway_type')
+         page.enqueue_query(network_query)
+ 
+         page.expose_js_metadata()
+         page.expose_queries()
+         networklist = Hazelnut(
+             page  = page,
+             title = 'List',
+             domid = 'checkboxes',
+             # this is the query at the core of the slice list
+             query = network_query,
+             query_all = network_query,
+             checkboxes = False,
+             datatables_options = {
+             # for now we turn off sorting on the checkboxes columns this way
+             # this of course should be automatic in hazelnut
+             'aoColumns'      : [None, None, None, None, {'bSortable': False}],
+             'iDisplayLength' : 25,
+             'bLengthChange'  : True,
+             },
+         )
+ #
+ #        networklist = SimpleList(
+ #            title = None,
+ #            page  = page,
+ #            key   = 'platform',
+ #            query = network_query,
+ #        )
+ 
+         context = super(PlatformView, self).get_context_data(**kwargs)
+         context['person']   = self.request.user
+         context['networks'] = networklist.render(self.request)
+ 
+         # XXX This is repeated in all pages
+         # more general variables expected in the template
+         context['title'] = 'Platforms connected to MySlice'
+         # the menu items on the top
+         context['topmenu_items'] = topmenu_items('Platforms', self.request)
+         # so we can sho who is logged
+         context['username'] = the_user(self.request)
+ 
+         context.update(page.prelude_env())
+ 
+         return context
+ 
++
++@login_required
++# View for my_account form
++def my_account(request):
++    return render(request, 'my_account.html', {
++        #'form': form,
++        'topmenu_items': topmenu_items('My Account', request),
++        'username': the_user (request)
++    })
++
++
 +@login_required
  #my_acc form value processing
  def acc_process(request):
      # getting the user_id from the session [now hardcoded]