From: Ciro Scognamiglio
Date: Mon, 18 Aug 2014 20:56:01 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~4^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3ecc81f0804779ab298167f9ee5a79126e6b2572;hp=af8309c2b65c819b5963565ccac2ff35cddec265;p=unfold.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/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.
- To learn more about OneLab visit: onelab.eu
+ To learn more about OneLab visit: onelab.eu
If you have any questions regarding using the portal visit: OneLab support
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 @@
{% if username %}