OO-1666 move about page from chelp to dedicated controller, update about info and add more stuff

src/main/java/org/olat/core/gui/render/velocity/VelocityRenderDecorator.java

@@ -773,24 +773,6 @@ public class VelocityRenderDecorator implements Closeable {
 		return Settings.isDebuging();
 	}
 	
-	/**
-	 * To inject licenses (the NOTICE.TXT) in the help
-	 * @return
-	 */
-	public String getLicences() {
-		String licenses = "Not found";
-		InputStream licensesStream = LoginAuthprovidersController.class.getResourceAsStream("../../../NOTICE.TXT");
-		if(licensesStream != null) {
-			try {
-				licenses = IOUtils.toString(licensesStream);
-			} catch (IOException e) {
-				log.error("", e);
-			} finally {
-				IOUtils.closeQuietly(licensesStream);
-			}
-		}
-		return licenses;
-	}
 	
 	public String getVersion() {
 		return Settings.getVersion();

src/main/java/org/olat/gui/control/OlatDmzTopNavController.java

@@ -45,12 +45,13 @@ import org.olat.core.gui.control.controller.BasicController;
 import org.olat.core.gui.control.creator.ControllerCreator;
 import org.olat.core.gui.control.generic.popup.PopupBrowserWindow;
 import org.olat.core.id.OLATResourceable;
+import org.olat.login.AboutController;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class OlatDmzTopNavController extends BasicController implements LockableController {
 	
 	private static final Boolean contextHelpEnabled = Boolean.valueOf(ContextHelpModule.isContextHelpEnabled());
-	private Link impressumLink;
+	private Link impressumLink, aboutLink;
 	private LanguageChooserController languageChooserC;
 
 	@Autowired
@@ -78,6 +79,9 @@ public class OlatDmzTopNavController extends BasicController implements Lockable
 			Component helpLink = provider.getHelpPageLink(ureq, translate("help.manual"), translate("help.manual"), "o_icon o_icon-wf o_icon_manual", null, "Login page");
 			vc.put("topnav.help", helpLink);
 		}
+		// about link
+		aboutLink = AboutController.aboutLinkFactory(getLocale(), this, true, false);
+		vc.put("topnav.about", aboutLink);
 
 		//choosing language 
 		languageChooserC = new LanguageChooserController(getWindowControl(), ureq, "_top_nav_dmz_lang_chooser");
@@ -109,6 +113,10 @@ public class OlatDmzTopNavController extends BasicController implements Lockable
 			};
 			PopupBrowserWindow popupBrowserWindow = Windows.getWindows(ureq).getWindowManager().createNewUnauthenticatedPopupWindowFor(ureq, impressumControllerCreator);
 			popupBrowserWindow.open(ureq);
+		} else if (source == aboutLink) {
+			AboutController aboutCtr = new AboutController(ureq, getWindowControl());
+			listenTo(aboutCtr);
+			aboutCtr.activateAsModalDialog();
 		}
 	}
 

src/main/java/org/olat/gui/control/OlatFooterController.java

@@ -51,7 +51,7 @@ import org.olat.core.id.Identity;
 import org.olat.core.id.OLATResourceable;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
-import org.olat.core.util.WebappHelper;
+import org.olat.login.AboutController;
 import org.olat.social.SocialModule;
 import org.olat.social.shareLink.ShareLinkController;
 import org.olat.user.UserManager;
@@ -71,7 +71,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class OlatFooterController extends BasicController implements LockableController { 
 	
-	private final Link impressumLink;
+	private final Link impressumLink, aboutLink;
 	private final VelocityContainer olatFootervc;
 	private ShareLinkController shareLinkCtr;
 	
@@ -123,15 +123,13 @@ public class OlatFooterController extends BasicController implements LockableCon
 			olatFootervc.contextPut("loggedIn", Boolean.FALSE);
 		}
 
-		olatFootervc.contextPut("appName", Settings.getApplicationName());
-		olatFootervc.contextPut("appVersion", Settings.getVersion());
-		
-		olatFootervc.contextPut("buildIdentifier", Settings.getBuildIdentifier());
-		olatFootervc.contextPut("revisionNumber", WebappHelper.getRevisionNumber());
-		olatFootervc.contextPut("changeSet", WebappHelper.getChangeSet());
-		olatFootervc.contextPut("olatversion", Settings.getFullVersionInfo() +" "+ Settings.getNodeInfo());
 		olatFootervc.contextPut("footerInfos", new FooterInformations(layoutModule));
 
+		// about link
+		aboutLink = AboutController.aboutLinkFactory(getLocale(), this, false, true);
+		aboutLink.setCustomDisplayText(Settings.getApplicationName() + " " + Settings.getVersion());		
+		olatFootervc.put("aboutLink", aboutLink);
+		
 		putInitialPanel(olatFootervc);
 	}
 	
