diff --git a/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java b/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java
index 96ebdaa0e12a9bc08557ce6376bf74a5e2483f3b..c365fa4f6d2023863ada43ad097943154d30f7ce 100644
--- a/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java
+++ b/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditForm.java
@@ -191,10 +191,10 @@ public class IQEditForm extends FormBasicController {
attempts.setMinValueCheck(1, null);
attempts.setMaxValueCheck(20, null);
- uifactory.addSpacerElement("s1", formLayout, true);
-
// Only assessments have a limitation on number of attempts
if (isAssessment) {
+ uifactory.addSpacerElement("s1", formLayout, true);
+
limitAttempts.select("xx", confAttempts > 0);
limitAttempts.addActionListener(FormEvent.ONCLICK);
} else {
@@ -222,8 +222,8 @@ public class IQEditForm extends FormBasicController {
Boolean confAllowSuspension = (Boolean) modConfig.get(IQEditController.CONFIG_KEY_ALLOW_SUSPENSION_ALLOWED);
String[] allowSuspension = new String[] { ALLOW };
String[] valuesSuspesion = new String[] { "" };
- allowSuspensionBox = uifactory.addCheckboxesVertical("allowSuspension", "qti.form.allowSuspension", formLayout, allowSuspension,
- valuesSuspesion, 1);
+ allowSuspensionBox = uifactory.addCheckboxesHorizontal("allowSuspension", "qti.form.allowSuspension", formLayout, allowSuspension,
+ valuesSuspesion);
allowSuspensionBox.addActionListener(FormEvent.ONCLICK);
if (confAllowSuspension != null) {
allowSuspensionBox.select(ALLOW, confAllowSuspension);
diff --git a/src/main/java/org/olat/course/nodes/iq/IQ12EditForm.java b/src/main/java/org/olat/course/nodes/iq/IQ12EditForm.java
index 0923eb97ce5e8e38607407eb157cb2032e1ec008..31c3d82aa1c6df62b514eb57479fc6b6fd5d16fd 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQ12EditForm.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQ12EditForm.java
@@ -172,11 +172,11 @@ public class IQ12EditForm extends FormBasicController {
blockAfterSuccess = uifactory.addCheckboxesHorizontal("blockAfterSuccess", "qti.form.block.afterSuccess", formLayout, new String[]{"xx"}, new String[]{null});
Boolean block = (Boolean) modConfig.get(IQEditController.CONFIG_KEY_BLOCK_AFTER_SUCCESS);
blockAfterSuccess.select("xx", block == null ? false : block.booleanValue() );
-
- uifactory.addSpacerElement("s1", formLayout, true);
-
+
// Only assessments have a limitation on number of attempts
if (isAssessment) {
+ uifactory.addSpacerElement("s1", formLayout, true);
+
limitAttempts.select("xx", confAttempts>0);
limitAttempts.addActionListener(FormEvent.ONCLICK);
} else {
diff --git a/src/main/java/org/olat/course/nodes/iq/IQEditController.java b/src/main/java/org/olat/course/nodes/iq/IQEditController.java
index 1a0729b3a5258c305c96524590cd07826c976e0d..b85072e81e24b3775e65db7733eb5ea8be048333 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQEditController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQEditController.java
@@ -363,6 +363,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
}
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, myContent, this);
+ previewLink.setIconLeftCSS("o_icon o_icon-fw o_icon_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
}
@@ -739,6 +740,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
setIQReference(re, moduleConfiguration);
previewLink = LinkFactory.createCustomLink("command.preview", "command.preview", re.getDisplayname(), Link.NONTRANSLATED, myContent, this);
+ previewLink.setIconLeftCSS("o_icon o_icon-fw o_icon_preview");
previewLink.setCustomEnabledLinkCSS("o_preview");
previewLink.setTitle(getTranslator().translate("command.preview"));
myContent.contextPut("dontRenderRepositoryButton", new Boolean(true));
diff --git a/src/main/java/org/olat/course/nodes/iq/_content/edit.html b/src/main/java/org/olat/course/nodes/iq/_content/edit.html
index f0230ab9edf80ae440d1db5ef41546fe76e46ae3..e985e74e6b81a98c194a6a748839ba86c1005b13 100644
--- a/src/main/java/org/olat/course/nodes/iq/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/iq/_content/edit.html
@@ -1,5 +1,5 @@
-<fieldset>
- <legend>$repEntryTitle</legend>
+<fieldset class="o_form form-horizontal ">
+ <legend>
#if ($type == "Assessment")
$r.contextHelpWithWrapper("org.olat.course.nodes.iq","ced-qti-append-test.html","help.select.file.test")
#elseif ($type == "Self-Assessment")
@@ -7,20 +7,27 @@
#else
$r.contextHelpWithWrapper("org.olat.course.nodes.iq","ced-qti-append-surv.html","help.select.file.surv")
#end
+ $repEntryTitle</legend>
#if ($dontRenderRepositoryButton)
- <p>
- <strong>$r.translate("file.name"):</strong>
- #if ($isOnyx)
- $onyxDisplayName
- #else
- $r.render("command.preview")
- #end
- </p>
- $r.render("command.changeRepFile")
- #if($r.available("command.editRepFile"))
- $r.render("command.editRepFile")
- #end
+ <div class="form-group">
+ <label class="control-label col-sm-3">$r.translate("file.name")</label>
+ <div class="col-sm-9"><p class="form-control-static">
+ #if ($isOnyx)
+ $onyxDisplayName
+ #else
+ $r.render("command.preview")
+ #end</p>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-offset-3 col-sm-9">
+ $r.render("command.changeRepFile")
+ #if($r.available("command.editRepFile"))
+ $r.render("command.editRepFile")
+ #end
+ </div>
+ </div>
#if ($showOutcomes)
<div class="o_block">
@@ -52,17 +59,18 @@
</div>
#end
#else
- <p>
- <strong>$r.translate("file.name"):</strong> $!chosentest
- </p>
- $r.render("command.chooseRepFile")
+ <div class="form-group">
+ <label class="control-label col-sm-3">$r.translate("file.name")</label>
+ <div class="col-sm-9"><p class="form-control-static">$!chosentest</p></div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-offset-3 col-sm-9">$r.render("command.chooseRepFile")</div>
+ </div>
#end
</fieldset>
-<div class="o_block_large">
- $r.render("filechoosecreateedit")
-</div>
+$r.render("filechoosecreateedit")
<fieldset>
- <legend>$r.translate("choosenlayout")</legend>
+ <legend>
#if ($type == "Assessment")
$r.contextHelpWithWrapper("org.olat.course.nodes.iq","ced-qti-config-test.html","help.iq.layout")
#elseif ($type == "Self-Assessment")
@@ -70,5 +78,6 @@
#else
$r.contextHelpWithWrapper("org.olat.course.nodes.iq","ced-qti-config-surv.html","help.iq.layout")
#end
+ $r.translate("choosenlayout")</legend>
$r.render("iqeditform")
</fieldset>
diff --git a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java
index 4d4734582aa3bd3741c8427e5a531a4d7002a163..3bf7a509e08b9547e4ab50327b2648f640aec4e1 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java
@@ -77,7 +77,7 @@ public class MSCourseNodeEditController extends ActivateableTabbableDefaultContr
super(ureq, wControl);
this.msNode = msNode;
- configurationVC = this.createVelocityContainer("edit");
+ configurationVC = createVelocityContainer("edit");
editScoringConfigButton = LinkFactory.createButtonSmall("scoring.config.enable.button", configurationVC, this);
UserNodeAuditManager auditManager = course.getCourseEnvironment().getAuditManager();
diff --git a/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java b/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java
index a319063f71c19eb1023ed90385d35e77a94c3fa1..370c78189514dc49fd85cfbc00d63ae9e885c123 100644
--- a/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java
+++ b/src/main/java/org/olat/course/nodes/ms/MSEditFormController.java
@@ -149,7 +149,7 @@ public class MSEditFormController extends FormBasicController {
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
// Create the "score granted" field...
- scoreGranted = uifactory.addCheckboxesVertical("form.score", formLayout, new String[]{"xx"}, new String[]{null}, 1);
+ scoreGranted = uifactory.addCheckboxesHorizontal("form.score", formLayout, new String[]{"xx"}, new String[]{null});
scoreGranted.addActionListener(FormEvent.ONCLICK);
Boolean sf = (Boolean) modConfig.get(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD);
scoreGranted.select("xx", sf == null ? false : sf.booleanValue());
@@ -175,7 +175,7 @@ public class MSEditFormController extends FormBasicController {
uifactory.addSpacerElement("spacer1", formLayout, false);
// Create the "display passed / failed"
- displayPassed = uifactory.addCheckboxesVertical("form.passed", formLayout, new String[]{"xx"}, new String[]{null}, 1);
+ displayPassed = uifactory.addCheckboxesHorizontal("form.passed", formLayout, new String[]{"xx"}, new String[]{null});
displayPassed.addActionListener(FormEvent.ONCLICK);
Boolean pf = (Boolean) modConfig.get(MSCourseNode.CONFIG_KEY_HAS_PASSED_FIELD);
if (pf == null) pf = Boolean.TRUE;
@@ -201,7 +201,7 @@ public class MSEditFormController extends FormBasicController {
uifactory.addSpacerElement("spacer2", formLayout, false);
// Create the "individual comment" dropdown.
- commentFlag = uifactory.addCheckboxesVertical("form.comment", formLayout, new String[]{"xx"}, new String[]{null}, 1);
+ commentFlag = uifactory.addCheckboxesHorizontal("form.comment", formLayout, new String[]{"xx"}, new String[]{null});
Boolean cf = (Boolean) modConfig.get(MSCourseNode.CONFIG_KEY_HAS_COMMENT_FIELD);
if (cf == null) cf = Boolean.TRUE;
commentFlag.select("xx", cf.booleanValue());
diff --git a/src/main/java/org/olat/course/nodes/ms/_content/edit.html b/src/main/java/org/olat/course/nodes/ms/_content/edit.html
index f6edf2d956d59609caaa955801c0b808df694ef3..4dac543caf273c4af065ca1a169aa127e191991c 100644
--- a/src/main/java/org/olat/course/nodes/ms/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/ms/_content/edit.html
@@ -1,18 +1,21 @@
<fieldset>
- <legend>$r.translate("form.configuration")</legend>
- $r.contextHelpWithWrapper("org.olat.course.nodes.ms","ced-ms.html","help.hover.ms-conf")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.nodes.ms","ced-ms.html","help.hover.ms-conf")
+ $r.translate("form.configuration")</legend>
+
#if ($hasLogEntries)
#if ($isOverwriting)
- <p>
+ <div class="o_warning">
<i>$r.translate("scoring.overwriting.note")</i>
- </p>
+ </div>
#else
- <p>
+ <div class="o_warning">
<i>$r.translate("scoring.overwriting")</i>
- </p>
- $r.render("scoring.config.enable.button")
+ </div>
+ <div class="o_button_group">
+ $r.render("scoring.config.enable.button")
+ </div>
#end
#end
- $r.render("mseditform")
</fieldset>
+$r.render("mseditform")
diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java
index 4b00332a7a6c9d582d759b8894ef06bb208f54e7..beb6913034f480be3f87e5b4c8ec55cb8442c7f3 100644
--- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java
+++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java
@@ -119,6 +119,7 @@ public class PortfolioConfigForm extends FormBasicController {
previewMapLink = uifactory.addFormLink("preview", "selected.map", "selected.map", formLayout, Link.LINK);
previewMapLink.setCustomEnabledLinkCSS("o_preview");
+ previewMapLink.setIconLeftCSS("o_icon o_icon-fw o_icon_preview");
((Link)previewMapLink.getComponent()).setCustomDisplayText(name);
previewMapLink.setVisible(map != null);
previewMapLink.setElementCssClass("o_sel_preview_map");
diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxForm.java b/src/main/java/org/olat/course/nodes/ta/DropboxForm.java
index e8421d07e7b367d0dbd45eb21a2da08f3efa9fee..945108645c47c5fe4942439ba3b043660a47d0fe 100644
--- a/src/main/java/org/olat/course/nodes/ta/DropboxForm.java
+++ b/src/main/java/org/olat/course/nodes/ta/DropboxForm.java
@@ -113,7 +113,7 @@ public class DropboxForm extends FormBasicController {
Boolean enableMail = (Boolean)config.get(TACourseNode.CONF_DROPBOX_ENABLEMAIL);
confirmation.setMandatory(enableMail);
- enablemail = uifactory.addCheckboxesVertical("enablemail", "form.dropbox.enablemail", formLayout, new String[]{"xx"}, new String[]{null}, 1);
+ enablemail = uifactory.addCheckboxesHorizontal("enablemail", "form.dropbox.enablemail", formLayout, new String[]{"xx"}, new String[]{null});
enablemail.select("xx", enableMail != null ? enableMail.booleanValue() : true);
enablemail.addActionListener(FormEvent.ONCLICK);
diff --git a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
index c4e6c217eedb94cc477b28697dad8945c8a03a3f..1909d6dc9387502b2c503420365906383433536f 100644
--- a/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
+++ b/src/main/java/org/olat/course/nodes/ta/ModulesForm.java
@@ -92,11 +92,11 @@ public class ModulesForm extends FormBasicController {
setFormTitle("form.modules.title");
setFormContextHelp("org.olat.course.nodes.ta","ced-ta-select.html","help.hover.ta-module");
- task = uifactory.addCheckboxesVertical("task", "form.modules.task", formLayout, new String[]{"xx"}, new String[]{""}, 1);
- dropbox = uifactory.addCheckboxesVertical("dropbox", "form.modules.dropbox", formLayout, new String[]{"xx"}, new String[]{""}, 1);
- returnbox = uifactory.addCheckboxesVertical("returnbox", "form.modules.returnbox", formLayout, new String[]{"xx"}, new String[]{""}, 1);
- scoring = uifactory.addCheckboxesVertical("scoring", "form.modules.scoring", formLayout, new String[]{"xx"}, new String[]{""}, 1);
- solution = uifactory.addCheckboxesVertical("solution", "form.modules.sample", formLayout, new String[]{"xx"}, new String[]{""}, 1);
+ task = uifactory.addCheckboxesHorizontal("task", "form.modules.task", formLayout, new String[]{"xx"}, new String[]{""});
+ dropbox = uifactory.addCheckboxesHorizontal("dropbox", "form.modules.dropbox", formLayout, new String[]{"xx"}, new String[]{""});
+ returnbox = uifactory.addCheckboxesHorizontal("returnbox", "form.modules.returnbox", formLayout, new String[]{"xx"}, new String[]{""});
+ scoring = uifactory.addCheckboxesHorizontal("scoring", "form.modules.scoring", formLayout, new String[]{"xx"}, new String[]{""});
+ solution = uifactory.addCheckboxesHorizontal("solution", "form.modules.sample", formLayout, new String[]{"xx"}, new String[]{""});
Boolean cv;
diff --git a/src/main/java/org/olat/course/nodes/ta/_content/edit.html b/src/main/java/org/olat/course/nodes/ta/_content/edit.html
index 6001c085bbce6c0b2c9dfdda79cbbf552f51e5b6..d82413d11ea4dd5aa5780fcff15bfb0a8af7bd26 100644
--- a/src/main/java/org/olat/course/nodes/ta/_content/edit.html
+++ b/src/main/java/org/olat/course/nodes/ta/_content/edit.html
@@ -1,37 +1,37 @@
#if ($r.available("taskCondition"))
<fieldset class="clearfix">
- <legend>$r.translate("task.condition.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ $r.translate("task.condition.title")</legend>
$r.render("taskCondition")
</fieldset>
#end
#if ($r.available("dropCondition"))
<fieldset class="clearfix">
- <legend>$r.translate("dropbox.condition.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ $r.translate("dropbox.condition.title")</legend>
$r.render("dropCondition")
</fieldset>
#end
#if ($r.available("returnboxCondition"))
<fieldset class="clearfix">
- <legend>$r.translate("returnbox.condition.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ $r.translate("returnbox.condition.title")</legend>
$r.render("returnboxCondition")
</fieldset>
#end
#if ($r.available("scoringCondition"))
<fieldset class="clearfix">
- <legend>$r.translate("scoring.condition.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ $r.translate("scoring.condition.title")</legend>
$r.render("scoringCondition")
</fieldset>
#end
#if ($r.available("solutionCondition"))
<fieldset class="clearfix">
- <legend>$r.translate("solution.condition.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-ta-acc.html","help.hover.ta-access")
+ $r.translate("solution.condition.title")</legend>
$r.render("solutionCondition")
</fieldset>
#end
diff --git a/src/main/java/org/olat/course/nodes/ta/_content/editScoring.html b/src/main/java/org/olat/course/nodes/ta/_content/editScoring.html
index b63331089482f2120ead41c1fd08111ea83e7f1b..2b634a2183e04d8d62986619a370c13e45b0b98f 100644
--- a/src/main/java/org/olat/course/nodes/ta/_content/editScoring.html
+++ b/src/main/java/org/olat/course/nodes/ta/_content/editScoring.html
@@ -1,19 +1,20 @@
<fieldset>
- <legend>$r.translate("form.configuration")</legend>
- $r.contextHelpWithWrapper("org.olat.course.nodes.ms","ced-ms.html","help.hover.ms-conf")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.nodes.ms","ced-ms.html","help.hover.ms-conf")
+ $r.translate("form.configuration")</legend>
+
#if ($hasLogEntries)
#if ($isOverwriting)
- <p>
+ <div class="o_warning">
<i>$r.translate("scoring.overwriting.note")</i>
- </p>
+ </div>
#else
- <p>
+ <div class="o_warning">
<i>$r.translate("scoring.overwriting")</i>
- </p>
- <p>
+ </div>
+ <div class="o_button_group">
$r.render("scoring.config.enable.button")
- </p>
+ </div>
#end
#end
- $r.render("scoringController")
</fieldset>
+$r.render("scoringController")
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/ta/_content/editSolutionFolder.html b/src/main/java/org/olat/course/nodes/ta/_content/editSolutionFolder.html
index 1273ae8f7f4774e0e4405e38c932c90db9e32c5f..400664c737faadd709b304e702a637fa5ec350cb 100644
--- a/src/main/java/org/olat/course/nodes/ta/_content/editSolutionFolder.html
+++ b/src/main/java/org/olat/course/nodes/ta/_content/editSolutionFolder.html
@@ -1,5 +1,5 @@
<fieldset>
- <legend>$r.translate("info.solutionFolder")</legend>
- $r.contextHelpWithWrapper("org.olat.course.nodes.ta","ced-ta-sol.html","help.hover.ta-sol")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.nodes.ta","ced-ta-sol.html","help.hover.ta-sol")
+ $r.translate("info.solutionFolder")</legend>
$r.render("link.solutionFolder")
</fieldset>
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/ta/_content/editTask.html b/src/main/java/org/olat/course/nodes/ta/_content/editTask.html
index dad9805022085a0acb92e56709faa05a6af093fd..0fe79cae7f2d1338425170d09e2688a7b6a0d5dc 100644
--- a/src/main/java/org/olat/course/nodes/ta/_content/editTask.html
+++ b/src/main/java/org/olat/course/nodes/ta/_content/editTask.html
@@ -1,10 +1,10 @@
-<fieldset>
- <legend>$r.translate("form.taskfolder.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.nodes.ta","ced-ta-upl.html","help.hover.ta-upl")
- $r.render("taskfolder")
+<fieldset class="o_block_bottom">
+ <legend>$r.contextHelpWithWrapper("org.olat.course.nodes.ta","ced-ta-upl.html","help.hover.ta-upl")
+ $r.translate("form.taskfolder.title")</legend>
+ $r.render("taskfolder")
</fieldset>
<fieldset>
- <legend>$r.translate("form.task.title")</legend>
- $r.contextHelpWithWrapper("org.olat.course.nodes.ta","ced-ta-assign.html","help.hover.ta-conf")
+ <legend>$r.contextHelpWithWrapper("org.olat.course.nodes.ta","ced-ta-assign.html","help.hover.ta-conf")
+ $r.translate("form.task.title")</legend>
$r.render("taskform")
</fieldset>
\ No newline at end of file