OO-2699: minor enhancements, wording, compile css

src/main/java/org/olat/course/nodes/card2brain/Card2BrainConfigController.java

@@ -34,8 +34,8 @@ import org.olat.core.gui.control.WindowControl;
 import org.olat.core.util.StringHelper;
 import org.olat.course.nodes.Card2BrainCourseNode;
 import org.olat.modules.ModuleConfiguration;
+import org.olat.modules.card2brain.Card2BrainManager;
 import org.olat.modules.card2brain.Card2BrainModule;
-import org.olat.modules.card2brain.manager.Card2BrainManager;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -89,7 +89,9 @@ public class Card2BrainConfigController extends FormBasicController {
 		boolean enablePrivateLogin = config.getBooleanSafe(Card2BrainCourseNode.CONFIG_ENABLE_PRIVATE_LOGIN);
 		String[] enableValues = new String[]{ translate("on") };		
 		enablePrivateLoginEl = uifactory.addCheckboxesHorizontal("edit.access.enablePrivateLogin", formLayout, enabledKeys, enableValues);
-		enablePrivateLoginEl.select(enabledKeys[0], enablePrivateLogin);
+		if (enablePrivateLogin) {
+			enablePrivateLoginEl.select(enabledKeys[0], true);
+		}
 		enablePrivateLoginEl.addActionListener(FormEvent.ONCHANGE);
 
 		String privateKey = config.getStringValue(Card2BrainCourseNode.CONFIG_PRIVATE_KEY);
@@ -193,7 +195,7 @@ public class Card2BrainConfigController extends FormBasicController {
 			previewLayoutCtr.addDisposableChildController(card2brainRunCtr);
 			previewLayoutCtr.activate();
 			listenTo(previewLayoutCtr);
-		}		
+		}
 		super.formInnerEvent(ureq, source, event);
 	}
 	

src/main/java/org/olat/course/nodes/card2brain/_content/peekview.html

 <div class="o_c2b_peekview">
 	<div class="o_c2b_cover" onClick="$r.javaScriptCommand(${run});""></div>
-	<iframe class="o_c2b_irame" src="${src}" frameborder="0" scrolling="no"></iframe>
+	<iframe class="o_c2b_iframe" src="${src}" frameborder="0" scrolling="no"></iframe>
 </div> 

src/main/java/org/olat/course/nodes/card2brain/_content/run.html

@@ -5,7 +5,7 @@
 /* <![CDATA[ */ 
 	## no window.onresize due to IE bug which triggers recurstion: http://snook.ca/archives/javascript/ie6_fires_onresize/
 	jQuery(function() {b_resizeIframeToMainMaxHeight("Card2BrainIFrame");});