@@ -158,6 +156,10 @@ public class OlatFooterController extends BasicController implements LockableCon
 	public void event(UserRequest ureq, Component source, Event event) {
 		if(impressumLink == source) {
 			doOpenImpressum(ureq);
+		} else if (source == aboutLink) {
+			AboutController aboutCtr = new AboutController(ureq, getWindowControl());
+			listenTo(aboutCtr);
+			aboutCtr.activateAsModalDialog();
 		}
 	}
 	

src/main/java/org/olat/gui/control/_content/dmztopnav.html

@@ -3,12 +3,12 @@
 		#if($impressumInfos.top)
 		<li id="o_navbar_impress">$r.render("topnav.impressum")</li>
 		#end
-		#if ($isContextHelpEnabled)
 		<li id="o_navbar_my_menu" class="dropdown o_navbar_dmz_help_menu">
 			<a href="#" class="dropdown-toggle" data-toggle="dropdown" title="$r.translate("search")">
 				<i class="o_icon o_icon_help o_icon-lg"></i> $r.translate("topnav.help")
 			</a>
 			<ul class="dropdown-menu dropdown-menu-right">          
+			#if ($isContextHelpEnabled)
 				<li><a href="javascript:contextHelpWindow('$r.relLink("help/${r.getLanguageCode()}/org.olat.login/dmz.html")')" title="$r.translateInAttribute("topnav.help.alt")">
 					<i class="o_icon o_icon_help o_icon-fw"></i> <span>$r.translate("topnav.help")</span></a></li>
 					#if($r.available("topnav.help"))
@@ -18,17 +18,18 @@
 					#end
 				<li><a href="javascript:$r.contextHelpJSCommand("org.olat.login","browsercheck.html")" title="$r.translateWithPackage("org.olat.login","menu.check.alt")">
 					<i class="o_icon o_icon_browsercheck o_icon-fw"></i> <span>$r.translateWithPackage("org.olat.login","menu.check")</span></a></li>
-				<li><a href="javascript:$r.contextHelpJSCommand("org.olat.login","about.html")" title="$r.translateWithPackage("org.olat.login","menu.about.alt")">
-					<i class="o_icon o_icon_openolat o_icon-fw"></i> <span>$r.translateWithPackage("org.olat.login","menu.about")</span></a></li>
+			#else
+				#if($r.available("topnav.help"))
+				<li id="o_navbar_help">
+					$r.render("topnav.help")
+				</li>
+				#end		
+			#end		
+				<li id="o_navbar_about">
+					$r.render("topnav.about")
+				</li>
 			</ul>
 		</li>
-		#else
-			#if($r.available("topnav.help"))
-			<li id="o_navbar_help">
-				$r.render("topnav.help")
-			</li>
-			#end		
-		#end		
 		<li id="o_navbar_langchooser">$r.render("languageChooser")</li>
 	</ul>	
 </div>	
\ No newline at end of file

src/main/java/org/olat/gui/control/_content/olatFooter.html

@@ -27,5 +27,5 @@
 	</a>
 </div>
 <div id="o_footer_version" class="clearfix">
-	<a href="http://www.openolat.org" title="Homepage of the Open Source LMS OpenOLAT $appVersion (Build $revisionNumber:$changeSet)" target="_blank">$appName&nbsp;$appVersion</a>
+	$r.render("aboutLink")
 </div>	

src/main/java/org/olat/login/AboutController.java

