OO-3896: reactivate page editor v2, enhance drop on the editor itself

src/main/java/org/olat/modules/ceditor/ui/PageEditorV2Controller.java

@@ -438,7 +438,11 @@ public class PageEditorV2Controller extends BasicController {
 		
 		boolean after = dropEvent.getPosition() == PositionEnum.bottom;
 		provider.movePageElement(source.getElement(), null, after);
-		editorCmp.addRootComponent(source);
+		if(after) {
+			editorCmp.addRootComponent(source);
+		} else {
+			editorCmp.addRootComponent(0, source);
+		}
 		fireEvent(ureq, Event.CHANGED_EVENT);
 	}
 	

src/main/java/org/olat/modules/portfolio/manager/PageDAO.java

@@ -566,6 +566,8 @@ public class PageDAO {
 		}
 		if(after) {
 			index++;
+		} else if(sibling == null) {
+			index = 0;
 		}
 		
 		List<PagePart> parts = body.getParts();

src/main/java/org/olat/modules/portfolio/ui/PageRunController.java

@@ -77,7 +77,7 @@ import org.olat.modules.ceditor.SimpleAddPageElementHandler;
 import org.olat.modules.ceditor.ui.AddElementInfos;
 import org.olat.modules.ceditor.ui.FullEditorSecurityCallback;
 import org.olat.modules.ceditor.ui.PageController;
-import org.olat.modules.ceditor.ui.PageEditorController;
+import org.olat.modules.ceditor.ui.PageEditorV2Controller;
 import org.olat.modules.ceditor.ui.ValidationMessage;
 import org.olat.modules.portfolio.Assignment;
 import org.olat.modules.portfolio.Binder;
@@ -134,7 +134,7 @@ public class PageRunController extends BasicController implements TooledControll
 	private CloseableModalController cmc;
 	private PageMetadataController pageMetaCtrl;
 	private PageController pageCtrl;
-	private PageEditorController pageEditCtrl;
+	private PageEditorV2Controller pageEditCtrl;
 	private RestorePageController restorePageCtrl;
 	private ConfirmClosePageController confirmDonePageCtrl;
 	private DialogBoxController confirmPublishCtrl, confirmRevisionCtrl, confirmCloseCtrl,
@@ -166,6 +166,7 @@ public class PageRunController extends BasicController implements TooledControll
 		super(ureq, wControl);
 		this.page = page;
 		this.stackPanel = stackPanel;
+		
 		this.secCallback = secCallback;
 		lockOres = OresHelper.createOLATResourceableInstance("Page", page.getKey());
 		userSession = ureq.getUserSession();
@@ -200,7 +201,7 @@ public class PageRunController extends BasicController implements TooledControll
 		putInitialPanel(mainVC);
 		
 		if(openInEditMode) {
-			pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
+			pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(),
 					new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()), new FullEditorSecurityCallback(),
 					getTranslator());
 			listenTo(pageEditCtrl);
@@ -651,7 +652,7 @@ public class PageRunController extends BasicController implements TooledControll
 		} else {
 			lockEntry = coordinator.getCoordinator().getLocker().acquireLock(lockOres, getIdentity(), "");
 			if(lockEntry.isSuccess()) {
-				pageEditCtrl = new PageEditorController(ureq, getWindowControl(),
+				pageEditCtrl = new PageEditorV2Controller(ureq, getWindowControl(),
 						new PortfolioPageEditorProvider(ureq.getUserSession().getRoles()),
 						new FullEditorSecurityCallback(), getTranslator());
 				listenTo(pageEditCtrl);

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

@@ -287,7 +287,8 @@ div.o_page_content_editor .gu-mirror, .o_page_content_editor .gu-transit {
 }
 
 .o_page_part.o_page_drop.oo-accepted:after,
-.o_page_container_slot.o_page_drop.oo-accepted .o_page_container_slot-inner:after {
+.o_page_container_slot.o_page_drop.oo-accepted .o_page_container_slot-inner:after,
+.o_page_content_editor.o_page_drop.oo-accepted:after {
 	display: block;
 	height: 25px;
 	margin: 10px;
@@ -297,7 +298,8 @@ div.o_page_content_editor .gu-mirror, .o_page_content_editor .gu-transit {
 }
 
 .o_page_part.o_page_drop.oo-accepted-top:before,
-.o_page_container_slot.o_page_drop.oo-accepted-top .o_page_container_slot-inner:before {
+.o_page_container_slot.o_page_drop.oo-accepted-top .o_page_container_slot-inner:before,
+.o_page_content_editor.o_page_drop.oo-accepted-top:before {
 	display: block;
 	height: 25px;
 	margin: 10px 10px 10px 10px;