From 4d0e354b972a4817e7461ae65998e2048a22b7c7 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Sep 2014 10:34:27 +0200
Subject: [PATCH] OO-1169: fix the unremovable deleted course element
information (and beautify it)
---
.../olat/course/editor/EditorMainController.java | 3 ++-
.../org/olat/course/editor/_content/index.html | 3 +--
.../course/editor/_content/undeletenode.html | 16 ++++++----------
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/olat/course/editor/EditorMainController.java b/src/main/java/org/olat/course/editor/EditorMainController.java
index c1439d97352..b2bf8cfe73d 100644
--- a/src/main/java/org/olat/course/editor/EditorMainController.java
+++ b/src/main/java/org/olat/course/editor/EditorMainController.java
@@ -228,7 +228,8 @@ public class EditorMainController extends MainLayoutBasicController implements G
} else {
ICourse course = CourseFactory.openCourseEditSession(ores.getResourceableId());
main = createVelocityContainer("index");
- main.setDomReplacementWrapperRequired(false);
+ //must be true for deleted course node
+ main.setDomReplacementWrapperRequired(true);
OLATResourceable courseOres = OresHelper.createOLATResourceableInstance("CourseModule", ores.getResourceableId());
RepositoryEntry repo = RepositoryManager.getInstance().lookupRepositoryEntry(courseOres, false);
diff --git a/src/main/java/org/olat/course/editor/_content/index.html b/src/main/java/org/olat/course/editor/_content/index.html
index 856676704ce..8602720dd95 100644
--- a/src/main/java/org/olat/course/editor/_content/index.html
+++ b/src/main/java/org/olat/course/editor/_content/index.html
@@ -1,4 +1,4 @@
-<div id="$r.getCId()" class="o_course_editor">
+<div class="o_course_editor">
#if($courseNode)
<div class="o_titled_wrapper">
<h2>
@@ -16,5 +16,4 @@
$r.translate("course.building.block.disabled")<br/><br/>
$r.render("alternative")
#end
-
</div>##END o_course_editor
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/editor/_content/undeletenode.html b/src/main/java/org/olat/course/editor/_content/undeletenode.html
index c85d3981e76..8bd268c7729 100644
--- a/src/main/java/org/olat/course/editor/_content/undeletenode.html
+++ b/src/main/java/org/olat/course/editor/_content/undeletenode.html
@@ -1,12 +1,8 @@
-<h4>$r.translate("undeletenode.header")</h4>
-<p>
- $r.translate("undeletenode.message")
-</p>
-<p>
+<h2><i class="o_icon o_icon_delete_item"> </i> $r.translate("undeletenode.header")</h2>
+<div class="o_info">$r.translate("undeletenode.message")</div>
+<div class="o_button_group">
$r.render("undeletenode.button")
-</p>
-#if($targetSelection)
- <p>
+ #if($targetSelection)
$r.render("insertTargetSelection")
- </p>
-#end
\ No newline at end of file
+ #end
+</div>
\ No newline at end of file
--
GitLab