+/**
+ * <a href=“http://www.openolat.org“>
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <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 the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <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>
+ * Initial code contributed and copyrighted by<br>
+ * 31.08.2015 by frentix GmbH, http://www.frentix.com
+ * <p>
+ **/
+
+package org.olat.login;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Locale;
+
+import org.apache.commons.io.IOUtils;
+import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.Component;
+import org.olat.core.gui.components.link.Link;
+import org.olat.core.gui.components.link.LinkFactory;
+import org.olat.core.gui.components.velocity.VelocityContainer;
+import org.olat.core.gui.control.Controller;
+import org.olat.core.gui.control.Event;
+import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BasicController;
+import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
+import org.olat.core.gui.translator.Translator;
+import org.olat.core.helpers.Settings;
+import org.olat.core.util.Util;
+import org.olat.core.util.WebappHelper;
+
+/**
+ * <h3>Description:</h3>
+ * <p>
+ * The about displays some info about the product. Can be used as popup window
+ * using the activate methods or as normal controller
+ * <p>
+ * Initial Date: 31.08.2015 <br>
+ * 
+ * @author Florian Gnaegi, frentix GmbH, http://www.frentix.com
+ */
+
+public class AboutController extends BasicController {
+	private CloseableModalController cmc;
+	private Link closeLink;
+
+	public AboutController(UserRequest ureq, WindowControl wControl) {
+		super(ureq, wControl);
+		VelocityContainer aboutVC = createVelocityContainer("about");
+		// add license text
+		String licenses = "Not found";
+		InputStream licensesStream = AboutController.class.getResourceAsStream("../../../NOTICE.TXT");
+		try {
+			// try from source if debug enabled
+			if(licensesStream == null && Settings.isDebuging()) {
+				File noticeFile = new File(WebappHelper.getSourcePath() + "/../../../NOTICE.TXT");
+				licensesStream = new FileInputStream(noticeFile);			
+			}
+			if(licensesStream != null) {
+				licenses = IOUtils.toString(licensesStream);
+			}
+		} catch (IOException e) {
+			logError("Error while reading NOTICE.TXT", e);
+		} finally {
+			IOUtils.closeQuietly(licensesStream);
+		}
+		aboutVC.contextPut("licenses", licenses);
+		// close link after about text
+		closeLink = LinkFactory.createButton("close", aboutVC, this);
+		closeLink.setPrimary(true);
+
+		putInitialPanel(aboutVC);
+	}
+
+	/**
+	 * Open a modal dialog which can be closed by user. 
+	 */
+	public void activateAsModalDialog() {
+		cmc = new CloseableModalController(getWindowControl(), "close", this.getInitialComponent());
+		listenTo(cmc);
+		cmc.activate();
+	}
+
+	/**
+	 * Manually close modal dialog. Normally you don't have to call this method.
+	 */
+	public void deactivateModalDialog() {
+		if (cmc != null) {
+			cmc.deactivate();
+			removeAsListenerAndDispose(cmc);
+			cmc = null;
+		}
+	}
+
+	@Override
+	protected void event(UserRequest ureq, Component source, Event event) {
+		if (source == closeLink) {
+			if (cmc != null) {
+				cmc.deactivate();
+				removeAsListenerAndDispose(cmc);
+				cmc = null;
+			}
+		}
+	}
+
+	@Override
+	protected void event(UserRequest ureq, Controller source, Event event) {
+		// nothing to do on cmc event, cleanup on dispose
+	}
+
+	@Override
+	protected void doDispose() {
+		// autodisposed
+	}
+	
+
+	/**
+	 * Factory method to create a link for the about menu. The reason for having
+	 * this here is so that we can simply keep the corresponding i18n keys in
+	 * one place
+	 * 
+	 * @param locale
+	 * @param listener
+	 * @param withIcon true: use oo icon on left side (for use in menu); false no icon
+	 * @param withBuildInfo true: add build info to hover title (if available); false no build info
+	 * @return
+	 */
+	public static final Link aboutLinkFactory(Locale locale, Controller listener, boolean withIcon, boolean withBuildInfo) {
+		Translator aboutTrans = Util.createPackageTranslator(AboutController.class, locale);
+		Link aboutLink = LinkFactory.createLink("menu.about", "menu.about", aboutTrans, null, listener, Link.LINK + Link.NONTRANSLATED);
+		aboutLink.setCustomDisplayText(aboutTrans.translate("menu.about"));
+		if (withIcon) {			
+			aboutLink.setIconLeftCSS("o_icon o_icon_openolat o_icon-fw");
+		}
+		if (withBuildInfo) {
+			String title = aboutTrans.translate("menu.about.alt");
+			String rev = WebappHelper.getRevisionNumber();
+			if (rev != null) {
+				String change = WebappHelper.getChangeSet();
+				aboutLink.setTitle(title + " Build (" + rev + ":" + change+ ")");								
+			} else {
+				aboutLink.setTitle(title);				
+			}			
+		}
+		
+		return aboutLink;
+	}
+
+
+}

src/main/java/org/olat/login/_chelp/about.html

