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 ae0df81b69f923a397e04a7cc060574093cfef23..cfbde0581cc400b662080bc9bf294dbd1bab1112 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 0c4248c61e262bd25459208a5643cda5bbea4c90..0871a6832609e490ec614e66c7773ff273db6e01 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 cda28a9b047d6b19404bb5c34d3e848701ada8ef..c03dfcb18a83cc130545abad2454be68b6318035 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 3895fe2b4a2277a4c12599c176749f95972c0401..07a2f53f0b9c3c5befe1e3e6b0549d4d951874ec 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 980c4d473032406ec297a8d6168cdf160cfbfe6b..955a8635bc83d662deae4414812f184f4a462de3 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 Binary files a/src/main/webapp/static/images/olat/powered_by_uzh.png and /dev/null differ diff --git a/src/main/webapp/static/js/egg.js b/src/main/webapp/static/js/egg.js index 736b7ea5b4c0852ae89b5152caec8bd875b8e3f2..c2ed16dd79b4410ff54da05ea58bf7fa0d4b2238 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;