From: Loic & Edelberto Date: Wed, 16 Jul 2014 09:42:56 +0000 (-0300) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f6f7b21b464c7308f7d5f9b5335862d7bee4903d;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre Conflicts: apache/unfold.wsgi myslice/settings.py myslice/urls.py setup.py ui/templates/messages-transient-header.html --- f6f7b21b464c7308f7d5f9b5335862d7bee4903d diff --cc apache/unfold.wsgi index caf5f60c,4af2e9f9..34ffb364 --- a/apache/unfold.wsgi +++ b/apache/unfold.wsgi @@@ -1,12 -1,10 +1,13 @@@ import os import sys -path = '/var/myslice-f4f' +#site.addsitedir('/var/www/myslice') + +path = '/var/www/myslice' if path not in sys.path: - sys.path.append(path) + sys.path = [path] + sys.path +print sys.path + os.environ['DJANGO_SETTINGS_MODULE'] = 'myslice.settings' import django.core.handlers.wsgi diff --cc myslice/settings.py index d4240f4c,235a18ca..89565ddb mode 100755,100644..100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@@ -289,5 -290,8 +291,10 @@@ CSRF_FAILURE_VIEW = 'manifoldapi.manifo # put stuff under static/ # IA_MEDIA_PREFIX = '/code/' +SESSION_ENGINE = 'django.contrib.sessions.backends.file' + + ####SLA##### + + SLA_MANAGER_URL = "http://157.193.215.125:4000/sla-service" + SLA_MANAGER_USER = "normal_user" -SLA_MANAGER_PASSWORD = "password" ++SLA_MANAGER_PASSWORD = "password" diff --cc myslice/urls.py index 3c729719,dacebded..07db378b --- a/myslice/urls.py +++ b/myslice/urls.py @@@ -17,8 -17,9 +17,11 @@@ import portal.dashboardvie import portal.homeview import portal.newsview +import plugins.cafe.edelberto + + from portal.registrationview import RegistrationView + from portal.termsview import TermsView + home_view=portal.homeview.HomeView.as_view() dashboard_view=portal.dashboardview.DashboardView.as_view() platforms_view=portal.platformsview.PlatformsView.as_view() diff --cc portal/templates/base.html index 839c9550,237cfa6b..b282727b --- a/portal/templates/base.html +++ b/portal/templates/base.html @@@ -69,10 -83,10 +83,10 @@@ $(document).ready(function() }); - + {% block container %} {% block topmenu %} - {% widget "_widget-topmenu.html" %} + {% widget "__widget-topmenu.html" %} {% endblock topmenu %} {% include 'messages-transient.html' %} {% block base_content %} diff --cc portal/templates/onelab/onelab_base.html index 64191290,fdab3522..2d9d53ef --- a/portal/templates/onelab/onelab_base.html +++ b/portal/templates/onelab/onelab_base.html @@@ -30,10 -36,10 +36,10 @@@ {% insert_str prelude "js/logout.js" %} - + {% block container %} {% block topmenu %} - {% include theme|add:"__widget-topmenu.html" %} + {% include theme|add:"_widget-topmenu.html" %} {% endblock topmenu %} {% include 'messages-transient.html' %} {% block base_content %}