-<p class="clearfix o_large">
-	<a href="http://www.openolat.org" target="_blank">
-		<img border="0" class="pull-left"  src="$r.staticLink("images/openolat/openolat_logo_495x115_with_claim_transparent.png")" alt="$r.translate("about.title")" />
-	</a>
-</p>
-<a href="http://blogs.frentix.com/blogs/frentix/2012/08/14/1344960660000.html" target="_blank" title="The OpenOLAT LMS got a high score in the e-learning journal ranking" style="float: right; padding-left: 2em;">
-	<img border="0" src="$r.staticLink("images/openolat/openolat_testsiegel_elearning_journal.jpg")" alt="The OpenOLAT LMS got a high score in the e-learning journal ranking" style="height: 150px;" />
-</a>
-<p>$r.translate("about.version") $r.getVersion()</p>
-<p>$r.translate("about.history")</p>
-<p>
-	$r.translate("about.elearningjournal.test.2012")
-	<br />
-	<a href="http://www.openolat.org/fileadmin/documents/openolat/TH_LMS_TEST_frentix_OpenOLAT_v1.0.pdf" target="_blank" class="o_link_extern"><i class="o_icon o_icon_external_link"> </i> OpenOLAT 8.1 im Test, eLearning Journal Testbericht</a>
-</p>
-<h4>$r.translate("about.financing")</h4>
-<p>$r.translate("about.financing.intro")<p>
-<center>
-	<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-		<input type="hidden" name="cmd" value="_s-xclick" />
-		<input type="hidden" name="hosted_button_id" value="BJWR7L8N7SX7S" />
-		<input type="image" src="https://www.paypalobjects.com/en_US/CH/i/btn/btn_donateCC_LG.gif" border="0" style="border:0;background:none;" name="submit" alt="PayPal - The safer, easier way to pay online!" />
-		<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-	</form>
-</center>
-<p><br />$r.translate("about.linktext")</p>
-<p class="text-right"><br />Zürich, 15.08.2013</p>
-<h4>$r.translate("about.copyright")</h4>
-<pre>$r.getLicences()</pre>
-<h4>$r.translate("about.translate")</h4>
-<ul class="list-unstyled">
-#set($langInfos = $r.getLanguages())
-#foreach ($lang in $langInfos.enabledKeys) 
-	<li><i class="o_flag o_flag_${lang}"> </i> $langInfos.langNames.get("$lang") : $langInfos.langTranslators.get("$lang")</li>
-#end
-</ul>

src/main/java/org/olat/login/_content/about.html

+<p class="clearfix o_large">
+	<a href="http://www.openolat.org" target="_blank">
+		<img border="0" class="pull-left"  src="$r.staticLink("images/openolat/openolat_logo_495x115_with_claim_transparent.png")" alt="$r.translate("about.title")" />
+	</a>
+</p>
+
+#if($r.translate("about.custom.title") != "")
+<div id="o_about_custom">
+	<h2>
+		$r.translate("about.custom.title")
+	</h2>
+	<p>
+		$r.translate("about.custom")
+	</p>
+</div>
+#end
+
+<div id="o_about_lms">
+	<h2>
+		LMS OpenOLAT
+	</h2>
+	<a href="http://www.openolat.org" target="_blank" class="o_link_extern">http://www.openolat.org</a>
+	<p class="text-muted">
+		$r.translate("about.version") $r.getVersion()
+	</p>
+	<a href="https://www.frentix.com/testbericht-openolat-sehr-gut/" target="_blank" title="The OpenOLAT LMS got a high score in the e-learning journal ranking">
+		<img border="0" src="$r.staticLink("images/openolat/openolat-test-sehr-gut_large.png")" alt="The OpenOLAT LMS got a high score in the e-learning journal ranking" style="float: right; padding-left: 2em; padding-bottom: 2em; max-width: 40%;" />
+	</a>
+	<p>
+		$r.translate("about.history")
+	</p>
+	<p>
+		$r.translate("about.elearningjournal.test.2015")
+	</p>
+	<p>
+		<a href="http://www.frentix.com/wp-uploads/2015/08/elearningJournal_Test_OpenOLAT_2015.pdf" target="_blank" class="o_link_extern"><i class="o_icon o_icon_external_link"> </i> OpenOLAT 8.3 im Test, eLearning Journal Testbericht</a>
+	</p>
+	<p>
+		$r.translate("about.social")
+	</p>
+	<p>
+		<a href="http://www.twitter.com/OpenOLAT" target="_blank"><i class="o_icon o_icon_twitter o_icon-2x"> </i></a>
+		<a href="http://facebook.com/OpenOLAT" target="_blank"><i class="o_icon o_icon_facebook o_icon-2x"> </i></a>
+		<a href="https://plus.google.com/communities/117966447506177997483" target="_blank"><i class="o_icon o_icon_google o_icon-2x"> </i></a>
+	</p>
+</div>
+
+<div id="o_about_financing">
+	<h3 style="clear:both;">
+		$r.translate("about.financing")
+	</h3>
+	<p>
+		$r.translate("about.financing.intro")
+	<p>
+	<center>
+		<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+			<input type="hidden" name="cmd" value="_s-xclick" />
+			<input type="hidden" name="hosted_button_id" value="BJWR7L8N7SX7S" />
+			<input type="image" src="https://www.paypalobjects.com/en_US/CH/i/btn/btn_donateCC_LG.gif" border="0" style="border:0;background:none;" name="submit" alt="PayPal - The safer, easier way to pay online!" />
+			<img alt="" border="0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+		</form>
+	</center>
+</div>
+
+<div class="o_about_partner">
+	<h3 >
+		$r.translate("about.partner")
+	</h3>
+	<p>
+		$r.translate("about.partner.intro")
+	<p>
+	<table class="table table-striped table-condensed ">
+	<thead>
+		<tr>
+			<th>Level</th>
+			<th>Institution</th>
+		</tr>
+	</thead>	
+	<tbody>
+		<tr>
+			<td>Gold</td>
+			<td><a href="http://www.uibk.ac.at" target="_blank" class="o_extern">Universität Innsbruck</a></td>
+		</tr>
+		<tr>
+			<td>Gold</td>
+			<td><a href="http://www.vcrp.de" target="_blank" class="o_extern">Virtueller Campus Rheinland-Pfalz, VCRP</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.bzgbs.ch" target="_blank" class="o_extern">BZG Bildungszentrum Gesundheit Basel-Stadt</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.hfgs.ch" target="_blank" class="o_extern">Höheren Fachschule Gesundheit und Soziales, HFGS</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.fhnw.ch/sozialearbeit" target="_blank" class="o_extern">Fachhochschule Nordwestschweiz FHNW,
+	Hochschule für Soziale Arbeit</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.uni-kiel.de" target="_blank" class="o_extern">Christian-Albrechts-Universität zu Kiel, CAU</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.bbw.ch" target="_blank" class="o_extern">Berufsbildungsschule Winterthur BBW</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.conplus.ch" target="_blank" class="o_extern">ConPlus Guntern + Partner</a></td>
+		</tr>
+		<tr>
+			<td>Bronze</td>
+			<td><a href="http://www.hs-furtwangen.de" target="_blank" class="o_extern">Hochschule Furtwangen, HFU</a></td>
+		</tr>
+	</tbody>
+	</table>
+</div>
+
+<p>
+	<br />
+	$r.translate("about.linktext")
+</p>
+<p class="text-right">
+	<br />Zürich, 15.08.2013
+</p>
+
+<div class="o_about_copyright">
+	<h3>
+		$r.translate("about.copyright")
+	</h3>
+	<pre class="small">
+$licenses
+	</pre>
+</div>
+
+<div class="o_about_translations">
+	<h3>
+		$r.translate("about.translate")
+	</h3>
+	<ul class="list-unstyled">
+	#set($langInfos = $r.getLanguages())
+	#foreach ($lang in $langInfos.enabledKeys) 
+		<li><i class="o_flag o_flag_${lang}"> </i> $langInfos.langNames.get("$lang") : $langInfos.langTranslators.get("$lang")</li>
+	#end
+	</ul>
+</div>
+
+<div class="o_button_group">
+	$r.render("close")
+</div>
\ No newline at end of file

