OO-1068 fix label alignment

src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_horizontal.html

@@ -16,7 +16,7 @@
 	#if ($f.isVisible($item))
 	<div class="form-group $f.getElementCssClass($item) #if($f.hasError($item)) has-feedback has-error #end">
 		#if ($f.hasLabel($item))
-			$r.render("${item}_LABEL", "$f.getItemId($item)", "$f.isMandatory($item)")
+			$r.render("${item}_LABEL", "$f.getItemId($item)")
 		#end
 			$r.render(${item})
 			#if($f.hasError($item))

src/main/java/org/olat/core/gui/components/form/flexible/impl/_content/form_vertical.html

@@ -16,9 +16,7 @@
 	#if ($f.isVisible($item))
 	<div class="form-group $f.getElementCssClass($item) #if($f.hasError($item)) has-feedback has-error #end">
 		#if ($f.hasLabel($item))
-		<div class="col-sm-3">
-			$r.render("${item}_LABEL", "$f.getItemId($item)", "$f.isMandatory($item)")
-		</div>
+			$r.render("${item}_LABEL", "$f.getItemId($item)", "col-sm-3")
 		#end
 		<div class="col-sm-9 #if (!$f.hasLabel($item)) col-sm-offset-3 #end">
 			$r.render(${item})

src/main/java/org/olat/core/gui/components/form/flexible/impl/components/SimpleLabelText.java

@@ -79,11 +79,24 @@ public class SimpleLabelText extends FormBaseComponentImpl {
 		public void render(Renderer renderer, StringOutput sb, Component source, URLBuilder ubu, Translator translator,
 				RenderResult renderResult, String[] args) {
 			SimpleLabelText stc = (SimpleLabelText) source;
-			sb.append("<label class='control-label' id='o_c").append(source.getDispatchID()).append("'");
-			// add the reference to form element for which this label stands. this is important for screen readers
+			String css = "control-label ";
+			String target = null;
 			if (args !=  null && args.length > 0) {
+				for (int i = 0; i < args.length; i++) {
+					String arg = (String) (args[i]);
+					if (arg.startsWith("col-")) {
+						css += arg;
+					} else {
+						target = arg;
+					}
+				}
+			}
+	
+			sb.append("<label class='").append(css).append("' id='o_c").append(source.getDispatchID()).append("'");
+			// add the reference to form element for which this label stands. this is important for screen readers
+			if (target !=  null) {
 				sb.append(" for=\"");
-				sb.append(args[0]);
+				sb.append(target);
 				sb.append("\"");
 			}
 			sb.append(">");

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

@@ -8,7 +8,9 @@
 	.o_info {}
 
 	.o_icon_mandatory {
-		margin-left: 0.3em;
+		position: absolute;
+		right: -0.25em;
+		line-height: 1.5em;
 	}
 	.o_error {
 		margin-top: 1px;