From 132426ebb924d18898f95eceb833e7270a35ccc9 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 14 Jan 2013 11:49:37 +0100
Subject: [PATCH] OO-498: set the raw content mode as default for SCORM, set
the default height to 680px, update wording
---
src/main/java/org/olat/course/nodes/ScormCourseNode.java | 3 ++-
.../org/olat/course/nodes/scorm/ScormEditController.java | 2 +-
.../java/org/olat/course/nodes/scorm/ScormRunController.java | 5 ++++-
.../olat/course/nodes/scorm/_i18n/LocalStrings_de.properties | 2 +-
.../olat/course/nodes/scorm/_i18n/LocalStrings_en.properties | 2 +-
src/main/java/org/olat/modules/scorm/ScormMainManager.java | 4 +++-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/ScormCourseNode.java b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
index 81f0a8354a3..077a456bdd9 100644
--- a/src/main/java/org/olat/course/nodes/ScormCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ScormCourseNode.java
@@ -183,7 +183,7 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Ass
config.setBooleanEntry(NodeEditController.CONFIG_STARTPAGE, Boolean.TRUE.booleanValue());
config.setBooleanEntry(NodeEditController.CONFIG_COMPONENT_MENU, Boolean.TRUE.booleanValue());
config.setBooleanEntry(ScormEditController.CONFIG_SHOWNAVBUTTONS, Boolean.TRUE.booleanValue());
- config.set(ScormEditController.CONFIG_HEIGHT, ScormEditController.CONFIG_HEIGHT_AUTO);
+ config.set(ScormEditController.CONFIG_HEIGHT, "680");
config.set(NodeEditController.CONFIG_CONTENT_ENCODING, NodeEditController.CONFIG_CONTENT_ENCODING_AUTO);
config.set(NodeEditController.CONFIG_JS_ENCODING, NodeEditController.CONFIG_JS_ENCODING_AUTO);
//fxdiff FXOLAT-116: SCORM improvements
@@ -193,6 +193,7 @@ public class ScormCourseNode extends AbstractAccessableCourseNode implements Ass
config.setBooleanEntry(ScormEditController.CONFIG_ATTEMPTSDEPENDONSCORE, false);
config.setIntValue(ScormEditController.CONFIG_MAXATTEMPTS, 0);
config.setConfigurationVersion(CURRENT_CONFIG_VERSION);
+ config.setBooleanEntry(ScormEditController.CONFIG_RAW_CONTENT, true);
} else {
int version = config.getConfigurationVersion();
if (version < CURRENT_CONFIG_VERSION) {
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java b/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
index e70394b90c6..c9fafa3d617 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormEditController.java
@@ -194,7 +194,7 @@ public class ScormEditController extends ActivateableTabbableDefaultController i
boolean advanceScore = config.getBooleanSafe(CONFIG_ADVANCESCORE, true);
// </OLATCE-289>
int cutvalue = config.getIntegerSafe(CONFIG_CUTVALUE, 0);
- boolean rawContent = config.getBooleanSafe(CONFIG_RAW_CONTENT, false);
+ boolean rawContent = config.getBooleanSafe(CONFIG_RAW_CONTENT, true);
String height = (String) config.get(CONFIG_HEIGHT);
String encContent = (String) config.get(NodeEditController.CONFIG_CONTENT_ENCODING);
String encJS = (String) config.get(NodeEditController.CONFIG_JS_ENCODING);
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
index 24c179f7d6c..b5ef9fd47c7 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
@@ -300,11 +300,14 @@ public class ScormRunController extends BasicController implements ScormAPICallb
// configure some display options
boolean showNavButtons = config.getBooleanSafe(ScormEditController.CONFIG_SHOWNAVBUTTONS, true);
scormDispC.showNavButtons(showNavButtons);
- boolean rawContent = config.getBooleanSafe(ScormEditController.CONFIG_RAW_CONTENT, false);
+ boolean rawContent = config.getBooleanSafe(ScormEditController.CONFIG_RAW_CONTENT, true);
scormDispC.setRawContent(rawContent);
String height = (String) config.get(ScormEditController.CONFIG_HEIGHT);
if (!height.equals(ScormEditController.CONFIG_HEIGHT_AUTO)) {
scormDispC.setHeightPX(Integer.parseInt(height));
+ } else if(config.getBooleanSafe(ScormEditController.CONFIG_RAW_CONTENT, true)) {
+ //height auto but raw content set -> set default
+ scormDispC.setHeightPX(680);
}
String contentEncoding = (String) config.get(NodeEditController.CONFIG_CONTENT_ENCODING);
if (!contentEncoding.equals(NodeEditController.CONFIG_CONTENT_ENCODING_AUTO)) {
diff --git a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
index 71ea0e52397..26060e76c95 100644
--- a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
@@ -43,7 +43,7 @@ condition.accessibility.title=Zugang
cutvalue.label=Notwendige Punktzahl f\u00FCr 'bestanden'
cutvalue.validation=Geben Sie eine Ganzzahl ein
rawcontent.height.error=Wenn Sie "$\:rawcontent.label" ausgew\u00E4hlt haben, m\u00FCssen Sie die H\u00F6he der Anzeigefl\u00E4che setzen.
-rawcontent.label=Raw content
+rawcontent.label=Standardmodus
encoding.content=Zeichensatz Inhalt
encoding.js=Zeichensatz Javascript
encoding.auto=Automatisch
diff --git a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
index 31fa6ab9f0b..fdfd76f51bb 100644
--- a/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
@@ -74,7 +74,7 @@ passed.no=Failed
passed.yes=Passed
passed.yourpassed=Status
rawcontent.height.error=If "$\:rawcontent.label" is set, you need to specify the height of the window
-rawcontent.label=Raw content
+rawcontent.label=Standard mode
score.noscoreinfoyet=There is no score available for this SCORM object since you have never used it before.
score.title=Score
score.yourscore=Score achieved
diff --git a/src/main/java/org/olat/modules/scorm/ScormMainManager.java b/src/main/java/org/olat/modules/scorm/ScormMainManager.java
index dcb694bcf0c..2291cb1ad4b 100644
--- a/src/main/java/org/olat/modules/scorm/ScormMainManager.java
+++ b/src/main/java/org/olat/modules/scorm/ScormMainManager.java
@@ -66,8 +66,10 @@ public class ScormMainManager extends BasicManager {
File cpRoot, String resourceId, String courseId, String lesson_mode, String credit_mode,
boolean previewMode, String assessableType, boolean activate, boolean fullWindow, boolean attemptsIncremented) {
- return new ScormAPIandDisplayController(ureq, wControl, showMenu, apiCallback, cpRoot, resourceId, courseId, lesson_mode, credit_mode,
+ ScormAPIandDisplayController ctrl= new ScormAPIandDisplayController(ureq, wControl, showMenu, apiCallback, cpRoot, resourceId, courseId, lesson_mode, credit_mode,
previewMode, assessableType, activate, fullWindow, attemptsIncremented);
+ ctrl.setRawContent(true);
+ return ctrl;
}
}
--
GitLab