-	jQuery( window ).resize(function() {
+	jQuery(window).resize(function() {
   		b_resizeIframeToMainMaxHeight("Card2BrainIFrame");
 	});
 /* ]]> */

src/main/java/org/olat/course/nodes/card2brain/_i18n/LocalStrings_de.properties

 #Thu Apr 20 14:14:09 CEST 2017
 condition.accessibility.title=Zugang
 edit.FlashcardHelpText=Das Alias ist in den Details der Kartenkartei auf card2brain zu finden. Das Alias ist der letzte Abschnitt des Weblinks, z.B. 20170419_das_kleine_garten_abc
-edit.KeyHelpText=Der Schl\u00FCssel ist in den Einstellungen auf der Webseite von card2brain zu finden.
-edit.SecretHelpText=Das Passwort ist in den Einstellungen auf der Webseite von card2brain zu finden.
+edit.KeyHelpText=Der API Key ist in den Einstellungen auf der Webseite von card2brain zu finden.
+edit.SecretHelpText=Das API Secret ist in den Einstellungen auf der Webseite von card2brain zu finden.
 edit.access.enablePrivateLogin=Privates Login verwenden
-edit.access.privateKey=Schl\u00FCssel
-edit.access.privateSecret=Passwort
+edit.access.privateKey=API Key
+edit.access.privateSecret=API Secret
 edit.flashcard.alias=Alias der Lernkartei
 edit.preview=Vorschau
 edit.title=Lernkartei konfigurieren

src/main/java/org/olat/course/nodes/card2brain/_i18n/LocalStrings_en.properties

 #Thu Apr 20 14:16:23 CEST 2017
 condition.accessibility.title=Access
 edit.FlashcardHelpText=The alias is available in the details of the set of flashcards on the card2brain website. The alias is the last part of the weblink, e.g. 20170419_das_kleine_garten_abc
-edit.KeyHelpText=The key is available in the preferences of the card2brain website.
-edit.SecretHelpText=The password is available in the preferences of the card2brain website.
+edit.KeyHelpText=The API Key is available in the preferences of the card2brain website.
+edit.SecretHelpText=The API Secret is available in the preferences of the card2brain website.
 edit.access.enablePrivateLogin=Use private login
-edit.access.privateKey=Key
-edit.access.privateSecret=Password
+edit.access.privateKey=API Key
+edit.access.privateSecret=API Secret
 edit.flashcard.alias=Alias of flashcards
 edit.preview=Preview
 edit.title=Flashcard Configuration

src/main/java/org/olat/modules/card2brain/manager/Card2BrainManager.java → src/main/java/org/olat/modules/card2brain/Card2BrainManager.java

@@ -17,7 +17,7 @@
  * frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.modules.card2brain.manager;
+package org.olat.modules.card2brain;
 
 /**
  * 

src/main/java/org/olat/modules/card2brain/manager/Card2BrainManagerImpl.java

@@ -27,6 +27,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.modules.card2brain.Card2BrainManager;
 import org.olat.modules.card2brain.Card2BrainModule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/org/olat/modules/card2brain/ui/Card2BrainAdminController.java

@@ -68,12 +68,16 @@ public class Card2BrainAdminController extends FormBasicController {
 		
 		String[] enableValues = new String[]{ translate("on") };		
 		enabledEl = uifactory.addCheckboxesHorizontal("admin.enabled", formLayout, enabledKeys, enableValues);
-		enabledEl.select(enabledKeys[0], card2BrainModule.isEnabled());
+		if (card2BrainModule.isEnabled()) {
+			enabledEl.select(enabledKeys[0], true);
+		}
 		
 		uifactory.addSpacerElement("Spacer", formLayout, false);
 				
 		enterpriseLoginEnabledEl = uifactory.addCheckboxesHorizontal("admin.enterpriseLoginEnabled", formLayout, enabledKeys, enableValues);
-		enterpriseLoginEnabledEl.select(enabledKeys[0], card2BrainModule.isEnterpriseLoginEnabled());
+		if (card2BrainModule.isEnterpriseLoginEnabled()) {
+			enterpriseLoginEnabledEl.select(enabledKeys[0], true);
+		}
 		enterpriseLoginEnabledEl.setHelpTextKey("admin.enterpriseLoginHelpText", null);
 		enterpriseLoginEnabledEl.setHelpUrl(translate("admin.enterpriseLoginHelpUrl"));
 		enterpriseLoginEnabledEl.addActionListener(FormEvent.ONCHANGE);
@@ -146,7 +150,7 @@ public class Card2BrainAdminController extends FormBasicController {
 			allOk &= validatePeekViewUrl();
 		}
 		
-		return allOk && super.validateFormLogic(ureq);
+		return allOk & super.validateFormLogic(ureq);
 	}
 	
 	private boolean validateEnterpriseLogin() {

src/main/java/org/olat/modules/card2brain/ui/_i18n/LocalStrings_de.properties

@@ -3,11 +3,11 @@ admin.baseUrl=URL LTI Ressource
 admin.baseUrlHelpText=Als Platzhalter f\u00FCr das Alias der Lernkartei ist '%s' zu verwenden.
 admin.description=card2brain ist die Multi-Channel-Application zum systematischen Lernen in allen Wissensgebieten. Auf card2brain.ch kannst du Lernkarten erstellen und nach dem bekannten F\u00FCnf-F\u00E4cher-Prinzip von Sebastian Leitner lernen. Weitere Informationen sind auf der <a href\="http\://card2brain.ch" target\=_blank>Webseite</a> von card2brain zu finden.
 admin.enabled=Modul "card2brain"
-admin.enterpriseKey=Schl\u00FCssel
+admin.enterpriseKey=API Key
 admin.enterpriseLoginEnabled=Enterprise Login
 admin.enterpriseLoginHelpText=F\u00FCr das Enterprise Login wird ein card2brain "Corporate" Abo ben\u00F6tigt.
 admin.enterpriseLoginHelpUrl=https\://card2brain.ch/register/index?licence\=multiple&lang\=de
-admin.enterpriseSecret=Passwort
+admin.enterpriseSecret=API Secret
 admin.expertSettings=Experteneinstellungen
 admin.menu.title=card2brain
 admin.menu.title.alt=card2brain

src/main/java/org/olat/modules/card2brain/ui/_i18n/LocalStrings_en.properties

@@ -3,11 +3,11 @@ admin.baseUrl=URL LTI resource
 admin.baseUrlHelpText=Use '%s' as a placeholder for the alias of the flashcards.
 admin.description=card2brain is the multi-channel application for methodical learning in all fields of study. On card2brain, you can create flashcards and study them according to Sebastian Leitner's well-known system of five compartments. Further information is available on the <a href\="http\://card2brain.ch" target\=_blank>website</a> of card2brain.
 admin.enabled=Module "card2brain"
-admin.enterpriseKey=Key
+admin.enterpriseKey=API Key
 admin.enterpriseLoginEnabled=Enterprise Login
 admin.enterpriseLoginHelpText=To use the Enterprise Login a card2brain "Corporate" subscription is needed.
 admin.enterpriseLoginHelpUrl=https\://card2brain.ch/register/index?licence\=multiple&lang\=en
-admin.enterpriseSecret=Password
+admin.enterpriseSecret=API Secret
 admin.expertSettings=Expert settings
 admin.menu.title=card2brain
 admin.menu.title.alt=card2brain

src/main/webapp/static/themes/light/modules/_card2brain.scss

@@ -17,7 +17,7 @@
 	cursor:pointer;
 }
 
-.o_c2b_irame {
+.o_c2b_iframe {
 	height: 180px;
 	width: 300px;
 	position: absolute;