src/main/java/org/olat/login/_i18n/LocalStrings_de.properties

 #Mon Mar 02 09:54:04 CET 2009
-about.pro=OpenOLAT von frentix
-about.pro.slogan=lernen Sie los!
-about.pro.subtitle=OpenSource Power mit professionellem Service. Dauerhaft, garantiert!
-about.pro.intro=OpenOLAT von frentix vereint die Vorzge des preisgekrnten Open Source Learning Management Systems OpenOLAT mit den professionellen Dienstleistungen von frentix. 
-about.pro.award.oss.2011=Das LMS OpenOLAT und die Dienstleistungen von frentix wurden mit dem Swiss Open Source Award 2011 als "Best Business Case" ausgezeichnet.
-about.pro.award.elearningjournal.2012=Gemeinsam mit der Bundesakademie fr Sicherheitspolitik (BAKS) in Deutschland, und dem Zentrum fr technologiegesttzte Bildung (ZtB), hat frentix fr das Projekt "Sicherheitspolitische Weiterbildung" den vom eLearning-Journal vergebenen eLearning-Award 2012 in der Kategorie "Open Source "gewonnen. Als Basis fr die Studienplattform dient OpenOLAT.
-about.pro.release=Release Information
-about.copyright=Copyright und Beteiligungen
-about.elearningjournal.test.2012=Mit der Note "1.5" hat das renommierte eLearning-Journal das LMS OpenOLAT in einem umfassenden LMS Vergleichstest bewertet. Damit ist OpenOLAT ganz vorne mit dabei. Besonders hervorgehoben wurde der grosse Funktionsumfang der Open Source Lsung OpenOLAT.
 
-about.financing=Finanzierung Entwicklung
-about.financing.intro=Das Open Source System OpenOLAT wird von <a href="http://www.frentix.com" target="_blank"><i class="o_icon o_icon_link_extern"> </i> frentix GmbH</a> in Zusammenarbeit mit den OpenOLAT Partnern entwickelt und finanziert. Aber auch Sie knnen einen Beitrag fr die Zukunft von OpenOLAT leisten, indem Sie OpenOLAT finanziell untersttzen. 
 
-about.date=Z\u00FCrich, 8. Februar 2011
-about.history=Das Learning-Management-System OpenOLAT wird seit 2011 in der OpenOLAT community entwickelt. OpenOLAT ist ein Fork des Open Source LMS OLAT der Universitt Zrich und wird weltweit in Bildungsinstitutionen und Firmen eingesetzt. OpenOLAT ist ein Open-Source-Produkt und kann frei verwendet und abge\u00E4ndert werden.
 
 
 
