OO-1068: bootstrapifiy linkliste editor, easy rules, mail editor course element, quota...

src/main/java/de/bps/course/nodes/ll/LLEditController.java

@@ -71,7 +71,7 @@ public class LLEditController extends ActivateableTabbableDefaultController impl
 		this.moduleConfiguration = moduleConfiguration;
 		this.courseNode = courseNode;
 
-		editVc = this.createVelocityContainer("edit");
+		editVc = createVelocityContainer("edit");
 
 		Condition accessCondition = courseNode.getPreConditionAccess();
 		accessibilityCondContr = new ConditionEditController(ureq, wControl,

src/main/java/de/bps/course/nodes/ll/LLEditForm.java

@@ -37,7 +37,6 @@ import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElem
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormEvent;
-import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.components.form.flexible.impl.elements.FormLinkImpl;
 import org.olat.core.gui.components.form.flexible.impl.elements.FormSubmit;
 import org.olat.core.gui.components.form.flexible.impl.elements.ItemValidatorProvider;
@@ -78,7 +77,6 @@ public class LLEditForm extends FormBasicController {
 	private List<FormLink> lCustomMediaButtonList;
 	private List<LLModel> linkList;
 	private List<FormLink> lAddButtonList;
-	private FormLayoutContainer titleContainer;
 	private long counter = 0;
 	private MediaChooserController mediaChooserController;
 	private CloseableModalController mediaDialogBox;
@@ -86,28 +84,28 @@ public class LLEditForm extends FormBasicController {
 	private final CourseEnvironment courseEnv;
 
 	public LLEditForm(UserRequest ureq, WindowControl wControl, ModuleConfiguration moduleConfig, CourseEnvironment courseEnv) {
-		super(ureq, wControl);
+		super(ureq, wControl, "editForm");
 		this.moduleConfig = moduleConfig;
 		// read existing links from config
 		linkList = new ArrayList<LLModel>((List<LLModel>) moduleConfig.get(LLCourseNode.CONF_LINKLIST));
 		// list of all link target text fields
-		this.lTargetInputList = new ArrayList<TextElement>(linkList.size());
+		lTargetInputList = new ArrayList<TextElement>(linkList.size());
 		// list of all link html target text fields
-		this.lHtmlTargetInputList = new ArrayList<MultipleSelectionElement>(linkList.size());
+		lHtmlTargetInputList = new ArrayList<MultipleSelectionElement>(linkList.size());
 		// list of all link description text fields
-		this.lDescriptionInputList = new ArrayList<TextElement>(linkList.size());
+		lDescriptionInputList = new ArrayList<TextElement>(linkList.size());
 		// list of all link comment text fields
-		this.lCommentInputList = new ArrayList<TextElement>(linkList.size());
-	// list of all link add action buttons
-		this.lAddButtonList = new ArrayList<FormLink>(linkList.size());
+		lCommentInputList = new ArrayList<TextElement>(linkList.size());
+		// list of all link add action buttons
+		lAddButtonList = new ArrayList<FormLink>(linkList.size());
 		// list of all link deletion action buttons
-		this.lDelButtonList = new ArrayList<FormLink>(linkList.size());
+		lDelButtonList = new ArrayList<FormLink>(linkList.size());
 		//list of all custom media buttons
-		this.lCustomMediaButtonList = new ArrayList<FormLink>(linkList.size());
+		lCustomMediaButtonList = new ArrayList<FormLink>(linkList.size());
 		
 		this.courseEnv = courseEnv;
 
-		initForm(this.flc, this, ureq);
+		initForm(ureq);
 	}
 
 	/**
@@ -261,28 +259,23 @@ public class LLEditForm extends FormBasicController {
 	 */
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-
-		titleContainer = FormLayoutContainer.createCustomFormLayout("titleLayout", getTranslator(), velocity_root + "/editForm.html");
-		formLayout.add(titleContainer);
 		// create gui elements for all links
 		for (int i = 0; i < linkList.size(); i++) {
 			LLModel link = linkList.get(i);
 			addNewFormLink(i, link);
 		}
 
-		titleContainer.contextPut("linkList", linkList);
-		titleContainer.contextPut("lTargetInputList", lTargetInputList);
-		titleContainer.contextPut("lHtmlTargetInputList", lHtmlTargetInputList);
-		titleContainer.contextPut("lDescriptionInputList", lDescriptionInputList);
-		titleContainer.contextPut("lCommentInputList", lCommentInputList);
-		titleContainer.contextPut("lAddButtonList", lAddButtonList);
-		titleContainer.contextPut("lDelButtonList", lDelButtonList);
-		titleContainer.contextPut("lCustomMediaButtonList", lCustomMediaButtonList);
-
-		subm = new FormSubmit("subm", "submit");
-
+		flc.contextPut("linkList", linkList);
+		flc.contextPut("lTargetInputList", lTargetInputList);
+		flc.contextPut("lHtmlTargetInputList", lHtmlTargetInputList);
+		flc.contextPut("lDescriptionInputList", lDescriptionInputList);
+		flc.contextPut("lCommentInputList", lCommentInputList);
+		flc.contextPut("lAddButtonList", lAddButtonList);
+		flc.contextPut("lDelButtonList", lDelButtonList);
+		flc.contextPut("lCustomMediaButtonList", lCustomMediaButtonList);
+		
+		subm = uifactory.addFormSubmitButton("submit", formLayout);
 		formLayout.add(subm);
-
 	}
 
 	/**
@@ -302,7 +295,7 @@ public class LLEditForm extends FormBasicController {
 	 */
 	private void addNewFormLink(int index, final LLModel link) {
 		// add link target
-		TextElement lTarget = uifactory.addTextElement("target" + counter, null, -1, link.getTarget(), titleContainer);
+		TextElement lTarget = uifactory.addTextElement("target" + counter, null, -1, link.getTarget(), flc);
 		lTarget.clearError();
 		lTarget.setEnabled(!link.isIntern());
 		lTarget.setDisplaySize(40);
@@ -326,13 +319,13 @@ public class LLEditForm extends FormBasicController {
 		lTarget.setUserObject(link);
 		lTargetInputList.add(index, lTarget);
 		//add html target
-		MultipleSelectionElement htmlTargetSelection = uifactory.addCheckboxesHorizontal("html_target" + counter, titleContainer, new String[]{BLANK_KEY}, new String[]{""});
+		MultipleSelectionElement htmlTargetSelection = uifactory.addCheckboxesHorizontal("html_target" + counter, flc, new String[]{BLANK_KEY}, new String[]{""});
 		htmlTargetSelection.setUserObject(link);
 		htmlTargetSelection.select(BLANK_KEY, "_blank".equals(link.getHtmlTarget()));
 		lHtmlTargetInputList.add(index, htmlTargetSelection);
 		
 		// add link description
-		TextElement lDescription = uifactory.addTextElement("description" + counter, null, -1, link.getDescription(), titleContainer);
+		TextElement lDescription = uifactory.addTextElement("description" + counter, null, -1, link.getDescription(), flc);
 		lDescription.clearError();
 		lDescription.setDisplaySize(20);
 		lDescription.setNotEmptyCheck("ll.table.description.error");
@@ -341,7 +334,7 @@ public class LLEditForm extends FormBasicController {
 		lDescriptionInputList.add(index, lDescription);
 		
 		// add link comment
-		TextElement lComment =uifactory.addTextElement("comment" + counter, null, -1, link.getComment(), titleContainer);
+		TextElement lComment =uifactory.addTextElement("comment" + counter, null, -1, link.getComment(), flc);
 		lComment.setDisplaySize(20);
 		lComment.setUserObject(link);
 		lCommentInputList.add(index, lComment);
@@ -349,18 +342,18 @@ public class LLEditForm extends FormBasicController {
 		// add link add action button
 		FormLink addButton = new FormLinkImpl("add" + counter, "add" + counter, "ll.table.add", Link.BUTTON_SMALL);
 		addButton.setUserObject(link);
-		titleContainer.add(addButton);
+		flc.add(addButton);
 		lAddButtonList.add(index, addButton);
 		// add link deletion action button
 		FormLink delButton = new FormLinkImpl("delete" + counter, "delete" + counter, "ll.table.delete", Link.BUTTON_SMALL);
 		delButton.setUserObject(link);
-		titleContainer.add(delButton);
+		flc.add(delButton);
 		lDelButtonList.add(index, delButton);
 		// custom media action button
 		FormLink mediaButton = new FormLinkImpl("media" + counter, "media" + counter, "  ", Link.NONTRANSLATED);
-		mediaButton.setCustomEnabledLinkCSS("b_small o_ll_browse");
+		mediaButton.setIconLeftCSS("o_icon o_icon_browse o_icon-lg");
 		mediaButton.setUserObject(link);
-		titleContainer.add(mediaButton);
+		flc.add(mediaButton);
 		lCustomMediaButtonList.add(index, mediaButton);
 		
 		// increase the counter to enable unique component names
@@ -377,42 +370,42 @@ public class LLEditForm extends FormBasicController {
 				break;
 			}
 		}
-		titleContainer.remove(lTargetInputList.remove(i));
+		flc.remove(lTargetInputList.remove(i));
 		for (i = 0; i < lHtmlTargetInputList.size(); i++) {
 			if (lHtmlTargetInputList.get(i).getUserObject().equals(link)) {
 				break;
 			}
 		}
-		titleContainer.remove(lHtmlTargetInputList.remove(i));
+		flc.remove(lHtmlTargetInputList.remove(i));
 		for (i = 0; i < lDescriptionInputList.size(); i++) {
 			if (lDescriptionInputList.get(i).getUserObject().equals(link)) {
 				break;
 			}
 		}
-		titleContainer.remove(lDescriptionInputList.remove(i));
+		flc.remove(lDescriptionInputList.remove(i));
 		for (i = 0; i < lCommentInputList.size(); i++) {
 			if (lCommentInputList.get(i).getUserObject().equals(link)) {
 				break;
 			}
 		}
-		titleContainer.remove(lCommentInputList.remove(i));
+		flc.remove(lCommentInputList.remove(i));
 		for (i = 0; i < lAddButtonList.size(); i++) {
 			if (lAddButtonList.get(i).getUserObject().equals(link)) {
 				break;
 			}
 		}
-		titleContainer.remove(lAddButtonList.remove(i));
+		flc.remove(lAddButtonList.remove(i));
 		for (i = 0; i < lDelButtonList.size(); i++) {
 			if (lDelButtonList.get(i).getUserObject().equals(link)) {
 				break;
 			}
 		}
-		titleContainer.remove(lDelButtonList.remove(i));
+		flc.remove(lDelButtonList.remove(i));
 		for (i = 0; i < lCustomMediaButtonList.size(); i++) {
 			if (lCustomMediaButtonList.get(i).getUserObject().equals(link)) {
 				break;
 			}
 		}
-		titleContainer.remove(lCustomMediaButtonList.remove(i));
+		flc.remove(lCustomMediaButtonList.remove(i));
 	}
 }

src/main/java/de/bps/course/nodes/ll/_content/edit.html

-<div class="o_form_wrapper">
-	<fieldset>
-		<legend>$r.translate("config.header")</legend>
-		<div class="form_shift_left">$r.render("llEditForm")</div>
-	</fieldset>
-</div>
+<fieldset>
+	<legend>$r.translate("config.header")</legend>
+	$r.render("llEditForm")
+</fieldset>

src/main/java/de/bps/course/nodes/ll/_content/editForm.html

-##
-<table>
+<table class="o_table table">
 	<thead>
 		<tr>
-			<td>$r.translate("ll.table.target")</td>
-			#if($lCustomMediaButtonList) <td></td> #end
-			<td>$r.translate("ll.table.html_target")</td>
-			<td>$r.translate("ll.table.description")</td>
-			<td colspan="2">$r.translate("ll.table.comment")</td>
+			<th>$r.translate("ll.table.target")</th>
+			#if($lCustomMediaButtonList) <th></th> #end
+			<th>$r.translate("ll.table.html_target")</th>
+			<th>$r.translate("ll.table.description")</th>
+			<th>$r.translate("ll.table.comment")</th>
+			<th></th>
 		</tr>
 	</thead>
 	#foreach($link in $linkList)
@@ -15,18 +15,6 @@
 		#set( $targetErr =	$target + "_ERROR" )
 		#set( $descr =	$lDescriptionInputList.get($iter).getName() )
 		#set( $descrErr = $descr + "_ERROR" )
-		#set( $hasError = "false" )
-
-		<tr>
-			<td>
-				<div class="b_small">$r.render($targetErr)</div>
-			</td>
-			<td>
-				<div class="b_small">$r.render($descrErr)</div>
-			</td>
-			<td>&nbsp;</td>
-		</tr>
-
 		<tr>
 			<td>$r.render($lTargetInputList.get($iter).getName())</td>
 			#if($lCustomMediaButtonList) <td>$r.render($lCustomMediaButtonList.get($iter).getName())</td> #end
@@ -38,5 +26,16 @@
 				$r.render($lDelButtonList.get($iter).getName())
 			</td>
 		</tr>
+		#if($f.hasError($target) || $f.hasError($descr))
+		<tr>
+			<td>$r.render($targetErr)</td>
+			#if($lCustomMediaButtonList) <td></td> #end
+			<td></td>
+			<td>$r.render($descrErr)</td>
+			<td></td>
+			<td></td>
+		</tr>
+		#end
 	#end
 </table>
+<div class="o_button_group">$r.render("submit")</div>

src/main/java/org/olat/admin/quota/GenericQuotaEditController.java

@@ -91,7 +91,7 @@ public class GenericQuotaEditController extends BasicController {
 		} else {
 			initQuotaForm(ureq, currentQuota);			
 		}
-	  putInitialPanel(myContent);
+		putInitialPanel(myContent);
 	}
 
 	/**

src/main/java/org/olat/admin/quota/_content/edit.html

@@ -2,7 +2,7 @@
 	<fieldset class="b_clearfix">
 		<legend>$r.translate("qf.edit")</legend>
 		#if(!$isEmptyQuota)
-		<div class="b_float_right">$r.render("qf.del")</div>
+		<div class="o_button_group o_button_group_right">$r.render("qf.del")</div>
 		#end
 		$r.render("quotaform")
 	</fieldset>
@@ -10,19 +10,18 @@
 	<fieldset class="b_clearfix">
 		<legend>$r.translate("qf.new")</legend>
 		#if($r.available("qf.new"))
-			<div class="b_float_right">$r.render("qf.new")</div>
+			<div class="o_button_group o_button_group_right">$r.render("qf.new")</div>
 		#end
-		$r.translate("qf.noquota")
+		<div class="o_info">$r.translate("qf.noquota")</div>
 		#if ($modalMode)
 			&nbsp;
 			$r.render("cancel")
 		#end
 	</fieldset>	
 #end
-
-<fieldset>
-	<legend>$r.translate("qd.title")</legend>
-	<table class="b_table b_grid">
+<div class="panel panel-default">
+	<div class="panel-heading">$r.translate("qd.title")</div>
+	<table class="o_table table">
 		<thead>
 			<tr><th>$r.translate("qd.title")</th><th>$r.translate("qf.quota")</th><th>$r.translate("qf.limit")</th></tr>
 		</thead>
@@ -36,4 +35,4 @@
 			<tr><td>$r.translate("qd.feeds")</td><td>$feeds.getQuotaKB()</td><td>$feeds.getUlLimitKB()</td></tr>
 		</tbody>
 	</table>
-</fieldset>
\ No newline at end of file
+</div>
\ No newline at end of file

src/main/java/org/olat/course/condition/ConditionConfigEasyController.java

@@ -736,18 +736,19 @@ public class ConditionConfigEasyController extends FormBasicController implement
 		/*
 		 * yes / no chooser defines if learner do not see the building block at all
 		 */
-		attributeSwitch = uifactory.addCheckboxesVertical("attributeSwitch", "form.easy.attributeSwitch", formLayout, new String[] { "ison" }, new String[] { "" }, 1);
-		attributeSwitch.select("ison", validatedCondition.getAttributeConditions()!=null);
+		String[] values = new String[]{ translate("form.easy.attributeSwitch") };
+		attributeSwitch = uifactory.addCheckboxesHorizontal("attributeSwitch", null, formLayout, new String[] { "ison" }, values);
+		attributeSwitch.select("ison", validatedCondition.getAttributeConditions() != null);
 		// register for on click event to hide/disable other elements
 		attributeSwitch.addActionListener(FormEvent.ONCLICK);
 		// rules are later added
 
 		// add attribute connector: AND or OR
-		final String[] attributebconnectorValues = new String[] { getTranslator().translate("form.easy.attributebconnector.and"),getTranslator().translate("form.easy.attributebconnector.or") };
+		final String[] attributebconnectorValues = new String[] { translate("form.easy.attributebconnector.and"), translate("form.easy.attributebconnector.or") };
 		attributeBconnector = uifactory.addRadiosHorizontal("attributeBconnector", "form.easy.attributebconnector", formLayout, new String[] { BCON_VAL_AND, BCON_VAL_OR }, attributebconnectorValues);
 		if(validatedCondition.isConditionsConnectorIsAND()){
 			attributeBconnector.select(BCON_VAL_AND, true);
-		}else{
+		} else {
 			attributeBconnector.select(BCON_VAL_OR, true);
 		}
 		
@@ -758,7 +759,7 @@ public class ConditionConfigEasyController extends FormBasicController implement
 		listenTo(attribteRowAdderSubform);
 		flc.put("attribteRowAdderSubform", attribteRowAdderSubform.getInitialComponent());
 		if (validatedCondition.getAttributeConditions() != null && validatedCondition.getAttributeConditions().size() > 0) {
-			this.attribteRowAdderSubform.setAttributeConditions(validatedCondition.getAttributeConditions());
+			attribteRowAdderSubform.setAttributeConditions(validatedCondition.getAttributeConditions());
 		}
 	}
 	
@@ -768,9 +769,9 @@ public class ConditionConfigEasyController extends FormBasicController implement
 	 */
 	private boolean isDateGroupAssessmentOAttributeSwitchOn() {
 		return dateSwitch.getSelectedKeys().size() == 1 
-		|| groupSwitch.getSelectedKeys().size() == 1 
-		|| assessmentSwitch.getSelectedKeys().size() == 1
-		||(attributeSwitch!=null && attributeSwitch.getSelectedKeys().size()==1);
+				|| groupSwitch.getSelectedKeys().size() == 1 
+				|| assessmentSwitch.getSelectedKeys().size() == 1
+				||(attributeSwitch!=null && attributeSwitch.getSelectedKeys().size()==1);
 	}
 	
 	/**
@@ -1154,7 +1155,7 @@ public class ConditionConfigEasyController extends FormBasicController implement
 	 */
 	private void addEasyGroupAreaChoosers(FormItemContainer formLayout) {
 
-		groupSubContainer = FormLayoutContainer.createDefaultFormLayout("groupSubContainer", getTranslator());
+		groupSubContainer = FormLayoutContainer.createBareBoneFormLayout("groupSubContainer", getTranslator());
 		formLayout.add(groupSubContainer);
 
 		List<Long> groupKeyList = validatedCondition.getEasyModeGroupAccessIdList();
@@ -1172,26 +1173,24 @@ public class ConditionConfigEasyController extends FormBasicController implement
 		groupSwitch.addActionListener(FormEvent.ONCLICK);
 		
 		//groups
-		groupChooseSubContainer = FormLayoutContainer.createHorizontalFormLayout("groupChooseSubContainer", getTranslator());
-		groupChooseSubContainer.setLabel("form.easy.group", null);
+		groupChooseSubContainer = FormLayoutContainer.createDefaultFormLayout("groupChooseSubContainer", getTranslator());
 		groupSubContainer.add(groupChooseSubContainer);		
 
-		easyGroupList = uifactory.addStaticTextElement("groupList", null, groupInitVal, groupChooseSubContainer);
+		easyGroupList = uifactory.addStaticTextElement("groupList", "form.easy.group", groupInitVal, groupChooseSubContainer);
 		easyGroupList.setUserObject(groupKeyList);
 
-		chooseGroupsLink = uifactory.addFormLink("choose", groupChooseSubContainer,"b_form_groupchooser");
-		createGroupsLink = uifactory.addFormLink("create", groupChooseSubContainer,"b_form_groupchooser");	
+		chooseGroupsLink = uifactory.addFormLink("choose", groupChooseSubContainer, "b_form_groupchooser");
+		createGroupsLink = uifactory.addFormLink("create", groupChooseSubContainer, "b_form_groupchooser");	
 		
 		//areas
-		areaChooseSubContainer = FormLayoutContainer.createHorizontalFormLayout("areaChooseSubContainer", getTranslator());
-		areaChooseSubContainer.setLabel("form.easy.area", null);
+		areaChooseSubContainer = FormLayoutContainer.createDefaultFormLayout("areaChooseSubContainer", getTranslator());
 		groupSubContainer.add(areaChooseSubContainer);		
 
-		easyAreaList = uifactory.addStaticTextElement("groupList", null, areaInitVal, areaChooseSubContainer);
+		easyAreaList = uifactory.addStaticTextElement("groupList", "form.easy.area", areaInitVal, areaChooseSubContainer);
 		easyAreaList.setUserObject(areaKeyList);
 		
-		chooseAreasLink = uifactory.addFormLink("choose", areaChooseSubContainer,"b_form_groupchooser");
-		createAreasLink = uifactory.addFormLink("create", areaChooseSubContainer,"b_form_groupchooser");
+		chooseAreasLink = uifactory.addFormLink("choose", areaChooseSubContainer, "b_form_groupchooser");
+		createAreasLink = uifactory.addFormLink("create", areaChooseSubContainer, "b_form_groupchooser");
 		
 		updateGroupsAndAreasCheck();
 	}

src/main/java/org/olat/course/condition/_content/condedit.html

 #if ($isExpertMode)
-	<div class="b_clearfix">
-		<div class="b_float_right">$r.render("command.activate.easyMode")</div>
+	<div class="o_button_group o_button_group_right">
+		$r.render("command.activate.easyMode")
 	</div>
 	$r.render("conditionExpertForm")
 #else
-	<div class="b_clearfix">
-		<div class="b_float_right">$r.render("command.activate.expertMode")</div>
+	<div class="o_button_group o_button_group_right">
+		$r.render("command.activate.expertMode")
 	</div>
 	$r.render("conditionEasyForm")
 #end

src/main/java/org/olat/course/condition/_content/defaultaccessedit.html

-<fieldset class="b_clearfix">
-	<legend>$title</legend>
-	$r.contextHelpWithWrapper("org.olat.course.editor","ced-acc.html","help.hover.acc")	
-	<div class="b_floatscrollbox">
-		$r.render("defaultAccessConditionView")
-	</div>
+<fieldset>
+	<legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-acc.html","help.hover.acc")
+	$title</legend>
+	$r.render("defaultAccessConditionView")
 </fieldset>
-
 #if($renderPW)
 	<fieldset>
-		<legend>$r.translate("password.field")</legend>
-		$r.contextHelpWithWrapper("org.olat.course.condition.additionalconditions","ced-password.html","help.hover.password")	
-		<div class="b_clearfix">
-			$r.render("pwcond")
-		</div>
+		<legend>$r.contextHelpWithWrapper("org.olat.course.condition.additionalconditions","ced-password.html","help.hover.password")
+		$r.translate("password.field")</legend>
+		$r.render("pwcond")
 	</fieldset>
 #end
\ No newline at end of file

src/main/java/org/olat/course/condition/_content/easycondedit.html

-<div class="b_form b_clearfix">
+<div class="o_form">
 ## block this node from learner
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-        <div class="b_form_element">$r.render("coachExclusive")</div>
-        <div class="b_form_element_label">$r.render("coachExclusive_LABEL")</div>        
-	</div>
+	$r.render("coachExclusive")
 ## date switch, from and to date
 	  <!-- dateswitch -->
       <!-- generates -->
       <!-- Date dependent?:| | [.] | | from | |[.....][chooser] |
                            | |     | | to   | |[.....][chooser] |-->	
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-        <div class="b_form_element">$r.render("dateSwitch")</div>
-		<div class="b_form_element_label">$r.render("dateSwitch_LABEL")</div>
-	</div>
+	$r.render("dateSwitch")
 	#if ($f.isVisible("dateSubContainer"))
-	<div class="b_form_subform">
 		$r.render("dateSubContainer")
-		$r.render("dateSubContainer_ERROR")
-	</div>
+		<div class="col-sm-9 col-sm-offset-3">$r.render("dateSubContainer_ERROR")</div>
 	#end
 ## group switch, group and group area listing	
       <!-- groupswitch -->
       <!-- generates -->
       <!-- Group dependent?:| | [.] | | Groups | |[.....][chooser] |
         	                | |     | | Areas  | |[.....][chooser] | -->
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-        <div class="b_form_element">$r.render("groupSwitch")</div>
-		<div class="b_form_element_label">$r.render("groupSwitch_LABEL")</div>
-	</div>
+	$r.render("groupSwitch")
 	#if ($f.isVisible("groupSubContainer"))
-	<div class="b_form_subform">
 		$r.render("groupSubContainer")
-		$r.render("groupSubContainer_ERROR") 
-	</div>
+		<div class="col-sm-9 col-sm-offset-3">$r.render("groupSubContainer_ERROR")</div>
 	#end
 ## assessment switch, cutvalue or score switch and score value	
       <!-- assessswitch -->
@@ -41,44 +28,26 @@
                              | |     | |               | X SCORE  | |
         	                 | |     | | Kursbaustein  | [.....V] | |
         	                 | |     | | Cut value     | [...]    | |-->
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-        <div class="b_form_element">$r.render("assessmentSwitch")</div>
-		<div class="b_form_element_label">$r.render("assessmentSwitch_LABEL")</div>
-	</div>
-#if ($f.isVisible("assessSubContainer"))
-	<div class="b_form_subform">
+	$r.render("assessmentSwitch")
+	#if ($f.isVisible("assessSubContainer"))
 		$r.render("assessSubContainer")
-	</div>
-#end    
+	#end    
 
 ## attribute switch, shibboleth attribute choosers
 #if ($shibbolethEnabled)
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-        <div class="b_form_element">$r.render("attributeSwitch")</div>
-		<div class="b_form_element_label">$r.render("attributeSwitch_LABEL")</div>
-	</div>
+	$r.render("attributeSwitch")
 	#if ($f.isVisible("attributeBconnector"))
-	<div class="b_form_subform">
-		<div class="b_form_element_wrapper b_form_vertical b_clearfix">
-	       	<div class="b_form_element_label b_form_vertical">	$r.render("attributeBconnector_LABEL")</div>
-			<div class="b_form_element b_form_vertical b_small">$r.render("attributeBconnector")</div>
-		</div>
+	<div class="col-sm-11 col-sm-offset-1">
+		$r.render("attributeBconnector")
 		$r.render("attribteRowAdderSubform")
 	</div>
 	#end  
 #end
 
 ## apply rules also for coach
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-        <div class="b_form_element">$r.render("applyRulesForCoach")</div>
-        <div class="b_form_element_label">$r.render("applyRulesForCoach_LABEL")</div>        
-	</div>
+	$r.render("applyRulesForCoach")
 ## submit button
-	<div class="b_form_subform">
-		<div class="b_button_group">
-## PB:FIXME - cancel (revert) button does not really reset the whole form
-##			$r.render("cancel")
-			$r.render("subm")
-		</div>
+	<div class="o_button_group">
+		$r.render("subm")
 	</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/course/condition/additionalconditions/_content/passwordEdit.html

-<div class="b_form b_clearfix">
-	<div class="b_form_element_wrapper b_form_element_switch b_clearfix">
-		<div class="b_form_element">
-			<div class="b_form_element_switch">$r.render("passwordSwitch")</div>
-	       <div class="b_form_element_label">$r.render("passwordSwitch_LABEL")</div>  
-		</div>     
-	</div>
+<div class="o_form form-horizontal">
+	$r.render("passwordSwitch")
 	#if ($f.isVisible("passwordField"))
-		<div class="b_form_subform">
-			#if($f.hasError("passwordField"))
-				<div class="b_form_element_wrapper b_form_error b_clearfix">		
-			#else
-				<div class="b_form_element_wrapper b_clearfix">
-			#end
-
-				$r.render("passwordField")
-				$r.render("passwordField_ERROR")
-			</div>
+	<div class="form-group">
+		<div class="col-sm-11 col-sm-offset-1">
+			$r.render("passwordField")
+			$r.render("passwordField_ERROR")
 		</div>
+	</div>
 	#end
-	<div class="b_form_subform">
-		<div class="b_button_group">
-			$r.render("save") 
-		</div>
+	<div class="o_block o_button_group">
+		$r.render("save")
 	</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/course/editor/_content/noAccessExplEdit.html

-<fieldset class="b_clearfix">
-	<legend>$r.translate("condition.noAccessExplanation.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.editor","ced-noAcc-expl.html","help.hover.noAcc")	
+<fieldset>
+	<legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-noAcc-expl.html","help.hover.noAcc")
+	$r.translate("condition.noAccessExplanation.title")</legend>
 	$r.render("noAccexplForm")
 </fieldset>

src/main/java/org/olat/course/editor/_content/visibilityedit.html

 <fieldset class="b_clearfix">
-	<legend>$r.translate("condition.visibility.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.editor","ced-vis.html","help.hover.vis")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.editor","ced-vis.html","help.hover.vis")
+	$r.translate("condition.visibility.title")</legend>
 	$r.render("visibilityCondition")
 </fieldset>
 $r.render("noAccessExplanationComp")
\ No newline at end of file

src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java

@@ -106,7 +106,7 @@ public class BCCourseNodeEditController extends ActivateableTabbableDefaultContr
 		this.listenTo(downloaderCondContr);
 		accessabiliryContent.put("downloadCondition", downloaderCondContr.getInitialComponent());
 		
-		folderContent = this.createVelocityContainer("folder");
+		folderContent = createVelocityContainer("folder");
 		vfButton = LinkFactory.createButton("folder.view", folderContent, this);
 		
 		if ((ureq.getUserSession().getRoles().isOLATAdmin()) | ((ureq.getUserSession().getRoles().isInstitutionalResourceManager()))) {

src/main/java/org/olat/course/nodes/bc/_content/folder.html

 <fieldset>
-	<legend>$r.translate("info.folder")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.bc","ced-bc.html","help.hover.bc")
-	$r.render("folder.view")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.bc","ced-bc.html","help.hover.bc")
+	$r.translate("info.folder")</legend>
+	<div class="o_block">$r.render("folder.view")</div>
  </fieldset>
 #if($editQuota)
 <fieldset>

src/main/java/org/olat/course/nodes/co/COConfigForm.java

@@ -38,7 +38,6 @@ import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.FormLink;
 import org.olat.core.gui.components.form.flexible.elements.SelectionElement;
-import org.olat.core.gui.components.form.flexible.elements.SpacerElement;
 import org.olat.core.gui.components.form.flexible.elements.StaticTextElement;
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
@@ -86,10 +85,7 @@ public class COConfigForm extends FormBasicController {
 	private SelectionElement coaches;
 	private SelectionElement partips;
 	private FormLayoutContainer coachesAndPartips;
-	
-	private SpacerElement s1, s2, s3;
-	
-	
+
 	private StaticTextElement easyGroupList;
 	private FormLink chooseGroupsLink;
 	private FormLink createGroupsLink;
@@ -103,8 +99,6 @@ public class COConfigForm extends FormBasicController {
 	private AreaSelectionController areaChooseC;
 	private GroupSelectionController groupChooseC;
 	
-	
-	private FormLayoutContainer areaChooseSubContainer, groupChooseSubContainer ;
 	private FormItemContainer groupsAndAreasSubContainer;
 	private FormItemContainer recipentsContainer;
 	
@@ -154,14 +148,12 @@ public class COConfigForm extends FormBasicController {
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
 		if (!wantGroup.isSelected(0) && !wantEmail.isSelected(0)) {
-			s3.setVisible(true);
 			recipentsContainer.setErrorKey("no.recipents.specified", null);
 			return false;
 		}
-		s3.setVisible(false);
 		recipentsContainer.clearError();
 		
-		
+
 		coachesAndPartips.clearError();
 		if (wantGroup.isSelected(0)) {
 			if (!coaches.isSelected(0) && !partips.isSelected(0)) {
@@ -235,7 +227,7 @@ public class COConfigForm extends FormBasicController {
 				FormLayoutContainer errorGroupItemLayout = FormLayoutContainer.createCustomFormLayout(
 						"errorgroupitem", getTranslator(), vc_errorPage);
 
-				groupChooseSubContainer.setErrorComponent(errorGroupItemLayout, this.flc);
+				easyGroupList.setErrorComponent(errorGroupItemLayout, this.flc);
 				// FIXING LINK ONLY IF A DEFAULTCONTEXT EXISTS
 				fixGroupError = new FormLinkImpl("error.fix", "create");
 				// link
@@ -256,10 +248,10 @@ public class COConfigForm extends FormBasicController {
 					fixGroupError.setUserObject(new String[] { csvMissGrps });
 				}
 
-				groupChooseSubContainer.showError(true);
+				easyGroupList.showError(true);
 			} else {
 				// no more errors
-				groupChooseSubContainer.clearError();
+				easyGroupList.clearError();
 			}
 		}
 		if (!isEmpty(easyAreaList)) {
@@ -290,7 +282,7 @@ public class COConfigForm extends FormBasicController {
 						"errorareaitem", getTranslator(), vc_errorPage
 				);
 				
-				areaChooseSubContainer.setErrorComponent(errorAreaItemLayout, this.flc);
+				easyAreaList.setErrorComponent(errorAreaItemLayout, this.flc);
 				// FXINGIN LINK ONLY IF DEFAULT CONTEXT EXISTS
 				fixAreaError = new FormLinkImpl("error.fix", "create");// erstellen
 				// link
@@ -312,9 +304,9 @@ public class COConfigForm extends FormBasicController {
 					fixAreaError.setUserObject(new String[] { csvMissAreas });
 				}
 			
-				areaChooseSubContainer.showError(true);
+				easyAreaList.showError(true);
 			} else {
-				areaChooseSubContainer.clearError();
+				easyAreaList.clearError();
 			}	
 		}
 
@@ -338,8 +330,8 @@ public class COConfigForm extends FormBasicController {
 		}
 			
 		if (retVal) {
-			areaChooseSubContainer.clearError();
-			groupChooseSubContainer.clearError();
+			easyAreaList.clearError();
+			easyGroupList.clearError();
 			groupsAndAreasSubContainer.clearError();
 		}
 		
@@ -436,16 +428,8 @@ public class COConfigForm extends FormBasicController {
 				"coachesAndPartips", getTranslator()
 		);
 		formLayout.add(coachesAndPartips);
-		s1 = uifactory.addSpacerElement("s1", formLayout, true);
-		
-		// groups
-		groupChooseSubContainer = FormLayoutContainer.createHorizontalFormLayout(
-				"groupChooseSubContainer", getTranslator()
-		);
-		groupChooseSubContainer.setLabel("form.message.group", null);
-		
-		formLayout.add(groupChooseSubContainer);
-		
+
+		//groups
 		String groupInitVal;
 		@SuppressWarnings("unchecked")
 		List<Long> groupKeys = (List<Long>)config.get(COEditController.CONFIG_KEY_EMAILTOGROUP_IDS);
@@ -455,20 +439,14 @@ public class COConfigForm extends FormBasicController {
 		}
 		groupInitVal = getGroupNames(groupKeys);
 
-		easyGroupList = uifactory.addStaticTextElement("group", null, groupInitVal, groupChooseSubContainer);
+		easyGroupList = uifactory.addStaticTextElement("group", "form.message.group", groupInitVal, formLayout);
 		easyGroupList.setUserObject(groupKeys);
 		
-		chooseGroupsLink = uifactory.addFormLink("choose", groupChooseSubContainer,"b_form_groupchooser");
-		createGroupsLink = uifactory.addFormLink("create", groupChooseSubContainer,"b_form_groupchooser");	
+		chooseGroupsLink = uifactory.addFormLink("choose", formLayout, "b_form_groupchooser");
+		createGroupsLink = uifactory.addFormLink("create", formLayout, "b_form_groupchooser");	
 
 		hasGroups = businessGroupService.countBusinessGroups(null, cev.getCourseGroupManager().getCourseEntry()) > 0;
-		
-		// areas
-		areaChooseSubContainer = FormLayoutContainer.createHorizontalFormLayout(
-				"areaChooseSubContainer", getTranslator()
-		);
-		areaChooseSubContainer.setLabel("form.message.area", null);
-		formLayout.add(areaChooseSubContainer);		
+	
 		
 		groupsAndAreasSubContainer = FormLayoutContainer.createHorizontalFormLayout("groupSubContainer", getTranslator());
 		formLayout.add(groupsAndAreasSubContainer);
@@ -482,16 +460,14 @@ public class COConfigForm extends FormBasicController {
 		}
 		areaInitVal = getAreaNames(areaKeys);
 
-		easyAreaList = uifactory.addStaticTextElement("area", null, areaInitVal, areaChooseSubContainer);
+		easyAreaList = uifactory.addStaticTextElement("area", "form.message.area", areaInitVal, formLayout);
 		easyAreaList.setUserObject(areaKeys);
 		
-		chooseAreasLink = uifactory.addFormLink("choose", areaChooseSubContainer,"b_form_groupchooser");
-		createAreasLink = uifactory.addFormLink("create", areaChooseSubContainer,"b_form_groupchooser");
+		chooseAreasLink = uifactory.addFormLink("choose", formLayout, "b_form_groupchooser");
+		createAreasLink = uifactory.addFormLink("create", formLayout, "b_form_groupchooser");
 		
 		hasAreas = areaManager.countBGAreasInContext(cev.getCourseGroupManager().getCourseResource()) > 0;
 		
-		s2 = uifactory.addSpacerElement("s2", formLayout, false);
-		
 		wantEmail = uifactory.addCheckboxesVertical("wantEmail", "message.want.email", formLayout, new String[]{"xx"},new String[]{null}, 1);
 		wantEmail.addActionListener(FormEvent.ONCLICK);
 		
@@ -505,8 +481,6 @@ public class COConfigForm extends FormBasicController {
 		teArElEmailToAdresses = uifactory.addTextAreaElement("email", "message.emailtoadresses", -1, 3, 60, true, emailToAdresses, formLayout);
 		teArElEmailToAdresses.setMandatory(true);
 		
-		s3 =uifactory.addSpacerElement("s3", formLayout, true);
-		
 		//for displaying error message in case neither group stuff nor email is selected
 		recipentsContainer = FormLayoutContainer.createHorizontalFormLayout(
 				"recipents", getTranslator()
@@ -537,11 +511,8 @@ public class COConfigForm extends FormBasicController {
 		partips.setVisible(wg);
 		coachesAndPartips.setVisible(wg);
 		
-		groupChooseSubContainer.setVisible(wg);
-		areaChooseSubContainer.setVisible(wg);
-		
-		s1.setVisible(wg);
-		s2.setVisible(wg);
+		easyGroupList.setVisible(wg);
+		easyAreaList.setVisible(wg);
 		
 		if (!wg) {
 			coaches.select("xx", false);

src/main/java/org/olat/course/nodes/en/ENEditController.java

@@ -89,7 +89,7 @@ public class ENEditController extends ActivateableTabbableDefaultController impl
 		this.courseNode = enCourseNode;
 		this.euce = euceP;
 		
-		myContent = this.createVelocityContainer("edit");
+		myContent = createVelocityContainer("edit");
 		doFormInit(ureq);
 
 		// Accessibility precondition

src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java

@@ -43,6 +43,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.components.form.flexible.impl.elements.FormLinkImpl;
 import org.olat.core.gui.components.form.flexible.impl.elements.FormSubmit;
+import org.olat.core.gui.components.link.Link;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
@@ -106,8 +107,6 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 	private NewBGController groupCreateCntrllr;
 	private AreaSelectionController areaChooseC;
 	private GroupSelectionController groupChooseC;
-	private FormLayoutContainer areaChooseSubContainer, groupChooseSubContainer ;
-	private FormItemContainer groupsAndAreasSubContainer;
 	
 	private EventBus singleUserEventCenter;
 	private OLATResourceable groupConfigChangeEventOres;
@@ -189,12 +188,7 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		// groups
-		groupChooseSubContainer = FormLayoutContainer.createHorizontalFormLayout(
-				"groupChooseSubContainer", getTranslator()
-		);
-		groupChooseSubContainer.setLabel("form.groupnames", null);
-		formLayout.add(groupChooseSubContainer);
-		
+
 		String groupInitVal;
 		@SuppressWarnings("unchecked")
 		List<Long> groupKeys = (List<Long>)moduleConfig.get(ENCourseNode.CONFIG_GROUP_IDS);
@@ -208,21 +202,14 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 		}
 		groupInitVal = getGroupNames(groupKeys);
 		
-		easyGroupList = uifactory.addStaticTextElement("group", null, groupInitVal == null ? "" : groupInitVal, groupChooseSubContainer);
+		easyGroupList = uifactory.addStaticTextElement("group", "form.groupnames", groupInitVal == null ? "" : groupInitVal, formLayout);
 		easyGroupList.setUserObject(groupKeys);
 
-		chooseGroupsLink = uifactory.addFormLink("choose", groupChooseSubContainer,"b_form_groupchooser");
-		createGroupsLink = uifactory.addFormLink("create", groupChooseSubContainer,"b_form_groupchooser");	
+		chooseGroupsLink = uifactory.addFormLink("chooseGroup", "choose", null, formLayout, Link.LINK);
+		createGroupsLink = uifactory.addFormLink("createGroup", "create", null, formLayout, Link.LINK);	
 		hasGroups = businessGroupService.countBusinessGroups(null, cev.getCourseGroupManager().getCourseEntry()) > 0;
 		
 		// areas
-		areaChooseSubContainer = FormLayoutContainer.createHorizontalFormLayout("areaChooseSubContainer", getTranslator());
-		areaChooseSubContainer.setLabel("form.areanames", null);
-		formLayout.add(areaChooseSubContainer);		
-		
-		groupsAndAreasSubContainer = FormLayoutContainer.createHorizontalFormLayout("groupSubContainer", getTranslator());
-		formLayout.add(groupsAndAreasSubContainer);
-
 		String areaInitVal;
 		@SuppressWarnings("unchecked")
 		List<Long> areaKeys = (List<Long>)moduleConfig.get(ENCourseNode.CONFIG_AREA_IDS);
@@ -231,11 +218,11 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 			areaKeys = areaManager.toAreaKeys(areaInitVal, cev.getCourseGroupManager().getCourseResource());
 		}
 		areaInitVal = getAreaNames(areaKeys);
-		easyAreaList = uifactory.addStaticTextElement("area", null, areaInitVal == null ? "" : areaInitVal, areaChooseSubContainer);
+		easyAreaList = uifactory.addStaticTextElement("area", "form.areanames", areaInitVal == null ? "" : areaInitVal, formLayout);
 		easyAreaList.setUserObject(areaKeys);
 		
-		chooseAreasLink = uifactory.addFormLink("choose", areaChooseSubContainer,"b_form_groupchooser");
-		createAreasLink = uifactory.addFormLink("create", areaChooseSubContainer,"b_form_groupchooser");
+		chooseAreasLink = uifactory.addFormLink("chooseArea", "choose", null, formLayout, Link.LINK);
+		createAreasLink = uifactory.addFormLink("createArea", "create", null, formLayout, Link.LINK);
 
 		// enrolment
 		Boolean initialCancelEnrollEnabled  = (Boolean) moduleConfig.get(ENCourseNode.CONF_CANCEL_ENROLL_ENABLED);
@@ -257,6 +244,9 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 		boolean retVal = true;
 		List<Long> activeGroupSelection = null;
 		List<Long> activeAreaSelection = null;
+		
+		easyAreaList.clearError();
+		easyGroupList.clearError();
 
 		if (!isEmpty(easyGroupList)) {
 			// check whether groups exist
@@ -285,7 +275,7 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 				FormLayoutContainer errorGroupItemLayout = FormLayoutContainer.createCustomFormLayout(
 						"errorgroupitem", getTranslator(), vc_errorPage);
 
-				groupChooseSubContainer.setErrorComponent(errorGroupItemLayout, this.flc);
+				easyGroupList.setErrorComponent(errorGroupItemLayout, this.flc);
 				// FIXING LINK ONLY IF A DEFAULTCONTEXT EXISTS
 				fixGroupError = new FormLinkImpl("error.fix", "create");
 				// link
@@ -306,10 +296,7 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 					fixGroupError.setUserObject(new String[] { csvMissGrps });
 				}
 
-				groupChooseSubContainer.showError(true);
-			} else {
-				// no more errors
-				groupChooseSubContainer.clearError();
+				easyGroupList.showError(true);
 			}
 		}
 		
@@ -341,7 +328,7 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 				FormLayoutContainer errorAreaItemLayout = FormLayoutContainer.createCustomFormLayout(
 						"errorareaitem", getTranslator(), vc_errorPage);
 
-				areaChooseSubContainer.setErrorComponent(errorAreaItemLayout, this.flc);
+				easyAreaList.setErrorComponent(errorAreaItemLayout, this.flc);
 				// FXINGIN LINK ONLY IF DEFAULT CONTEXT EXISTS
 				fixAreaError = new FormLinkImpl("error.fix", "create");// erstellen
 				// link
@@ -363,30 +350,21 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 					fixAreaError.setUserObject(new String[] { csvMissAreas });
 				}
 
-				areaChooseSubContainer.showError(true);
-			} else {
-				areaChooseSubContainer.clearError();
-			}	
+				easyAreaList.showError(true);
+			}
 		}
-
+		
 		boolean easyGroupOK = activeGroupSelection != null && activeGroupSelection.size() > 0;
 		boolean easyAreaOK = activeAreaSelection != null && activeAreaSelection.size() > 0;
-		if (easyGroupOK || easyAreaOK) {
-			// clear general error
-			flc.clearError();
-		} else {
+		if (!easyGroupOK && !easyAreaOK) {
 			// error concerns both fields -> set it as switch error
-			flc.setErrorKey("form.noGroupsOrAreas", null);
+			easyGroupList.setErrorKey("form.noGroupsOrAreas", null);
 			retVal = false;
 		}
 		
 		//raise error if someone removed all groups and areas from form
 		if (!retVal && !easyGroupOK && !easyAreaOK) {
-				groupsAndAreasSubContainer.setErrorKey("form.noGroupsOrAreas", null);
-		} else if (retVal) {
-			areaChooseSubContainer.clearError();
-			groupChooseSubContainer.clearError();
-			groupsAndAreasSubContainer.clearError();
+			easyGroupList.setErrorKey("form.noGroupsOrAreas", null);
 		}
 		return retVal;
 	}
@@ -505,7 +483,8 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 		if (source == groupChooseC) {
 			if (event == Event.DONE_EVENT) {
 				cmc.deactivate();
-				easyGroupList.setValue(StringHelper.formatAsSortUniqCSVString(groupChooseC.getSelectedNames()));
+				String list = StringHelper.formatAsSortUniqCSVString(groupChooseC.getSelectedNames());
+				easyGroupList.setValue(list == null ? "" : list);
 				easyGroupList.setUserObject(groupChooseC.getSelectedKeys());
 				easyGroupList.getRootForm().submit(ureq);
 			} else if (Event.CANCELLED_EVENT == event) {
@@ -514,7 +493,8 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 		} else if (source == areaChooseC) {
 			if (event == Event.DONE_EVENT) {
 				cmc.deactivate();
-				easyAreaList.setValue(StringHelper.formatAsSortUniqCSVString(areaChooseC.getSelectedNames()));
+				String list = StringHelper.formatAsSortUniqCSVString(areaChooseC.getSelectedNames());
+				easyAreaList.setValue(list == null ? "" : list);
 				easyAreaList.setUserObject(areaChooseC.getSelectedKeys());
 				easyAreaList.getRootForm().submit(ureq);
 			} else if (event == Event.CANCELLED_EVENT) {

src/main/java/org/olat/course/nodes/en/_content/edit.html

 <fieldset>
-	<legend>$r.translate("config.header1")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.en","ced-en.html","help.hover.en")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.en","ced-en.html","help.hover.en")
+	$r.translate("config.header1")</legend>
 	$r.render("groupnameform")
 </fieldset>

src/main/java/org/olat/course/nodes/st/_content/scoreedit.html

 <fieldset class="b_clearfix">
-	<legend>$r.translate("score.fieldset.title")</legend>
-	$r.contextHelpWithWrapper("org.olat.course.nodes.st","ced-st-score.html","help.st")
+	<legend>$r.contextHelpWithWrapper("org.olat.course.nodes.st","ced-st-score.html","help.st")
+	$r.translate("score.fieldset.title")</legend>
+	
   	#if ($isExpertMode)
-	    <div class="b_float_right">$r.render("cmd.activate.easyMode")</div>
+	    <div class="o_button_group o_button_group_right">$r.render("cmd.activate.easyMode")</div>
 	    #else
-	    <div class="b_float_right">$r.render("cmd.activate.expertMode")</div>
+	    <div class="o_button_group o_button_group_right">$r.render("cmd.activate.expertMode")</div>
     #end
     <br />
     #if ($noAssessableChildren && !$isExpertMode)