OO-4315: Show previous button next to the next button, better confirm button naming

src/main/java/org/olat/course/run/CoursePaginationController.java

@@ -57,10 +57,6 @@ public class CoursePaginationController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		previousButton = uifactory.addFormLink("previous", "previous", "", null, formLayout, Link.BUTTON_XSMALL | Link.NONTRANSLATED);
-		previousButton.setDomReplacementWrapperRequired(false);
-		previousButton.setIconLeftCSS("o_icon o_icon_previous_page");
-		
 		progressBar = uifactory.addProgressBar("progress", null, formLayout);
 		progressBar.setMax(1);
 		progressBar.setLabelAlignment(LabelAlignment.none);
@@ -70,6 +66,10 @@ public class CoursePaginationController extends FormBasicController {
 		confirmButton.setIconLeftCSS("o_icon o_icon_status_done");
 		confirmButton.setUserObject(Boolean.TRUE);
 		
+		previousButton = uifactory.addFormLink("previous", "previous", "", null, formLayout, Link.BUTTON_XSMALL | Link.NONTRANSLATED);
+		previousButton.setDomReplacementWrapperRequired(false);
+		previousButton.setIconLeftCSS("o_icon o_icon_previous_page");
+		
 		nextButton = uifactory.addFormLink("next", "next", "", null, formLayout, Link.BUTTON_XSMALL | Link.NONTRANSLATED);
 		nextButton.setDomReplacementWrapperRequired(false);
 		nextButton.setIconLeftCSS("o_icon o_icon_next_page");
@@ -80,9 +80,11 @@ public class CoursePaginationController extends FormBasicController {
 		nextButton.setEnabled(nextEnabled);
 	}
 
-	public void updateAssessmentConfirmUI(boolean confirmVisible, boolean showDone) {
-		confirmButton.setI18nKey(showDone? "command.assessment.done": "command.assessment.undone");
-		confirmButton.setUserObject(showDone? Boolean.TRUE: Boolean.FALSE);
+	public void updateAssessmentConfirmUI(boolean confirmVisible, boolean doConfirm) {
+		// If doConfirm (click to confirm), show the current state "undone" and vice versa.
+		confirmButton.setI18nKey(doConfirm? "command.assessment.undone": "command.assessment.done");
+		confirmButton.setIconLeftCSS(doConfirm? "o_icon o_icon_status_undone": "o_icon o_icon_status_done");
+		confirmButton.setUserObject(doConfirm? Boolean.TRUE: Boolean.FALSE);
 		confirmButton.setVisible(confirmVisible);
 		flc.setDirty(true);
 	}

src/main/java/org/olat/course/run/_content/pagination.html

 <div class="o_course_pagination">
-	<div class="o_previous">
-		$r.render("previous")
-	</div>
 	<div class="o_progress">
 		$r.render("progress")
 	</div>
@@ -10,6 +7,9 @@
 			$r.render("confirm")
 		</div>
 	#end
+	<div class="o_previous">
+		$r.render("previous")
+	</div>
 	<div class="o_next">
 		$r.render("next")
 	</div>

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

@@ -316,6 +316,7 @@ $fa-css-prefix: "o_icon" !default;
 .o_icon_status_in_progress:before { content: $fa-var-play; }
 .o_icon_status_in_review:before { content: $fa-var-hand-o-up; }
 .o_icon_status_done:before { content: $fa-var-check-circle; }
+.o_icon_status_undone:before { content: $fa-var-check-circle-o; }
 .o_icon_statistics_tool:before { content: $fa-var-bar-chart-o;}
 .o_icon_submit:before { content: $fa-var-check; }
 .o_icon_table:before { content: $fa-var-table; }