OO-3939: Add Back button to the editor

src/main/java/org/olat/core/commons/services/vfs/ui/editor/VFSLeafConfigController.java

@@ -54,6 +54,7 @@ public class VFSLeafConfigController extends BasicController implements Activate
 	private static final String GUIPREF_KEY_EDITOR = "editor";
 
 	private Dropdown editorDropdown;
+	private Link backButton;
 	
 	private final String guiEditorKey;
 	private final List<VFSLeafEditor> editors;
@@ -69,6 +70,10 @@ public class VFSLeafConfigController extends BasicController implements Activate
 		
 		VelocityContainer mainVC = createVelocityContainer("editor_config");
 		
+		if (secCallback.canClose()) {
+			backButton = LinkFactory.createLinkBack(mainVC, this);
+		}
+		
 		if (editors.size() > 1) {
 			editorDropdown = new Dropdown("editor.selection", null, false, getTranslator());
 			editorDropdown.setTranslatedLabel(editors.get(0).getDisplayName(getLocale()));
@@ -106,7 +111,9 @@ public class VFSLeafConfigController extends BasicController implements Activate
 
 	@Override
 	protected void event(UserRequest ureq, Component source, Event event) {
-		if (source instanceof Link) {
+		if (source == backButton) {
+			fireEvent(ureq, Event.DONE_EVENT);
+		} else if (source instanceof Link) {
 			Link link = (Link)source;
 			VFSLeafEditor editor = (VFSLeafEditor) link.getUserObject();
 			doSelectEditor(ureq, editor);

src/main/java/org/olat/core/commons/services/vfs/ui/editor/VFSLeafEditorController.java

@@ -24,8 +24,6 @@ import org.olat.core.commons.services.vfs.VFSLeafEditor;
 import org.olat.core.commons.services.vfs.VFSLeafEditorSecurityCallback;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.link.Link;
-import org.olat.core.gui.components.link.LinkFactory;
 import org.olat.core.gui.components.velocity.VelocityContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
@@ -42,7 +40,6 @@ import org.olat.core.util.vfs.VFSLeaf;
 public class VFSLeafEditorController extends BasicController {
 	
 	private VelocityContainer mainVC;
-	private Link closeButton;
 	private VFSLeafConfigController configCtrl;
 	private Controller editorCtrl;
 
@@ -64,10 +61,6 @@ public class VFSLeafEditorController extends BasicController {
 		mainVC.put("config", configCtrl.getInitialComponent());
 		configCtrl.activate(ureq, null, null);
 		
-		if (secCallback.canClose()) {
-			closeButton = LinkFactory.createButton("editor.close", mainVC, this);
-		}
-		
 		putInitialPanel(mainVC);
 	}
 
@@ -78,6 +71,8 @@ public class VFSLeafEditorController extends BasicController {
 				VFSEditorSelectionEvent esEvent = (VFSEditorSelectionEvent) event;
 				VFSLeafEditor editor = esEvent.getEditor();
 				doOpenEditor(ureq, editor);
+			} else if (event == Event.DONE_EVENT) {
+				fireEvent(ureq, event);
 			}
 		} else if (source == editorCtrl) {
 			fireEvent(ureq, event);
@@ -96,9 +91,7 @@ public class VFSLeafEditorController extends BasicController {
 
 	@Override
 	protected void event(UserRequest ureq, Component source, Event event) {
-		if (source == closeButton) {
-			fireEvent(ureq, Event.DONE_EVENT);
-		}
+		//
 	}
 
 	@Override

src/main/java/org/olat/core/commons/services/vfs/ui/editor/_content/editor_config.html

 <div class="o_vfseditor_config">
-	#if($r.available("editor.selection"))
-		<ul class="nav navbar-nav navbar-right"">
-			<li>
-				$r.render("editor.selection")
-			</li>
-		</ul>
-	#end
+	<div class="navbar-collapse">
+		#if($r.available("backLink"))
+			<ul class="nav navbar-nav navbar-left">
+				<li>
+					$r.render("backLink")
+				</li>
+			</ul>
+		#end
+		#if($r.available("editor.selection"))
+			<ul class="nav navbar-nav navbar-right">
+				<li>
+					$r.render("editor.selection")
+				</li>
+			</ul>
+		#end
+	</div>
 </div>
\ No newline at end of file

src/main/java/org/olat/core/commons/services/vfs/ui/editor/_content/editor_main.html

@@ -6,8 +6,5 @@
 		<div class="o_warning">
 			$r.translate("error.no.editor")
 		</div>
-		#if($r.available("editor.close"))
-			<div class="o_button_group">$r.render("editor.close")</div>
-		#end
 	#end
 </div>
\ No newline at end of file

src/main/java/org/olat/core/commons/services/vfs/ui/editor/_i18n/LocalStrings_de.properties

-editor.close=Schliessen
 error.no.editor=Die Datei kann nicht angezeigt werden.

src/main/java/org/olat/core/commons/services/vfs/ui/editor/_i18n/LocalStrings_en.properties

-editor.close=Close
 error.no.editor=The content of the document cannot be displayed.

src/main/java/org/olat/repository/ui/WebDocumentRunController.java

@@ -105,6 +105,7 @@ public class WebDocumentRunController extends BasicController {
 			} else if (vfsService.hasEditor(extension)) {
 				VFSLeafEditorSecurityCallback secCallback = VFSLeafEditorSecurityCallbackBuilder.builder()
 						.canEdit(reSecurity.isOwner() || reSecurity.isCoach())
+						.canClose(false)
 						.build();
 				List<VFSLeafEditor> editors = vfsService.getEditors(document);
 				if (editors.size() >= 1) {

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

@@ -2,7 +2,7 @@
 	.o_collabora {
 		iframe {
 			width: 100%;
-			height: calc(100vh - 160px);
+			height: calc(100vh - 183px);
 			margin-top: 10px;
 			margin-bottom: 20px;
 			border-width: 1px;
@@ -14,7 +14,7 @@
 	.o_collabora {
 		iframe {
 			width: 100%;
-			height: calc(100vh - 340px);
+			height: calc(100vh - 355px);  // 387px would be good to avoid scroll bars if editor selection is shown
 			margin-top: 10px;
 			margin-bottom: 20px;
 			border-width: 1px;

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

@@ -199,10 +199,32 @@ ul.o_dropdown {
 	margin-top: 10px;
 	
 	.o_vfseditor_config {
-		.navbar-right {
-			margin-right: 0px;
+		.nav {
+			button {
+				margin-top: 8px;
+			}
 		}
 	}
+	
+	// Avoid collapsing the navbar on small devices
+	.navbar-collapse.collapse {
+		 display: block!important;
+	}
+	.navbar-nav>li, .navbar-nav {
+		float: left !important;
+	}
+	.navbar-nav.navbar-right:last-child {
+		margin-right: -15px !important;
+	}
+	.navbar-right {
+		float: right!important;
+	}
+	.navbar-nav > li > .dropdown-menu {
+		background-color: $navbar-default-bg;
+		border-color: $navbar-default-border;
+		position: absolute;
+	}
+
 }
 
 .o_web_content {