-about.linktext=Weitere Informationen sowie Mailinglisten finden Sie unter <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
 
+
+about.copyright=Copyright und Beteiligungen
+about.elearningjournal.test.2015=Mit dem Prdikat "sehr gut" hat das renommierte eLearning-Journal das LMS OpenOLAT in einem umfassenden LMS Vergleichstest bewertet. Damit ist OpenOLAT ganz vorne mit dabei. Besonders hervorgehoben wurde der grosse Funktionsumfang der Open Source Lsung OpenOLAT.
+about.financing=Finanzierung Entwicklung
+about.financing.intro=Das Open Source System OpenOLAT wird von <a href="http://www.frentix.com" target="_blank"><i class="o_icon o_icon_link_extern"> </i> frentix GmbH</a> in Zusammenarbeit mit den OpenOLAT Partnern entwickelt und finanziert. Aber auch Sie knnen einen Beitrag fr die Zukunft von OpenOLAT leisten, indem Sie OpenOLAT finanziell untersttzen. 
+about.partner=OpenOLAT Partner
+about.partner.intro=Die folgenden Institutionen nehmen am <a href="http://www.openolat.com/open-source-lms/partnerprogramm/" target="_blank">OpenOLAT Parternprogramm</a> teil und untersttzen aktiv die Entwicklung von OpenOLAT:
+about.social=Verbinden Sie sich mit uns auf den Sozialen Netzwerken\:
+about.date=Z\u00FCrich, 8. Februar 2011
+about.history=Das Learning-Management-System OpenOLAT wird seit 2011 in der OpenOLAT community entwickelt. OpenOLAT ist ein Fork des Open Source LMS OLAT der Universitt Zrich und wird weltweit in Bildungsinstitutionen und Firmen eingesetzt. OpenOLAT ist ein Open-Source-Produkt und kann frei verwendet und abge\u00E4ndert werden.
+about.custom.title=
+about.custom=
+about.linktext=Weitere Informationen sowie Mailinglisten finden Sie unter <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
 about.title=\u00DCber OpenOLAT
 about.translate=Mehrsprachigkeit
 about.version=Version 
-
 accessibility.accesskeys=Mit Tastaturk\u00FCrzeln k\u00F6nnen Sie die wichtigsten Elemente des Systems direkt anspringen. 
 accessibility.accesskeys1=Je nach Browser und Betriebssystem werden die Tastaturk\u00FCrzel mit der CTRL-, der ALT-Taste, der Shift-Taste oder einer Kombination davon gew\u00E4hlt.
 accessibility.accesskeys2=Fr Windows XP, Windows Vista, Windows 7 und Linux Ubuntu gilt im Firefox die Tastenkombination Shift und Alt. Beim Mac OS 10.5 Betriebssystem verwenden Sie die CTRL-Taste. Dr\u00FCcken Sie also beispielsweise "Shift", "Alt" und "r" gleichzeitig, um zu den Lernressourcen zu springen.

src/main/java/org/olat/login/_i18n/LocalStrings_en.properties

@@ -4,20 +4,24 @@ about.date=Zurich, February 8, 2011
 about.financing=Financing the development
 about.financing.intro=The open source system OpenOLAT is developed and financed by <a href="http://www.frentix.com" target="_blank"><i class="o_icon o_icon_link_extern"> </i> frentix GmbH</a> together with its OpenOLAT partners. Also you can contribute to the development of OpenOLAT by supporting our efforts with a donation. 
 about.history=The Learning Management System OpenOLAT is being developed by the OpenOLAT community since 2011. OpenOLAT is a fork of the open source LMS OLAT developed by University of Zurich and is used world-wide by educational institutions and other enterprises. OpenOLAT is open-source and can be used and modified for free.
+about.linktext=More information as well as mailing lists are available at <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
 
 
-about.linktext=More information as well as mailing lists are available at <a href\="http\://www.openolat.org" target\="_blank"><i class="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
-about.pro=OpenOLAT by frentix
-about.pro.slogan=start learning now!
-about.pro.subtitle=OpenSource power with professional services. Durable, guaranteed!
-about.pro.intro=OpenOLAT by frentix combines the advantages of the award winning open source learning managment system OpenOLAT with the professional services by frentix. 
-about.pro.award.oss.2011=The OpenOLAT LMS and the services delivered by frentix have been awarded with the Swiss Open Source award 2011 as the winner of the category "Best Business Case". 
-about.pro.award.elearningjournal.2012=Together with the Bundesakademie fr Sicherheitspolitik (BAKS) in Germany, the Zentrum fr technologiegesttzte Bildung (ZtB) frentix has been awarded for the project "Sicherheitspolitische Weiterbildung" by the eLearning-Journal with the eLearning-Award 2012 in the category "Open Source "gewonnen. OpenOLAT serves as a base for the learning plattform. 
-about.pro.release=Release Information
-about.elearningjournal.test.2012=The eLearning-Journal ranked the LMS OpenOLAT with a score of "1.5" in a extensive comparison and tests of LMS available on the market. With this great result OpenOLAT is rated as a best practice solution. As a speciality of OpenOLAT the great number of features and tools available in OpenOLAT has been named.
+
+
+
+
+
+about.elearningjournal.test.2015=The eLearning-Journal ranked the LMS OpenOLAT with the label "very good" in a extensive comparison and tests of LMS available on the market. With this great result OpenOLAT is rated as a best practice solution. As a speciality of OpenOLAT the great number of features and tools available in OpenOLAT has been named.
 about.title=About OpenOLAT
 about.translate=Multilingual
 about.version=Version
