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

diff --git a/activity/__init__.py b/activity/__init__.py
index 854897d..ab2cd0d 100644 (file)
--- 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/templates/onelab/onelab_about.html b/portal/templates/onelab/onelab_about.html
index 4c67a31..bd71256 100644 (file)
--- 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_widget-topmenu.html b/portal/templates/onelab/onelab_widget-topmenu.html
index cfb9abb..10fbbe1 100644 (file)
--- 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 %}