git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2137aea 43da604)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic & Edelberto <loic.baron@lip6.fr>
Wed, 16 Jul 2014 09:42:56 +0000 (06:42 -0300)
committerLoic & Edelberto <loic.baron@lip6.fr>
Wed, 16 Jul 2014 09:42:56 +0000 (06:42 -0300)
Conflicts:
apache/unfold.wsgi
myslice/settings.py
myslice/urls.py
setup.py
ui/templates/messages-transient-header.html

1  2 
apache/unfold.wsgi patch | diff1 | diff2 | blob | history
myslice/settings.py patch | diff1 | diff2 | blob | history
myslice/urls.py patch | diff1 | diff2 | blob | history
portal/actions.py patch | diff1 | diff2 | blob | history
portal/homeview.py patch | diff1 | diff2 | blob | history
portal/registrationview.py patch | diff1 | diff2 | blob | history
portal/templates/base.html patch | diff1 | diff2 | blob | history
portal/templates/onelab/onelab_base.html patch | diff1 | diff2 | blob | history

diff --cc apache/unfold.wsgi
index caf5f60,4af2e9f..34ffb36
--- 1/apache/unfold.wsgi
--- 2/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 d4240f4,235a18c..89565dd
mode 100755,100644..100644
--- 1/myslice/settings.py
--- 2/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/'
  
 -SLA_MANAGER_PASSWORD = "password"
 +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"
diff --cc myslice/urls.py
index 3c72971,dacebde..07db378
--- 1/myslice/urls.py
--- 2/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/actions.py
Simple merge
diff --cc portal/homeview.py
Simple merge
diff --cc portal/registrationview.py
Simple merge
diff --cc portal/templates/base.html
index 839c955,237cfa6..b282727
--- 1/portal/templates/base.html
--- 2/portal/templates/base.html
+++ b/portal/templates/base.html
@@@ -69,10 -83,10 +83,10 @@@ $(document).ready(function() 
  });
  </script>
  </head>
- <body>
+ <body ng-app="ManifoldApp">
  {% 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 6419129,fdab352..2d9d53e
--- 1/portal/templates/onelab/onelab_base.html
--- 2/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" %}
  <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/{{ theme }}.css">
  </head>
- <body>
+ <body ng-app="ManifoldApp">
  {% 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 %}
myslice (django)