+about.custom.title=
+about.custom=
+about.partner=OpenOLAT partner
+about.partner.intro=The following institutions are members of the <a href="http://www.openolat.com/open-source-lms/partnerprogramm/" target="_blank">OpenOLAT partership programm</a> and are actively spporting the development of the LMS OpenOLAT\:
+about.social=Connect with us on social networks\:
+
 accessibility.accesskeys=By using shortcuts it is possible to jump to the most important elements within the system.
 accessibility.accesskeys.browsers=How to activate shortcuts in different browsers.
 accessibility.accesskeys1=Depending on browser and operating system short cuts are made using the CTRL, ALT, or Shift key (or a combination thereof).

src/main/java/org/olat/login/_i18n/LocalStrings_fr.properties

 #Thu Feb 26 21:12:58 CET 2015
 about.copyright=Copyright et participations
 about.date=Z\u00FCrich, le 8 f\u00E9vrier 2011
-about.elearningjournal.test.2012=Le eLearning-Journal a class\u00E9 OpenOLAT avec un score de "1,5" apr\u00E8s un test et une comparaison approfondie des LMS disponibles sur le march\u00E9. Avec cet excellent r\u00E9sultat, OpenOLAT est consid\u00E9r\u00E9 comme une solution de r\u00E9f\u00E9rence. Une sp\u00E9cialit\u00E9 d'OpenOLAT qui a \u00E9t\u00E9 soulign\u00E9e, est le grand nombre de fonctionnalit\u00E9s et d'outils disponibles.
+about.elearningjournal.test.2015=Le eLearning-Journal a class\u00E9 OpenOLAT avec le titre "tr\u00E8s bien" apr\u00E8s un test et une comparaison approfondie des LMS disponibles sur le march\u00E9. Avec cet excellent r\u00E9sultat, OpenOLAT est consid\u00E9r\u00E9 comme une solution de r\u00E9f\u00E9rence. Une sp\u00E9cialit\u00E9 d'OpenOLAT qui a \u00E9t\u00E9 soulign\u00E9e, est le grand nombre de fonctionnalit\u00E9s et d'outils disponibles.
 about.financing=Financer le d\u00E9veloppement
 about.financing.intro=Le syst\u00E8me open source OpenOLAT est d\u00E9velopp\u00E9 et financ\u00E9 par <a target\="_blank" href\="http\://www.frentix.com"><i class\="o_icon o_icon_link_extern"> </i> frentix GmbH</ a> avec ses partenaires OpenOLAT. Vous pouvez vous aussi contribuer au d\u00E9veloppement d'OpenOLAT et soutenir nos efforts par un don.
 about.history=Le syst\u00E8me de gestion de l'apprentissage OpenOLAT a \u00E9t\u00E9 d\u00E9velopp\u00E9 depuis 2011 par la communi\u00E9 OpenOLAT. OpenOLAT est un fork du LMS open source OLAT de l'Universit\u00E9 de Zurich et est actuellement utilis\u00E9 dans diverses institutions et entreprises. OpenOLAT est un produit open source et peut \u00EAtre utilis\u00E9 et modifi\u00E9 librement.
 about.linktext=Vous trouverez d'autres informations ainsi qu'une mailing-list sous <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
-about.pro=OpenOLAT par frentix
-about.pro.award.elearningjournal.2012=En collaboration avec Bundesakademie f\u00FCr Sicherheitspolitik (BAKS) en Allemagne et le Zentrum f\u00FCr technologiegest\u00FCtzte Bildung (ZtB), frentix \u00E0 d\u00E9velopper le projet de "formation continue pour la politique de s\u00E9curit\u00E9" qui a re\u00E7u le prix eLearning-Award 2012 dans la cat\u00E9gorie "Open Source" du journal eLearning. Comme base de la plateforme d'\u00E9tude se trouve OpenOLAT.
-about.pro.award.oss.2011=Le LMS OpenOLAT et les services de frentix ont \u00E9t\u00E9 prim\u00E9 dans la cat\u00E9gorie "Best Business Case" au Swiss Open Source Award 2011.
-about.pro.intro=OpenOLAT de frentix combine les avantages du Learning Management System OpenOLAT avec les services professionnels de frentix.
-about.pro.release=Informations sur la release
-about.pro.slogan=Apprenez, d\u00E9part\!
-about.pro.subtitle=Puissance open source avec un service professionnel, durable et garanti\!
 about.title=\u00C0 propos d'OpenOLAT
 about.translate=Plurilinguisme
 about.version=Version

