From 67fdc9c6018082c69b98944f083c85e4ce58c1cd Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 18 Nov 2011 17:49:45 +0100
Subject: [PATCH] FXOLAT-358: remove pwoer by
---
.../commons/chiefcontrollers/_content/body.html | 6 +++---
.../olat/gui/control/_content/olatFooter.html | 3 ---
.../gui/control/_content/olatGuestFooter.html | 3 ---
src/main/java/org/olat/login/_content/about.html | 7 +------
.../java/org/olat/restapi/api/ApiWebService.java | 2 +-
.../webapp/static/images/olat/powered_by_uzh.png | Bin 4668 -> 0 bytes
src/main/webapp/static/js/egg.js | 6 +++---
7 files changed, 8 insertions(+), 19 deletions(-)
delete mode 100644 src/main/webapp/static/images/olat/powered_by_uzh.png
diff --git a/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html b/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html
index ae0df81b69f..cfbde0581cc 100644
--- a/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html
+++ b/src/main/java/org/olat/core/commons/chiefcontrollers/_content/body.html
@@ -6,13 +6,13 @@
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />
<meta name="description" content="$r.translate("meta.description")" />
<meta name="keywords" content="$r.translate("meta.keywords")" />
-<meta name="DC.creator" content="University of Zurich - http://www.uzh.ch" />
+<meta name="DC.creator" content="openOLAT - http://www.openolat.org" />
<meta name="DC.subject" content="OLAT - Online Learning And Training - Your Open Source Learning Management System" />
-<meta name="DC.contributor" content="see http://www.olat.org/website/en/html/download_license.html" />
+<meta name="DC.contributor" content="see http://www.openolat.org" />
<meta name="DC.date" content="2010-03-16" scheme="DCTERMS.W3CDTF" />
<meta name="DC.type" content="Interactive Resource" scheme="DCTERMS.DCMIType" />
<meta name="DC.identifier" content="http://www.olat.org/" scheme="DCTERMS.URI" />
-<meta name="DC.rights" content="http://www.olat.org/website/en/html/download_license.html" />
+<meta name="DC.rights" content="http://www.openolat.org" />
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="pragma" content="no-cache" />
diff --git a/src/main/java/org/olat/gui/control/_content/olatFooter.html b/src/main/java/org/olat/gui/control/_content/olatFooter.html
index 0c4248c61e2..0871a683260 100644
--- a/src/main/java/org/olat/gui/control/_content/olatFooter.html
+++ b/src/main/java/org/olat/gui/control/_content/olatFooter.html
@@ -10,6 +10,3 @@
<div id="b_footer_version">
<a href="http://www.olat.org" title="Homepage of Open Source LMS OLAT" target="_blank">$olatversion</a>
</div>
-<div id="b_footer_powered">
- <a href="http://www.uzh.ch" target="_blank" title="University of Zurich"><img border="0" src="$r.staticLink("images/olat/powered_by_uzh.png")" alt="University of Zurich" width="120" height="30"/></a>
-</div>
diff --git a/src/main/java/org/olat/gui/control/_content/olatGuestFooter.html b/src/main/java/org/olat/gui/control/_content/olatGuestFooter.html
index cda28a9b047..c03dfcb18a8 100644
--- a/src/main/java/org/olat/gui/control/_content/olatGuestFooter.html
+++ b/src/main/java/org/olat/gui/control/_content/olatGuestFooter.html
@@ -9,7 +9,4 @@
</div>
<div id="b_footer_version">
<a href="http://www.olat.org" title="Homepage of Open Source LMS OLAT" target="_blank">$olatversion</a>
-</div>
-<div id="b_footer_powered">
- <a href="http://www.uzh.ch" target="_blank" title="University of Zurich"><img border="0" src="$r.staticLink("images/olat/powered_by_uzh.png")" alt="University of Zurich" width="120" height="30"/></a>
</div>
diff --git a/src/main/java/org/olat/login/_content/about.html b/src/main/java/org/olat/login/_content/about.html
index 3895fe2b4a2..07a2f53f0b9 100644
--- a/src/main/java/org/olat/login/_content/about.html
+++ b/src/main/java/org/olat/login/_content/about.html
@@ -1,6 +1,6 @@
<h3>$r.translate("about.title")</h3>
<p class="b_clearfix b_large">
- <a href="http://www.olat.org" target="_blank">
+ <a href="http://www.openolat.org" target="_blank">
<img border="0" class="b_float_left" src="$r.staticLink("images/olat/olat_logo2_72.png")" alt="Online Learning And Training">
</a>
<i>$r.translate("about.slogan")</i>
@@ -18,11 +18,6 @@
<br />
$r.translate("about.date")
</p>
-<p class="b_align_center">
- <a href="http://www.uzh.ch" target="_blank">
- <img border="0" src="$r.staticLink("images/olat/powered_by_uzh.png")" alt="University of Zurich" width="120" height="30">
- </a>
-</p>
<p>
<h4>$r.translate("about.copyright")</h4>
diff --git a/src/main/java/org/olat/restapi/api/ApiWebService.java b/src/main/java/org/olat/restapi/api/ApiWebService.java
index 980c4d47303..955a8635bc8 100644
--- a/src/main/java/org/olat/restapi/api/ApiWebService.java
+++ b/src/main/java/org/olat/restapi/api/ApiWebService.java
@@ -43,7 +43,7 @@ import javax.ws.rs.core.Response.Status;
public class ApiWebService {
private String VERSION = "1.0";
- private String COPYRIGHT = "OLAT - Online Learning and Training\nhttp://www.olat.org\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing,\nsoftware distributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\nSee the License for the specific language governing permissions and\\nlimitations under the License.\n\nCopyright (c) frentix GmbH\nhttp://www.frentix.com";
+ private String COPYRIGHT = "openOLAT - Online Learning and Training\nhttp://www.openolat.org\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing,\nsoftware distributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\nSee the License for the specific language governing permissions and\\nlimitations under the License.\n\nCopyright (c) frentix GmbH\nhttp://www.frentix.com";
/**
* Version number of the whole REST API of OLAT.
diff --git a/src/main/webapp/static/images/olat/powered_by_uzh.png b/src/main/webapp/static/images/olat/powered_by_uzh.png
deleted file mode 100644
index eb9723f5a8404b461896626d0c61648a8be53824..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4668
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
diff --git a/src/main/webapp/static/js/egg.js b/src/main/webapp/static/js/egg.js
index 736b7ea5b4c..c2ed16dd79b 100644
--- a/src/main/webapp/static/js/egg.js
+++ b/src/main/webapp/static/js/egg.js
@@ -6,7 +6,7 @@
// this lines allong with the script.
// i programmed this because i always wanted to programm a plasma. then i was
// looking for an easter eg that i could implement into the open source learning
-// management system olat (http://www.olat.org), so i decided to finally code
+// management system openolat (http://www.openolat.org), so i decided to finally code
// a small plasma together with a scrolling text using java script and css...
// usage:
// to start the plasma, press shift, alt or control key while double clicking
@@ -24,14 +24,14 @@ var s = 0;
// number of iterations
var q = 500;
// flow text at right side: plain text - no html allowed!
-var t = "thank you for using the \nlearning management\nsystem olat\n\n"
+var t = "thank you for using the \nlearning management\nsystem openolat\n\n"
+ "olat is beeing developed by:\nroberto bagnoli\nhanspeter brun\npatrick brunner\nlavinia dumitrescu\n"
+ "lars eberle\nstefan egli\nclaudia ehrle\njoel fisler\nflorian gnaegi\nchristian guretzki\nroman haag\n"
+ "stefan hofstetter\nkristina isacson\ndesiree iturbide\nsabina jeger\nfelix jost\nandreas kapp\nmartin kernland\ningmar kroll\n"
+ "tiziana perini\nmaurus rohrer\nsandra roth\nalexander schneider\nfranziska schneider\nguido schnider\nmaya schuessler\nruth schuermann\n"
+ "renata sevcikova\nconi steinemann\nmike stock\nalexandra stucki\ngregor wassmann\nmarion weber\ncarsten weisse\ntimo wuersch\nhans-joerg zuberbuehler\n"
+ "\n\nopen source development \nfinanced by\nUniversity of Zuerich\n"
- + "\n\n(c) 1999-2009 by\nwww.olat.org"
+ + "\n\n(c) 1999-2009 by\nwww.openolat.org"
+ "\n\n\n\n\n\n\n\n\n\n\n\n\njava script plasma \n(c) 2009 by\ngnaegi@frentix.com\n\n\n\n\n\n\n\n\n\n\n\n\n";
// flow text speed factor
var ts = 1.5;
--
GitLab