diff --git a/NOTICE.TXT b/NOTICE.TXT
index 5d2000a3ecef8c0af558db8b214036f6bb7778e1..4c53ed55116832377bddcf0064dce9ff19954a2c 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -179,12 +179,6 @@ YAML layout framework (Creative Commons Attribution 2.0 Lizenz,
see http://creativecommons.org/licenses/by/2.0/de) [http://www.yaml.de]
Please read the licensing terms of YAML if you plan to use OLAT in a commercial setup.
------------------------------------------------------------------------
-The OpenOLAT comic portlet uses comic strips produces by Alex Macartney
-Please not that these comics are not public domain and must not be used for any
-other purpose than beeing displayed in the OpenOLAT home portal
-[http://www.macartney.ch]
-
-----------------------------------------------------------------------
EXTJS javascript framework [http://www.sencha.com]
diff --git a/src/main/java/org/olat/portal/macartney/MacartneyPortlet.java b/src/main/java/org/olat/portal/macartney/MacartneyPortlet.java
deleted file mode 100644
index 9cf2a0d947b3c78843bd88a0c5bfe462f3b61fe8..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/MacartneyPortlet.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.portal.macartney;
-
-import java.util.Map;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.generic.portal.AbstractPortlet;
-import org.olat.core.gui.control.generic.portal.Portlet;
-import org.olat.core.gui.translator.PackageTranslator;
-import org.olat.core.util.Util;
-
-/**
- * Description:<br>
- * Displays the the macartney of the day comic strip
- * <P>
- * Initial Date: 24.08.2005 <br>
- * @author gnaegi
- */
-public class MacartneyPortlet extends AbstractPortlet {
- private Controller runCtr;
-
- /**
- * @see org.olat.gui.control.generic.portal.AbstractPortlet#createInstance(org.olat.core.gui.control.WindowControl, org.olat.core.gui.UserRequest, java.util.Map)
- */
- public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map configuration) {
- Portlet p = new MacartneyPortlet();
- p.setName(this.getName());
- p.setConfiguration(configuration);
- p.setTranslator(new PackageTranslator(Util.getPackageName(MacartneyPortlet.class), ureq.getLocale()));
- return p;
- }
-
- /**
- * @see org.olat.gui.control.generic.portal.Portlet#getTitle()
- */
- public String getTitle() {
- return getTranslator().translate("macartney.title");
- }
-
- /**
- * @see org.olat.gui.control.generic.portal.Portlet#getDescription()
- */
- public String getDescription() {
- return getTranslator().translate("macartney.description");
- }
-
- /**
- * @see org.olat.gui.control.generic.portal.Portlet#getInitialRunComponent(org.olat.core.gui.control.WindowControl, org.olat.core.gui.UserRequest)
- */
- public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
- if(this.runCtr != null) runCtr.dispose();
- this.runCtr = new MacartneyPortletRunController(ureq, wControl, getConfiguration());
- return this.runCtr.getInitialComponent();
- }
-
- /**
- * @see org.olat.core.gui.control.Disposable#dispose(boolean)
- */
- public void dispose() {
- disposeRunComponent();
- }
-
- /**
- * @see org.olat.gui.control.generic.portal.Portlet#getCssClass()
- */
- public String getCssClass() {
- return "o_portlet_macartney";
- }
-
- /**
- * @see org.olat.gui.control.generic.portal.Portlet#disposeRunComponent(boolean)
- */
- public void disposeRunComponent() {
- if (this.runCtr != null) {
- this.runCtr.dispose();
- this.runCtr = null;
- }
- }
-
-}
diff --git a/src/main/java/org/olat/portal/macartney/MacartneyPortletRunController.java b/src/main/java/org/olat/portal/macartney/MacartneyPortletRunController.java
deleted file mode 100644
index eb9775919fcd74465ecaf6d7da10349466116cee..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/MacartneyPortletRunController.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.portal.macartney;
-
-import java.text.DecimalFormat;
-import java.util.Map;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.control.DefaultController;
-import org.olat.core.gui.control.Event;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.translator.PackageTranslator;
-import org.olat.core.gui.translator.Translator;
-import org.olat.core.helpers.Settings;
-import org.olat.core.util.Util;
-import org.olat.core.util.coordinate.CoordinatorManager;
-import org.olat.core.util.coordinate.SyncerExecutor;
-import org.olat.core.util.resource.OresHelper;
-import org.olat.properties.Property;
-import org.olat.properties.PropertyManager;
-
-/**
- * Description:<br>
- * Run view controller of macartney portlet
- * <P>
- * Initial Date: 11.07.2005 <br>
- *
- * @author gnaegi
- */
-public class MacartneyPortletRunController extends DefaultController {
-
- private static final String VELOCITY_ROOT = Util.getPackageVelocityRoot(MacartneyPortlet.class);
- private Translator trans;
- private VelocityContainer macartneyVC;
-
- private static final String PROPERTY_NAME = "comicStart";
- private static final String PROPERTY_CATEGORY = "macartneyPortal";
-
- private static final int maxEpisodes = 468;
- private static final long updateInterval = 86400000; // one day in milliseconds
-
- private static long comicStartDate = 0;
-
- /**
- * Constructor
- *
- * @param ureq
- * @param imageBaseUri
- */
- //o_clusterOK by:se synchronized on MacartneyPortlet class as olatresourceable
- protected MacartneyPortletRunController(UserRequest ureq, WindowControl wControl, Map configuration) {
- super(wControl);
- this.trans = new PackageTranslator(Util.getPackageName(MacartneyPortlet.class), ureq.getLocale());
- this.macartneyVC = new VelocityContainer("macartneyVC", VELOCITY_ROOT + "/macartneyPortlet.html", trans, this);
-
- if (comicStartDate == 0) {
- CoordinatorManager.getInstance().getCoordinator().getSyncer().doInSync(
- OresHelper.createOLATResourceableType(MacartneyPortletRunController.class.getSimpleName()),
- new SyncerExecutor() {
-
- @SuppressWarnings("synthetic-access")
- public void execute() {
- if (comicStartDate!=0) {
- // then we shouldn't have gotten here in the first place, but we were
- // racing with another userrequest in the same VM!
- // let's quit quickly ;)
- return;
- }
- // load comic start date only once
- PropertyManager pm = PropertyManager.getInstance();
- Property p = pm.findProperty(null, null, null, PROPERTY_CATEGORY, PROPERTY_NAME);
- if (p == null) {
- // wow first time ever, save current date
- p = pm.createPropertyInstance(null, null, null, PROPERTY_CATEGORY, PROPERTY_NAME, null, null, null, null);
- pm.saveProperty(p);
- }
- comicStartDate = p.getCreationDate().getTime();
- }
-
- });
- }
-
- // time between comic start and now
- long timeDelta = (System.currentTimeMillis() - comicStartDate);
- // number of increments since comic start
- long incrementNumber = (timeDelta / updateInterval);
- // module with max episodes to start over again when finished
- // + 1 since comic starts at position 1 and not 0
- long imageNumber = (incrementNumber % maxEpisodes) + 1;
-
- // calculate current episode url and push to velocity
- DecimalFormat df = new DecimalFormat("0000");
- String currentEpisodeImage = "loge_" + df.format(imageNumber) + ".jpg";
- final String configuredImageBaseUri = (String) configuration.get("imageBaseUri");
- if (configuredImageBaseUri.startsWith("http://") || configuredImageBaseUri.startsWith("https://")) {
- // feature: if the configured imageBaseUri contains http: or https: already, don't do
- // magic "trying-to-detect-the-correct-protocol-via-olat.properties" but use it right away
- this.macartneyVC.contextPut("imageBaseUri", configuredImageBaseUri);
- } else {
- // otherwise do the old magic
- this.macartneyVC.contextPut("imageBaseUri", Settings.getURIScheme() + configuredImageBaseUri);
- }
- this.macartneyVC.contextPut("currentEpisodeImage", currentEpisodeImage);
-
- setInitialComponent(this.macartneyVC);
- }
-
- public void event(UserRequest ureq, Component source, Event event) {
- // no events to catch
- }
-
- protected void doDispose() {
- // nothing to dispose
- }
-
-}
diff --git a/src/main/java/org/olat/portal/macartney/_content/macartneyPortlet.html b/src/main/java/org/olat/portal/macartney/_content/macartneyPortlet.html
deleted file mode 100644
index c53733ed530dc7159e17b8be18d881414a039d45..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_content/macartneyPortlet.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- Copyright by Alex Macartney, www.macartney.ch - Thanks Alex for supporting OLAT with you comic -->
-<a href="http://www.macartney.ch" target="_blank">
- <img src="${imageBaseUri}klein/${currentEpisodeImage}" id="o_macartney" border="0" width="100%" alt="Macartney Comic" />
-</a>
-<br />
-<div id="o_macartney_open" class="b_float_right"></div>
-<i><a class="b_link_extern" href="http://www.macartney.ch" target="_blank">$r.translate("macartney.copyright")</a></i>
-
-<script type="text/javascript">
-/* <![CDATA[ */
-Ext.onReady(function(){
- ## Add large image version at the top of the page. Uses the Prototype library
- new Insertion.Top($('b_page_margins'), "<div id='o_macartney_large' style='display: none;'><img src='${imageBaseUri}gross/${currentEpisodeImage}' border='0' alt='Macartney Comic'/><div id='o_macartney_close'></div></div>");
-
- ## Add event handlers to slide large image in and out. Uses the Extjs library
- ## show image when user has mouse over loop tool
- Ext.get('o_macartney_open').hover(
- function(){ Ext.get('o_macartney_large').fadeIn(); },
- function(){ Ext.get('o_macartney_large').fadeOut(); }
- );
- ## close fallback:
- ## close when user hovers over close icon
- Ext.get('o_macartney_close').on('mouseover', function(e){
- Ext.get('o_macartney_large').slideOut();
- });
- ## close when user clicks on large image
- Ext.get('o_macartney_large').on('click', function(e){
- Ext.get('o_macartney_large').slideOut();
- });
-});
-/* ]]> */
-</script>
\ No newline at end of file
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_ar.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_ar.properties
deleted file mode 100644
index 812a63dfaeafb2c12679a96f6bd2531776da121a..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_ar.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Feb 19 23:40:50 CET 2010
-macartney.copyright=macartney.ch \u062D\u0642\u0648\u0642 \u0627\u0644\u062A\u0623\u0644\u064A\u0641 \u0648\u0627\u0644\u0646\u0634\u0631 \u0645\u062D\u0641\u0648\u0638\u0629 \u0644\u0640
-macartney.description=\u0643\u0644 \u064A\u0648\u0645 \u0647\u0632\u0644\u064A\u0629 \u062C\u062F\u064A\u062F\u0629 \u0644\u0645\u0627\u0643\u0627\u0631\u062A\u0646\u0649
-macartney.title="Die Loge" \:\u0647\u0632\u0644\u064A\u0629 \u0645\u0643\u0627\u0631\u062A\u0646\u0649
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_bg.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_bg.properties
deleted file mode 100644
index f764db69787791bf68dbc1dfd5884b33106d6e9b..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_bg.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun May 24 21:10:48 CEST 2009
-macartney.copyright=\u0410\u0432\u0442\u043E\u0440\u0441\u043A\u043E \u043F\u0440\u0430\u0432\u043E\: macartney.ch
-macartney.description=\u0414\u043D\u0435\u0432\u043D\u0438\u044F\u0442 \u043A\u043E\u043C\u0438\u043A\u0441 \u043E\u0442 Macartney
-macartney.title=Macartney \u043A\u043E\u043C\u0438\u043A\u0441\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_cs.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_cs.properties
deleted file mode 100644
index 085e340ebfea926048dec919ba2d9b9b861d5fc8..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_cs.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:14 CET 2009
-macartney.copyright=Copyright by macartney.ch
-macartney.description=Denn\u011B comics od Macartneyho
-macartney.title=Macartney Comic\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_da.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_da.properties
deleted file mode 100644
index b3839ceb3d5d42e47be1325b72341fe8ab5497ca..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_da.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:09 CET 2009
-macartney.copyright=Copyright macartney.ch
-macartney.description=En daglig Macartney tegneseriestribe
-macartney.title=Macartney Comic\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_de.properties
deleted file mode 100644
index e70b2097f6f42a18e2cbea6d271bdb65ce06909a..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_de.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:04 CET 2009
-macartney.copyright=Eigentum von macartney.ch
-macartney.description=T\u00E4glich ein neuer Macartney Comic
-macartney.title=Macartney Comic\: Die Loge
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_el.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_el.properties
deleted file mode 100644
index 0553065d372d426129b9148b66093a1ab236c828..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_el.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:16 CET 2009
-macartney.copyright=Copyright by macartney.ch
-macartney.description=\u039A\u03B1\u03B8\u03B7\u03BC\u03B5\u03C1\u03B9\u03BD\u03CC \u03C3\u03C4\u03B9\u03B3\u03BC\u03C5\u03CC\u03C4\u03C5\u03C0\u03BF \u03BA\u03B1\u03C1\u03C4\u03BF\u03CD\u03BD Macartney
-macartney.title=\u039A\u03B1\u03C1\u03C4\u03BF\u03CD\u03BD Macartney \: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_en.properties
deleted file mode 100644
index fb9e3383f65f465beafd4806ace41b67bbc6a6ab..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_en.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:18 CET 2009
-macartney.copyright=Copyright by macartney.ch
-macartney.description=A daily Macartney comic strip
-macartney.title=Macartney Comic\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_es.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_es.properties
deleted file mode 100644
index a047aade66f1833e83cb379f70df22eab0a6c7fc..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_es.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:21 CET 2009
-macartney.copyright=Copyright by macartney.ch
-macartney.description=Cada d\u00EDa un nuevo comic de Macartney
-macartney.title=Macartney Comic\: Die Loge
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_fa.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_fa.properties
deleted file mode 100644
index ec4473aa96b16b75115eb312d1a4af704a90dc42..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_fa.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:13 CET 2009
-macartney.copyright=macartney.ch \u062D\u0642 \u0686\u0627\u067E
-macartney.description=\u06CC\u06A9 \u06A9\u0627\u0631\u062A\u0648\u0646 \u06A9\u0645\u062F\u06CC \u0631\u0648\u0632\u0627\u0646\u0647 \u0627\u0632 \u0645\u06A9\u0627\u0631\u062A\u0646\u06CC
-macartney.title=Macartney Comic\: "Die Loge"/\u06A9\u0645\u062F\u06CC \u0645\u06A9\u0627\u0631\u062A\u0646\u06CC
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_fr.properties
deleted file mode 100644
index 6b54ef21177edabc2f1a303a2cbdfcf715e6b4b6..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_fr.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:08 CET 2009
-macartney.copyright=Propri\u00E9t\u00E9 de macartney.ch
-macartney.description=Tous les jours une nouvelle B.D. de Macartney
-macartney.title=B.D. Macartney\: Die Loge
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_it.properties
deleted file mode 100644
index 7ea3fbea022c728e249e83dd35c3b7c384a12b0f..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_it.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:10 CET 2009
-macartney.copyright=Propriet\u00E0 di macartney.ch
-macartney.description=Tutti i giorni una nuova vignetta Macartney
-macartney.title=Vignetta Macartney
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_jp.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_jp.properties
deleted file mode 100644
index 318b1ff2f6c67b76efc8a376d3d95a857ef4518f..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_jp.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Apr 16 22:42:13 CEST 2009
-macartney.copyright=macartney.ch\u306E\u8457\u4F5C\u6A29
-macartney.description=\u30C7\u30A4\u30EA\u30FCMacartney\u30B3\u30DF\u30C3\u30AF\u30B9\u30C8\u30EA\u30C3\u30D7
-macartney.title=Macartney\u30B3\u30DF\u30C3\u30AF\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_lt.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_lt.properties
deleted file mode 100644
index c717291f5f972534ea89a33bb1b0a77f60cb6048..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_lt.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:02 CET 2009
-macartney.copyright=Autoriaus teis\u0117s priklauso macartney.ch
-macartney.description=Kasdieninei Macartney komiksai
-macartney.title=Macartney Comic\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_nl_NL.properties
deleted file mode 100644
index 5f66ee22a60a0426acf1513c7ca0b5d6d6b47e84..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_nl_NL.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 31 14:05:55 CEST 2010
-macartney.copyright=Copyright by macartney.ch
-macartney.description=Dagelijks een nieuw Macartney stripverhaal
-macartney.title=Macartney Stripverhaal\: "De Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pl.properties
deleted file mode 100644
index 0e8d9f7c1d557cbc15a10470da72e3206903f9d9..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pl.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:17 CET 2009
-macartney.copyright=Prawa autorskie macartney.ch
-macartney.description=Komiks Macartney'a
-macartney.title=Komiks Macartney'a\: Die Loge
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pt_BR.properties
deleted file mode 100644
index fef9f5df587d4af0eb92b7c61c595650ac6d7d03..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pt_BR.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:00 CET 2009
-macartney.copyright=Direitos Reservados por macartney.ch
-macartney.description=Tira di\u00E1ria dos quadrinhos Macartney
-macartney.title=Quadrinhos Macartney\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pt_PT.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pt_PT.properties
deleted file mode 100644
index 97e568b41747557e6d89ac88fa6dd424d212bc50..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_pt_PT.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:05 CET 2009
-macartney.copyright=Direitos Reservados por macartney.ch
-macartney.description=Tira di\u00E1ria dos quadrinhos Macartney
-macartney.title=Quadrinhos Macartney\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_ru.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_ru.properties
deleted file mode 100644
index b869989650887fa9ca9c8dfbbb5ffa6af816fc30..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_ru.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:19 CET 2009
-macartney.copyright=\u0421\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0441\u0442\u044C macartney.ch
-macartney.description=\u0415\u0436\u0435\u0434\u043D\u0435\u0432\u043D\u043E \u043D\u043E\u0432\u044B\u0439 Macartney \u043A\u043E\u043C\u0438\u043A\u0441
-macartney.title=Macartney \u043A\u043E\u043C\u0438\u043A\u0441
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_sq.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_sq.properties
deleted file mode 100644
index 6717e58645f4b652f440311d6472e1539d4e241d..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_sq.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:12 CET 2009
-macartney.copyright=E drejta e kopjes macartney.ch
-macartney.description=Nj\u00EB strip komik ditor nga Macartney
-macartney.title=Macartney Komik\u00EBt\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_zh_CN.properties
deleted file mode 100644
index 6de36563a1dcfb1eaaa50bc66c600193b15b82a7..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_zh_CN.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:03 CET 2009
-macartney.copyright=\u7248\u6743\u6240\u5C5Emacartney.ch
-macartney.description=Macartney\u6BCF\u65E5\u4E3B\u6253\u6F2B\u753B
-macartney.title=Macartney\u6F2B\u753B\: "Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_zh_TW.properties b/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_zh_TW.properties
deleted file mode 100644
index 33159fedd029a3c2ffeadd896b58e0a5a766e4c0..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/LocalStrings_zh_TW.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 02 09:54:06 CET 2009
-macartney.copyright=macartney.ch \u7248\u6B0A\u6240\u6709
-macartney.description=Macartney \u6BCF\u65E5\u9023\u74B0\u6F2B\u756B
-macartney.title=Macartney \u6F2B\u756B\uFF1A"Die Loge"
diff --git a/src/main/java/org/olat/portal/macartney/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/portal/macartney/_i18n/i18nBundleMetadata.properties
deleted file mode 100644
index 49a9f95c33e99e5cfa403e601e932ac39f83cde8..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/portal/macartney/_i18n/i18nBundleMetadata.properties
+++ /dev/null
@@ -1 +0,0 @@
-bundle.priority = 450
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 6af589577da479be3951fd1876d3dff86849b93d..4163248b14a224538b75e27a4e6c9590b1329671 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -228,7 +228,7 @@ instance.id=myopenolat
# customize the OLAT application to your liking (see the example
# theme for futher information.
# you can also configure a theme via the admin GUI which takes precedence
-layout.theme = openolat
+layout.theme=openolat
layout.coursetemplates.blacklist=
# test user generation
@@ -243,8 +243,6 @@ course.cache.elements=500
# required only for performance and functional testing
allow.loadtest.mode=false
# Portlets enabled by default
-portlet.macartney.enabled=true
-portlet.macartney.baseUri=//www.olat.org/macartney/loge/
portlet.didYouKnow.enabled=true
portlet.groups.enabled=true
portlet.bookmarks.enabled=true
diff --git a/src/main/resources/serviceconfig/org/olat/_spring/portalContext.xml b/src/main/resources/serviceconfig/org/olat/_spring/portalContext.xml
index 455198bb4ce81b1bfc70e904c0ffadf84401f48f..9e0435fcbdb3e016b9d70e450bf89cbb2bcbd4b8 100644
--- a/src/main/resources/serviceconfig/org/olat/_spring/portalContext.xml
+++ b/src/main/resources/serviceconfig/org/olat/_spring/portalContext.xml
@@ -42,16 +42,6 @@
</map>
</property>
</bean>
- <bean id="Macartney" class="org.olat.portal.macartney.MacartneyPortlet" scope="prototype">
- <property name="name" value="Macartney" />
- <property name="enabled" value="${portlet.macartney.enabled}" />
- <property name="configuration">
- <map>
- <!-- use protocol relativ URL to support http and https -->
- <entry key="imageBaseUri" value="${portlet.macartney.baseUri}" />
- </map>
- </property>
- </bean>
<bean id="DidYouKnow" class="org.olat.core.commons.portlets.didYouKnow.DidYouKnowPortlet" scope="prototype">
<property name="name" value="DidYouKnow" />
<property name="enabled" value="${portlet.didYouKnow.enabled}" />
@@ -151,8 +141,7 @@
<value>Information</value>
<value>Zsuz</value>
<value>Quickstart</value>
- <value>DidYouKnow</value>
- <value>Macartney</value>
+ <value>DidYouKnow</value>
</list>
<list>
<value>RepositoryPortletStudent</value>
@@ -182,7 +171,6 @@
<list>
<value>Information</value>
<value>DidYouKnow</value>
- <value>Macartney</value>
</list>
</list>
</property>
diff --git a/src/main/webapp/static/themes/openolat/all/modules/_portlets_boxes.scss b/src/main/webapp/static/themes/openolat/all/modules/_portlets_boxes.scss
index 3f2b701a7f57a58d35514fcdb24ddf3c6ee73cdd..c0a9066a8137a84a14c2eedb769cd94be415b127 100644
--- a/src/main/webapp/static/themes/openolat/all/modules/_portlets_boxes.scss
+++ b/src/main/webapp/static/themes/openolat/all/modules/_portlets_boxes.scss
@@ -30,25 +30,6 @@ div.o_home_rsslink {
display: inline;
margin: 10px 0;
}
-#o_macartney_open {
- width: 20px;
- bottom: 0;
- left: 0;
- height: 16px;
- background: white url(../openolat/images/magnifier-zoom.png) no-repeat 4px 0;
-}
-#o_macartney_large {
- position: fixed;
- top: 10%;
- left: 10%;
- width: 80%;
- z-index: 10;
- border: 1px solid black;
- background: white;
- padding: 5px;
-}
-#o_macartney_large img { width: 100%; }
-#o_macartney_close {position: absolute; width: 16px; top: 0; right: 0; height: 16px; border-left: 1px solid #000; border-bottom: 1px solid #000; background: #fff url(../openolat/images/close.png)}
/** ----------------- PORTLETS & BOXES ----------------- **/
@@ -146,7 +127,6 @@ div.o_portlet_calendar.o_day_30 div.b_portlet_header strong:before { content:"3
div.o_portlet_calendar.o_day_31 div.b_portlet_header strong:before { content:"31"; font-size:smaller;padding-right: $pdgr_calendar; }
div.o_portlet_infomsg div.b_portlet_header { background-image: url(../openolat/images/comment.png); }
-div.o_portlet_macartney div.b_portlet_header { background-image: url(../openolat/images/macartney.png); }
div.o_portlet_quickstart div.b_portlet_header { background-image: url(../openolat/images/mouse.png); }
div.o_portlet_bookmark div.b_portlet_header { background-image: url(../openolat/images/book-open-bookmark.png); }
div.o_portlet_groups div.b_portlet_header { background-image: url(../openolat/images/users.png); }
diff --git a/src/main/webapp/static/themes/openolat/images/macartney.png b/src/main/webapp/static/themes/openolat/images/macartney.png
deleted file mode 100644
index 5301aa268c461bf2faa15ab3859df7379e033bb6..0000000000000000000000000000000000000000
Binary files a/src/main/webapp/static/themes/openolat/images/macartney.png and /dev/null differ
diff --git a/src/main/webapp/static/themes/openolat/layout.css b/src/main/webapp/static/themes/openolat/layout.css
index 33f7815e4a12f7e9127b2ebfd6066c4ddb2636a0..3c7387f2ddcbe753b0c4fe9c04c93d8577c51a75 100644
--- a/src/main/webapp/static/themes/openolat/layout.css
+++ b/src/main/webapp/static/themes/openolat/layout.css
@@ -6439,35 +6439,6 @@ div.o_home_rsslink {
display: inline;
margin: 10px 0; }
-#o_macartney_open {
- width: 20px;
- bottom: 0;
- left: 0;
- height: 16px;
- background: white url(../openolat/images/magnifier-zoom.png) no-repeat 4px 0; }
-
-#o_macartney_large {
- position: fixed;
- top: 10%;
- left: 10%;
- width: 80%;
- z-index: 10;
- border: 1px solid black;
- background: white;
- padding: 5px; }
-
-#o_macartney_large img {
- width: 100%; }
-
-#o_macartney_close {
- position: absolute;
- width: 16px;
- top: 0;
- right: 0;
- height: 16px;
- border-left: 1px solid #000;
- border-bottom: 1px solid #000;
- background: white url(../openolat/images/close.png); }
/** ----------------- PORTLETS & BOXES ----------------- **/
.b_portlet {
@@ -6681,9 +6652,6 @@ div.o_portlet_calendar.o_day_31 div.b_portlet_header strong:before {
div.o_portlet_infomsg div.b_portlet_header {
background-image: url(../openolat/images/comment.png); }
-div.o_portlet_macartney div.b_portlet_header {
- background-image: url(../openolat/images/macartney.png); }
-
div.o_portlet_quickstart div.b_portlet_header {
background-image: url(../openolat/images/mouse.png); }
diff --git a/src/main/webapp/static/themes/openolatexample/layout.css b/src/main/webapp/static/themes/openolatexample/layout.css
index 51ebd5f3a107d8c7afb1636aedcd632e4dd76629..e7043aac215a0d10fdadb3e26c5dbb888bf1d185 100644
--- a/src/main/webapp/static/themes/openolatexample/layout.css
+++ b/src/main/webapp/static/themes/openolatexample/layout.css
@@ -6432,36 +6432,6 @@ div.o_home_rsslink {
display: inline;
margin: 10px 0; }
-#o_macartney_open {
- width: 20px;
- bottom: 0;
- left: 0;
- height: 16px;
- background: white url(../openolat/images/magnifier-zoom.png) no-repeat 4px 0; }
-
-#o_macartney_large {
- position: fixed;
- top: 10%;
- left: 10%;
- width: 80%;
- z-index: 10;
- border: 1px solid black;
- background: white;
- padding: 5px; }
-
-#o_macartney_large img {
- width: 100%; }
-
-#o_macartney_close {
- position: absolute;
- width: 16px;
- top: 0;
- right: 0;
- height: 16px;
- border-left: 1px solid #000;
- border-bottom: 1px solid #000;
- background: white url(../openolat/images/close.png); }
-
/** ----------------- PORTLETS & BOXES ----------------- **/
.b_portlet {
position: relative;
@@ -6674,9 +6644,6 @@ div.o_portlet_calendar.o_day_31 div.b_portlet_header strong:before {
div.o_portlet_infomsg div.b_portlet_header {
background-image: url(../openolat/images/comment.png); }
-div.o_portlet_macartney div.b_portlet_header {
- background-image: url(../openolat/images/macartney.png); }
-
div.o_portlet_quickstart div.b_portlet_header {
background-image: url(../openolat/images/mouse.png); }
diff --git a/src/test/java/org/olat/test/tutorial/singlenode/junit/MacartneyBreakpointTest.java b/src/test/java/org/olat/test/tutorial/singlenode/junit/MacartneyBreakpointTest.java
deleted file mode 100644
index ca2ebebf46d5ec6aa07a2d658d61b2d3015f1fec..0000000000000000000000000000000000000000
--- a/src/test/java/org/olat/test/tutorial/singlenode/junit/MacartneyBreakpointTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-*/
-package org.olat.test.tutorial.singlenode.junit;
-
-import org.olat.test.util.selenium.BaseSeleneseTestCase;
-import org.olat.test.util.setup.SetupType;
-import org.olat.test.util.setup.context.Context;
-import org.olat.testutils.codepoints.client.CodepointClient;
-import org.olat.testutils.codepoints.client.CodepointRef;
-import org.olat.testutils.codepoints.client.TemporaryPausedThread;
-
-public class MacartneyBreakpointTest extends BaseSeleneseTestCase {
-
- protected com.thoughtworks.selenium.Selenium selenium1;
- protected com.thoughtworks.selenium.Selenium selenium2;
- private CodepointClient codepointClient_;
-
- public void testMacartneyBreakpoint() throws Exception {
- //if instance restart (SetupType.CLEAN_AND_RESTARTED_SINGLE_VM) is not implemented this test is not relevat!
- if(true) {
- return;
- }
-
-
- Context context = Context.setupContext(getFullName(), SetupType.CLEAN_AND_RESTARTED_SINGLE_VM);
-// selenium1 = context.createSeleniumAndLogin(context.getStandardAdminOlatLoginInfos());
-// selenium2 = context.createSeleniumAndLogin(context.getStandardStudentOlatLoginInfos());
-
- selenium1 = context.createSelenium();
- selenium2 = context.createSelenium();
-
- // setup and get ready
- selenium1.openWindow(context.getStandardAdminOlatLoginInfos().getFullOlatServerUrl(), "olat");
- selenium2.openWindow(context.getStandardStudentOlatLoginInfos().getFullOlatServerUrl(), "olat");
- System.out.println("olatLogin: waiting 5sec.");
- Thread.sleep(5000);
- System.out.println("olatLogin: selecting the olat window");
- selenium1.selectWindow("olat");
- selenium2.selectWindow("olat");
- for (int second = 0;; second++) {
- if (second >= 60) fail("timeout");
- System.out.println("title now: "+selenium1.getTitle());
- if (selenium1.getTitle().indexOf("Error")!=-1) {
- System.out.println(selenium1.getBodyText());
- fail("Error encountered in selenium1");
- }
- try { if ("OLAT - Online Learning And Training".equals(selenium1.getTitle())) break; } catch (Exception e) {}
- Thread.sleep(1000);
- }
- for (int second = 0;; second++) {
- if (second >= 60) fail("timeout");
- System.out.println("title now: "+selenium2.getTitle());
- if (selenium2.getTitle().indexOf("Error")!=-1) {
- System.out.println(selenium2.getBodyText());
- fail("Error encountered in selenium2");
- }
- try { if ("OLAT - Online Learning And Training".equals(selenium2.getTitle())) break; } catch (Exception e) {}
- Thread.sleep(1000);
- }
- selenium1.type("ui=commons::flexiForm_labeledTextInput(formElementLabel=OLAT user name)", context.getStandardAdminOlatLoginInfos().getUsername());
- selenium1.type("ui=commons::flexiForm_labeledPasswordInput(formElementLabel=OLAT password)", context.getStandardAdminOlatLoginInfos().getPassword());
-
- selenium2.type("ui=commons::flexiForm_labeledTextInput(formElementLabel=OLAT user name)", context.getStandardStudentOlatLoginInfos().getUsername());
- selenium2.type("ui=commons::flexiForm_labeledPasswordInput(formElementLabel=OLAT password)", context.getStandardStudentOlatLoginInfos().getPassword());
-
-
- codepointClient_ = context.createCodepointClient(1);
- codepointClient_.setAllHitCounts(0);
- CodepointRef beforeSyncCp = codepointClient_.getCodepoint("org.olat.commons.coordinate.cluster.ClusterSyncer.doInSync-before-sync.org.olat.portal.macartney.MacartneyPortletRunController.<init>");
- beforeSyncCp.setHitCount(0);
- beforeSyncCp.enableBreakpoint();
-
- CodepointRef inSyncCp = codepointClient_.getCodepoint("org.olat.commons.coordinate.cluster.ClusterSyncer.doInSync-in-sync.org.olat.portal.macartney.MacartneyPortletRunController.<init>");
- inSyncCp.setHitCount(0);
-
- //MacartneyPortletRunController
-
- selenium1.click("ui=dmz::login()");
- selenium2.click("ui=dmz::login()");
-
- Thread.sleep(10000);
- inSyncCp.assertHitCount(0);
- beforeSyncCp.assertHitCount(2);
-
- TemporaryPausedThread[] threads = beforeSyncCp.getPausedThreads();
- assertNotNull(threads);
- assertEquals(2, threads.length);
-
- // continue the first
- threads[0].continueThread();
- Thread.sleep(500);
-
- threads = beforeSyncCp.getPausedThreads();
- assertNotNull(threads);
- assertEquals(1, threads.length);
- inSyncCp.assertHitCount(1);
-
- //selenium1.waitForPageToLoad("30000");
- //assertEquals("OLAT-Home", selenium.getTitle());
- }
-
-}