src/main/java/org/olat/login/_i18n/LocalStrings_pt_BR.properties

 #Fri Jul 10 22:58:05 CEST 2015
 about.copyright=Copyright e contribui\u00E7\u00F5es
 about.date=Zurique, 8 de Fevereiro de 2011
-about.elearningjournal.test.2012=O eLearning-Journal classificou o LMS OpenOLAT com uma pontua\u00E7\u00E3o de "1.5" em uma compara\u00E7\u00E3o extensa e em testes de LMS dispon\u00EDveis no mercado. Com este grande resultado, o OpenOLAT \u00E9 avaliado como a melhor solu\u00E7\u00E3o. Como grande destaque, o OpenOLAT foi nomeado devido ao grande n\u00FAmero de recursos e ferramentas dispon\u00EDveis.
+about.elearningjournal.test.2015=O eLearning-Journal classificou o LMS OpenOLAT com o resultado "muito bom" em uma compara\u00E7\u00E3o extensa e em testes de LMS dispon\u00EDveis no mercado. Com este grande resultado, o OpenOLAT \u00E9 avaliado como a melhor solu\u00E7\u00E3o. Como grande destaque, o OpenOLAT foi nomeado devido ao grande n\u00FAmero de recursos e ferramentas dispon\u00EDveis.
 about.financing=Financiar desenvolvimento
 about.financing.intro=O sistema de c\u00F3digo aberto OpenOLAT \u00E9 desenvolvido e financiado pela <a href\="http\://www.frentix.com" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> frentix GmbH</a>, juntamente com seus parceiros OpenOLAT. Al\u00E9m disso, voc\u00EA pode contribuir para o desenvolvimento de OpenOLAT apoiando nossos esfor\u00E7os com uma doa\u00E7\u00E3o.
 about.history=O OpenOLAT, Sistema de Gerenciamento de Aprendizagem, est\u00E1 sendo desenvolvido pela comunidade OpenOLAT desde 2011. OpenOLAT \u00E9 derivado do LMS de c\u00F3digo aberto OLAT, desenvolvido pela Universidade de Zurique e \u00E9 usado em todo o mundo por institui\u00E7\u00F5es educacionais e outras empresas. OpenOLAT \u00E9 de fonte aberta e pode ser utilizado e modificado livremente.
 about.linktext=Mais informa\u00E7\u00F5es assim como listas de envio est\u00E3o dispon\u00EDveis em <a href\="http\://www.openolat.org" target\="_blank"><i class\="o_icon o_icon_link_extern"> </i> www.openolat.org</a>
-about.pro=OpenOLAT por frentix
-about.pro.award.elearningjournal.2012=Juntamente com o Bundesakademie f\u00FCr Sicherheitspolitik (Baks) na Alemanha, o Zentrum f\u00FCr Bildung technologiegest\u00FCtzte (ZtB) frentix foi reconhecido pelo projeto "Sicherheitspolitische Weiterbildung" pelo Jornal eLearning com o eLearning Award-2012 na categoria "Open Source". OpenOLAT serve como uma base para a plataforma de aprendizagem.
-about.pro.award.oss.2011=O LMS OpenOLAT e os servi\u00E7os prestados pelo frentix foram premiados no Swiss Open Source award 2011 como o vencedor da categoria "Melhor Business Case".
-about.pro.intro=OpenOLAT por frentix combina as vantagens do premiado sistema OpenOLAT com os servi\u00E7os profissionais por frentix.
-about.pro.release=Informa\u00E7\u00F5es da vers\u00E3o
-about.pro.slogan=Iniciar aprendizado agora\!
-about.pro.subtitle=Poder OpenSource com servi\u00E7os profissionais. Dur\u00E1vel, garantido\!
 about.title=Sobre o OpenOLAT
 about.translate=Multilingual
 about.version=Vers\u00E3o

src/main/java/org/olat/login/_i18n/i18nBundleMetadata.properties

@@ -5,4 +5,7 @@ authentication.provider.description.annotation=above mentioned
 login.custommsg.annotation=Optional message that appears above login form, e.g. some welcome text
 login.customfootermsg.annotation=Optional message that appears below login form, e.g. to place some help links
 
+about.custom.title=Optional title for specific usage scenario
+about.custom=Optional content for specific usage scenario
+
 bundle.priority=400