From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 19 Aug 2014 08:20:12 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cee44fa48fde5073d590879135c49b360ac411eb;hp=f510a89e0f52c4756c564339d638b4018342ad65;p=myslice.git

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

diff --git a/activity/__init__.py b/activity/__init__.py
index 854897d1..ab2cd0d3 100644
--- a/activity/__init__.py
+++ b/activity/__init__.py
@@ -32,7 +32,7 @@ if config.activity and config.activity.server :
     server = config.activity.server
 else :
     # default log server
-    server = "http://athos.ipv6.lip6.fr/log"
+    server = "http://athos.ipv6.lip6.fr/activity/push/log"
 
 def logWrite(request, action, message):
     
@@ -60,7 +60,7 @@ def logWrite(request, action, message):
         result = urllib2.urlopen(server, urllib.urlencode(log))
         content = result.read()
     except urllib2.URLError as e:
-        print "===============>> activity: connection to " + url + " impossible, could not log action"
+        print "===============>> activity: connection to " + server + " impossible, could not log action"
 
 def log(request, action, message):
     # Create a new thread in Daemon mode to send the log entry
diff --git a/portal/actions.py b/portal/actions.py
index a2afbfc2..38af28c9 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -424,6 +424,10 @@ def create_slice(wsgi_request, request):
     for user in user_details_sfa:
         user_email = user['user_email']
 
+    # XXX LOIC Quick fix because this is totally inconsistent
+    if not 'number_of_nodes' in request:
+        request['number_of_nodes']=""
+
     # XXX We should create a slice with Manifold terminology
     slice_params = {
         'slice_hrn'        : hrn, 
diff --git a/portal/templates/onelab/onelab_about.html b/portal/templates/onelab/onelab_about.html
index 4c67a317..bd71256c 100644
--- a/portal/templates/onelab/onelab_about.html
+++ b/portal/templates/onelab/onelab_about.html
@@ -16,7 +16,7 @@
 				is responsible to accept or reject newly registered users.   
 			</p>
 			<p>
-				To learn more about OneLab visit:  <a href="http://onelab.eu" target="_blank">onelab.eu</a> 			
+				To learn more about OneLab visit:  <a href="https://www.onelab.eu" target="_blank">onelab.eu</a> 			
 			</p>
 			<p>
 				If you have any questions regarding using the portal visit: <a href="/support">OneLab support</a>
diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html
index 3436fa13..18314d3d 100644
--- a/portal/templates/onelab/onelab_registration_view.html
+++ b/portal/templates/onelab/onelab_registration_view.html
@@ -489,6 +489,9 @@ $(document).ready(function(){
         {% for authority in authorities %}
             {% if authority.name %}
                 {value:"{{ authority.name }}",label:"{{authority.name}}"},
+			// show hrn if we don't have the name
+            {% else %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
             {% endif %}
         {% endfor %}    
     {% else %}
diff --git a/portal/templates/onelab/onelab_widget-topmenu.html b/portal/templates/onelab/onelab_widget-topmenu.html
index cfb9abbf..10fbbe13 100644
--- a/portal/templates/onelab/onelab_widget-topmenu.html
+++ b/portal/templates/onelab/onelab_widget-topmenu.html
@@ -33,7 +33,7 @@
 			<ul>
 				<li><a href="/news">News</a></li>
 				<li><a href="/about">About</a></li>
-				<li><a target="_blank" href="http://new.onelab.eu">Public Website</a></li>
+				<li><a target="_blank" href="https://www.onelab.eu">Public Website</a></li>
 				<li><a target="_blank" href="http://intranet.onelab.eu">Intranet</a></li>
 			</ul>
 			{% if username %}
diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 9cbcacf9..ef29d3dd 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -481,9 +481,9 @@ jQuery(document).ready(function(){
         {% for authority in authorities %}
             {% if authority.name %}
                 {value:"{{ authority.name }}",label:"{{authority.name}}"},
-			// to show only full name
-           // {% else %}
-           //     {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
+			// show hrn if we don't have the name
+            {% else %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
             {% endif %}
         {% endfor %}    
     {% else %}