diff --git a/src/main/java/org/olat/ims/qti/_chelp/metadatas.html b/src/main/java/org/olat/ims/qti/_chelp/metadatas.html
new file mode 100644
index 0000000000000000000000000000000000000000..bec1ced55c8a4759a70f1793437a7268f5fb2871
--- /dev/null
+++ b/src/main/java/org/olat/ims/qti/_chelp/metadatas.html
@@ -0,0 +1,2 @@
+<b>$r.translateWithPackage("org.olat.ims.qti","chelp.metadatas.title"):</b> 
+$r.translate("chelp.metadatas.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/ims/qti/_content/qti_metadatas.html b/src/main/java/org/olat/ims/qti/_content/qti_metadatas.html
index 938d8797a7ad8e16ba908111e01b9409ec338832..8b7598b4dbba5b20fdd12c9112ea79064339a5bd 100644
--- a/src/main/java/org/olat/ims/qti/_content/qti_metadatas.html
+++ b/src/main/java/org/olat/ims/qti/_content/qti_metadatas.html
@@ -1,6 +1,7 @@
 #if($r.available("leftSettings") || $r.available("rightSettings"))
 	<fieldset>
 		<legend>$r.translate("editor.settings")</legend>
+		$r.contextHelpWithWrapper("org.olat.ims.qti","metadatas.html","help.hover.metadatas")
 		<div class="b_clearfix">
 			<div class="b_c50l">
 				<div class="b_subcl">
diff --git a/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_de.properties
index e13cc040ac1604e4f8ab85e0a294dcdb245d487e..3de4cc7c03d3d7701e06182f10d2800584049567 100644
--- a/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_de.properties
@@ -1,4 +1,7 @@
 #Mon Mar 02 09:54:04 CET 2009
+chelp.metadatas.title=Fragenpool: Detailansicht Einstellungen
+chelp.metadatas.1=Hier erhalten Sie Informationen zu testrelevanten Daten wie z.B. die korrekte Antwort oder die erreichbare Punktzahl. Diese Einstellungen ändern Sie im Testeditor selbst. Dort erhalten Sie weiterführende Informationen dazu.
+
 DetailedResults=Detaillierte Resultate
 ERROR_ASSESSMENT_OUTOFTIME=Die Zeit f\u00FCr diesen Test ist \u00FCberschritten.
 ERROR_ITEM_OUTOFTIME=Die Zeit f\u00FCr diese Frage ist \u00FCberschritten.
diff --git a/src/main/java/org/olat/modules/qpool/ui/CollectionQuestionsController.java b/src/main/java/org/olat/modules/qpool/ui/CollectionQuestionsController.java
deleted file mode 100644
index b1ccc3fc2a60d3f5906c5878a410fee4835e25e8..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/qpool/ui/CollectionQuestionsController.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * <a href="http://www.openolat.org">
- * OpenOLAT - Online Learning and Training</a><br>
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); <br>
- * you may not use this file except in compliance with the License.<br>
- * You may obtain a copy of the License at the
- * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
- * <p>
- * Unless required by applicable law or agreed to in writing,<br>
- * software distributed under the License is distributed on an "AS IS" BASIS, <br>
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
- * See the License for the specific language governing permissions and <br>
- * limitations under the License.
- * <p>
- * Initial code contributed and copyrighted by<br>
- * frentix GmbH, http://www.frentix.com
- * <p>
- */
-package org.olat.modules.qpool.ui;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.TextElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-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;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.generic.closablewrapper.CloseableCalloutWindowController;
-import org.olat.core.gui.control.generic.modal.DialogBoxController;
-import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
-import org.olat.modules.qpool.QPoolService;
-import org.olat.modules.qpool.QuestionItemCollection;
-import org.olat.modules.qpool.ui.datasource.CollectionOfItemsSource;
-import org.olat.modules.qpool.ui.events.QPoolEvent;
-
-/**
- * 
- * Initial date: 16.04.2013<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- *
- */
-public class CollectionQuestionsController extends QuestionsController {
-
-	private Link deleteSource, renameSource;
-	private RenameController renameCtrl;
-	private DialogBoxController confirmDeleteSourceBox;
-	private CloseableCalloutWindowController renameCallout;
-	
-	private QuestionItemCollection collection;
-	private final QPoolService qpoolService;
-
-	public CollectionQuestionsController(UserRequest ureq, WindowControl wControl, CollectionOfItemsSource source) {
-		super(ureq, wControl, source, "coll-" + source.getCollection().getKey());
-		this.collection = source.getCollection();
-		qpoolService = CoreSpringFactory.getImpl(QPoolService.class);
-	}
-
-	@Override
-	protected void initVelocityContainer(VelocityContainer mainVc) {
-		deleteSource = LinkFactory.createButton("delete.collection", mainVc, this);
-		renameSource = LinkFactory.createButton("rename.collection", mainVc, this);
-	}
-
-	@Override
-	protected void event(UserRequest ureq, Component source, Event event) {
-		if(deleteSource == source) {
-			doConfirmDeleteSource(ureq);
-		} else if(renameSource == source) {
-			doOpenRenameCallout(ureq);
-		}
-		super.event(ureq, source, event);
-	}
-	
-	@Override
-	protected void event(UserRequest ureq, Controller source, Event event) {
-		if(source == confirmDeleteSourceBox) {
-			boolean delete = DialogBoxUIFactory.isYesEvent(event) || DialogBoxUIFactory.isOkEvent(event);
-			if(delete) {
-				doDelete(ureq);
-			}
-		} else if(source == renameCtrl) {
-			if(Event.CHANGED_EVENT == event) {
-				String newName = renameCtrl.getName();
-				doRename(ureq, newName);
-			}
-			renameCallout.deactivate();
-		}
-		super.event(ureq, source, event);
-	}
-	
-	private void doOpenRenameCallout(UserRequest ureq) {
-		removeAsListenerAndDispose(renameCtrl);
-		renameCtrl = new RenameController(ureq, getWindowControl());
-		listenTo(renameCtrl);
-		
-		removeAsListenerAndDispose(renameCallout);
-		renameCallout = new CloseableCalloutWindowController(ureq, getWindowControl(), renameCtrl.getInitialComponent(),
-				renameSource, "", true, null);
-		listenTo(renameCallout);
-		renameCallout.activate();	
-	}
-	
-	private void doRename(UserRequest ureq, String newName) {
-		collection = qpoolService.renameCollection(collection, newName);
-		fireEvent(ureq, new QPoolEvent(QPoolEvent.COLL_CHANGED));
-	}
-
-	private void doConfirmDeleteSource(UserRequest ureq) {
-		confirmDeleteSourceBox = activateYesNoDialog(ureq, null, translate("confirm.delete.source"), confirmDeleteSourceBox);
-	}
-	
-	private void doDelete(UserRequest ureq) {
-		qpoolService.deleteCollection(collection);
-		fireEvent(ureq, new QPoolEvent(QPoolEvent.COLL_DELETED));
-	}
-	
-	private static class RenameController extends FormBasicController {
-		
-		private TextElement nameEl;
-		
-		public RenameController(UserRequest ureq, WindowControl wControl) {
-			super(ureq, wControl, LAYOUT_VERTICAL);
-			
-			initForm(ureq);
-		}
-		
-		public String getName() {
-			return nameEl.getValue();
-		}
-
-		@Override
-		protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-			nameEl = uifactory.addTextElement("newname", "collection.name", 32, "", formLayout);
-			uifactory.addFormSubmitButton("ok", formLayout);
-		}
-		
-		@Override
-		protected void doDispose() {
-			//
-		}
-
-		@Override
-		protected void formOK(UserRequest ureq) {
-			fireEvent(ureq, Event.CHANGED_EVENT);
-		}
-	}
-}
diff --git a/src/main/java/org/olat/modules/qpool/ui/CollectionTargetController.java b/src/main/java/org/olat/modules/qpool/ui/CollectionTargetController.java
index 33747f9df70e7399d9be8e0ac78c5b1b0030c008..4d7355ac7467eca7d2f95c830eef085789c9437a 100644
--- a/src/main/java/org/olat/modules/qpool/ui/CollectionTargetController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/CollectionTargetController.java
@@ -37,15 +37,22 @@ public class CollectionTargetController extends BasicController {
 	
 	public static final String ADD_TO_LIST_POOL_CMD = "qpool.list.add";
 	public static final String NEW_LIST_CMD = "qpool.list.new";
+	public static final String RENAME_LIST_CMD = "qpool.list.rename";
+	public static final String DELETE_LIST_CMD = "qpool.list.delete";
 
 	private final Link newList, addToList;
+	private Link deleteSource, renameSource;
 	
-	public CollectionTargetController(UserRequest ureq, WindowControl wControl) {
+	public CollectionTargetController(UserRequest ureq, WindowControl wControl, boolean editItemCollection) {
 		super(ureq, wControl);
 		
 		VelocityContainer mainVC = createVelocityContainer("collection_target");
 		newList = LinkFactory.createLink("create.list", mainVC, this);
 		addToList = LinkFactory.createLink("add.to.list", mainVC, this);
+		if(editItemCollection) {
+			renameSource = LinkFactory.createLink("rename.collection", mainVC, this);
+			deleteSource = LinkFactory.createLink("delete.collection", mainVC, this);
+		}
 		putInitialPanel(mainVC);
 	}
 
@@ -60,6 +67,10 @@ public class CollectionTargetController extends BasicController {
 			fireEvent(ureq, new Event(NEW_LIST_CMD));
 		} else if(addToList == source) {
 			fireEvent(ureq, new Event(ADD_TO_LIST_POOL_CMD));
+		} else if(deleteSource == source) {
+			fireEvent(ureq, new Event(DELETE_LIST_CMD));
+		} else if(renameSource == source) {
+			fireEvent(ureq, new Event(RENAME_LIST_CMD));
 		}
 	}
 }
diff --git a/src/main/java/org/olat/modules/qpool/ui/CreateCollectionController.java b/src/main/java/org/olat/modules/qpool/ui/CreateCollectionController.java
index 33890b3479c4da6e361e341d15075f659b31569a..80ad3620f6c9cfdf8a0107fba7fee3c8e1466d95 100644
--- a/src/main/java/org/olat/modules/qpool/ui/CreateCollectionController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/CreateCollectionController.java
@@ -51,6 +51,7 @@ public class CreateCollectionController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		setFormContextHelp("org.olat.modules.qpool.ui", "new-collection.html", "help.hover.new-collection");
 		setFormDescription("create.collection.description");
 		
 		nameEl = uifactory.addTextElement("collection.name", "collection.name", 128, "", formLayout);
diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
index 00750ec83e0b05a669801c094d75bb5c394c7cf6..316d1944ddce389af8522fe361fb49f593b60dec 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
@@ -54,6 +54,7 @@ import org.olat.modules.qpool.Pool;
 import org.olat.modules.qpool.QItemFactory;
 import org.olat.modules.qpool.QPoolService;
 import org.olat.modules.qpool.QuestionItem;
+import org.olat.modules.qpool.QuestionItemCollection;
 import org.olat.modules.qpool.QuestionItemShort;
 import org.olat.modules.qpool.model.QItemList;
 import org.olat.modules.qpool.ui.events.QItemCreationCmdEvent;
@@ -82,13 +83,16 @@ public class QuestionListController extends AbstractItemListController implement
 
 	private FormLink list, exportItem, shareItem, removeItem, newItem, copyItem, deleteItem, authorItem, importItem, bulkChange;
 	
+	
 	private StackedController stackPanel;
 
 	private Controller newItemCtrl;
+	private RenameController renameCtrl;
 	private CloseableModalController cmc;
 	private DialogBoxController confirmCopyBox;
 	private DialogBoxController confirmDeleteBox;
 	private DialogBoxController confirmRemoveBox;
+	private DialogBoxController confirmDeleteSourceBox;
 	private ShareItemOptionController shareItemsCtrl;
 	private PoolsController selectPoolCtrl;
 	private SelectBusinessGroupController selectGroupCtrl;
@@ -108,6 +112,8 @@ public class QuestionListController extends AbstractItemListController implement
 	private CloseableCalloutWindowController calloutCtrl;
 	private ReferencableEntriesSearchController importTestCtrl;
 	
+	private QuestionItemCollection itemCollection;
+	
 	private final QPoolService qpoolService;
 	private final RepositoryManager repositoryManager;
 	
@@ -137,6 +143,14 @@ public class QuestionListController extends AbstractItemListController implement
 		bulkChange = uifactory.addFormLink("bulk.change", formLayout, Link.BUTTON);
 	}
 
+	public QuestionItemCollection getItemCollection() {
+		return itemCollection;
+	}
+
+	public void setItemCollection(QuestionItemCollection itemCollection) {
+		this.itemCollection = itemCollection;
+	}
+
 	@Override
 	public void setStackedController(StackedController stackPanel) {
 		this.stackPanel = stackPanel;
@@ -265,6 +279,10 @@ public class QuestionListController extends AbstractItemListController implement
 				}
 			} else if(CollectionTargetController.NEW_LIST_CMD.equals(event.getCommand())) {
 				doAskCollectionName(ureq, items);
+			} else if(CollectionTargetController.RENAME_LIST_CMD.equals(event.getCommand())) {
+				doOpenRenameCallout(ureq);
+			} else if(CollectionTargetController.DELETE_LIST_CMD.equals(event.getCommand())) {
+				doConfirmDeleteSource(ureq);
 			}
 		} else if(source == createCollectionCtrl) {
 			if(Event.DONE_EVENT == event) {
@@ -274,6 +292,17 @@ public class QuestionListController extends AbstractItemListController implement
 			}
 			cmc.deactivate();
 			cleanUp();
+		} if(source == confirmDeleteSourceBox) {
+			boolean delete = DialogBoxUIFactory.isYesEvent(event) || DialogBoxUIFactory.isOkEvent(event);
+			if(delete) {
+				doDeleteItemCollection(ureq);
+			}
+		} else if(source == renameCtrl) {
+			cmc.deactivate();
+			if(Event.CHANGED_EVENT == event) {
+				String newName = renameCtrl.getName();
+				doRenameItemCollection(ureq, newName);
+			}
 		} else if(source == chooseCollectionCtrl) {
 			cmc.deactivate();
 			cleanUp();
@@ -494,7 +523,7 @@ public class QuestionListController extends AbstractItemListController implement
 	protected void doList(UserRequest ureq) {
 		String title = translate("filter.view");
 		removeAsListenerAndDispose(shareTargetCtrl);
-		listTargetCtrl = new CollectionTargetController(ureq, getWindowControl());
+		listTargetCtrl = new CollectionTargetController(ureq, getWindowControl(), itemCollection != null);
 		listenTo(listTargetCtrl);
 		
 		removeAsListenerAndDispose(calloutCtrl);
@@ -652,6 +681,32 @@ public class QuestionListController extends AbstractItemListController implement
 		showInfo("item.deleted");
 	}
 	
+	private void doOpenRenameCallout(UserRequest ureq) {
+		removeAsListenerAndDispose(renameCtrl);
+		renameCtrl = new RenameController(ureq, getWindowControl());
+		listenTo(renameCtrl);
+		
+		removeAsListenerAndDispose(cmc);
+		cmc = new CloseableModalController(getWindowControl(), translate("close"),
+				renameCtrl.getInitialComponent(), true, translate("rename.collection"));
+		cmc.activate();	
+		listenTo(cmc);
+	}
+	
+	private void doRenameItemCollection(UserRequest ureq, String newName) {
+		itemCollection = qpoolService.renameCollection(itemCollection, newName);
+		fireEvent(ureq, new QPoolEvent(QPoolEvent.COLL_CHANGED));
+	}
+
+	private void doConfirmDeleteSource(UserRequest ureq) {
+		confirmDeleteSourceBox = activateYesNoDialog(ureq, null, translate("confirm.delete.source"), confirmDeleteSourceBox);
+	}
+	
+	private void doDeleteItemCollection(UserRequest ureq) {
+		qpoolService.deleteCollection(itemCollection);
+		fireEvent(ureq, new QPoolEvent(QPoolEvent.COLL_DELETED));
+	}
+	
 	protected void doSelectGroup(UserRequest ureq, List<QuestionItemShort> items) {
 		removeAsListenerAndDispose(selectGroupCtrl);
 		selectGroupCtrl = new SelectBusinessGroupController(ureq, getWindowControl());
diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java
index 183047f8699593a624a821229a24b9c766951c2b..a771f28391c97bb48686f860a54e9a341c5a59e7 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java
@@ -436,12 +436,13 @@ public class QuestionPoolMainEditorController extends BasicController implements
 	
 	private void doSelectCollection(UserRequest ureq, QuestionItemCollection coll, TreeNode node, List<ContextEntry> entries, StateEntry state) {
 		ControlledTreeNode cNode = (ControlledTreeNode)node;
-		CollectionQuestionsController collItemsCtrl = (CollectionQuestionsController)cNode.getController();
+		QuestionsController collItemsCtrl = cNode.getController();
 		
 		CollectionOfItemsSource source = new CollectionOfItemsSource(coll, getIdentity(), ureq.getUserSession().getRoles());
 		if(collItemsCtrl == null) {
 			WindowControl swControl = addToHistory(ureq, coll, null);
-			collItemsCtrl = new CollectionQuestionsController(ureq, swControl, source);
+			collItemsCtrl = new QuestionsController(ureq, swControl, source, "coll-" + coll.getKey());
+			collItemsCtrl.setQuestionItemCollection(coll);
 			collItemsCtrl.setStackedController(stackPanel);
 			listenTo(collItemsCtrl);
 			cNode.setController(collItemsCtrl);
diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionsController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionsController.java
index 814a399719903119d2ac6aee6be86456edafdacb..e321474715a8a7468ecb0b52318ff74953f7f92b 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionsController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionsController.java
@@ -43,6 +43,7 @@ import org.olat.core.id.context.ContextEntry;
 import org.olat.core.id.context.StateEntry;
 import org.olat.modules.qpool.QPoolService;
 import org.olat.modules.qpool.QuestionItem;
+import org.olat.modules.qpool.QuestionItemCollection;
 import org.olat.modules.qpool.QuestionItemShort;
 import org.olat.modules.qpool.QuestionItemView;
 import org.olat.modules.qpool.ui.events.QItemViewEvent;
@@ -130,6 +131,10 @@ public class QuestionsController extends BasicController implements Activateable
 			}
 		}
 	}
+	
+	public void setQuestionItemCollection(QuestionItemCollection coll) {
+		listCtrl.setItemCollection(coll);
+	}
 
 	public void updateSource(UserRequest ureq, QuestionItemsSource source) {
 		this.source = source;
diff --git a/src/main/java/org/olat/modules/qpool/ui/RenameController.java b/src/main/java/org/olat/modules/qpool/ui/RenameController.java
new file mode 100644
index 0000000000000000000000000000000000000000..f5d1fcf09bda7fbe09d9db088a69743af144d0f3
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/RenameController.java
@@ -0,0 +1,91 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.modules.qpool.ui;
+
+import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.form.flexible.FormItemContainer;
+import org.olat.core.gui.components.form.flexible.elements.TextElement;
+import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
+import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
+import org.olat.core.gui.control.Controller;
+import org.olat.core.gui.control.Event;
+import org.olat.core.gui.control.WindowControl;
+import org.olat.core.util.StringHelper;
+
+/**
+ * Rename a list
+ * 
+ * Initial date: 26.06.2013<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class RenameController extends FormBasicController {
+	
+	private TextElement nameEl;
+	
+	public RenameController(UserRequest ureq, WindowControl wControl) {
+		super(ureq, wControl);
+		
+		initForm(ureq);
+	}
+	
+	public String getName() {
+		return nameEl.getValue();
+	}
+
+	@Override
+	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		nameEl = uifactory.addTextElement("newname", "collection.name", 32, "", formLayout);
+		
+		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
+		buttonsCont.setRootForm(mainForm);
+		formLayout.add(buttonsCont);
+		uifactory.addFormSubmitButton("ok", "ok", buttonsCont);
+		uifactory.addFormCancelButton("cancel", buttonsCont, ureq, getWindowControl());
+	}
+	
+	@Override
+	protected void doDispose() {
+		//
+	}
+
+	@Override
+	protected void formOK(UserRequest ureq) {
+		fireEvent(ureq, Event.CHANGED_EVENT);
+	}
+
+	@Override
+	protected void formCancelled(UserRequest ureq) {
+		fireEvent(ureq, Event.CANCELLED_EVENT);
+	}
+
+	@Override
+	protected boolean validateFormLogic(UserRequest ureq) {
+		boolean allOk = true;
+		
+		nameEl.clearError();
+		if(!StringHelper.containsNonWhitespace(nameEl.getValue())) {
+			nameEl.setErrorKey("form.mandatory.hover", null);
+			allOk = false;
+		}
+		
+		return allOk & super.validateFormLogic(ureq);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_chelp/add-to-collection.html b/src/main/java/org/olat/modules/qpool/ui/_chelp/add-to-collection.html
new file mode 100644
index 0000000000000000000000000000000000000000..c1172a321f276253bf981e6ae022b0faa3f1d010
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/_chelp/add-to-collection.html
@@ -0,0 +1 @@
+$r.translate("chelp.add-to-collection.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_chelp/item-details.html b/src/main/java/org/olat/modules/qpool/ui/_chelp/item-details.html
new file mode 100644
index 0000000000000000000000000000000000000000..bc6ab17d31a8454269ecf3274f8e6b567f511da2
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/_chelp/item-details.html
@@ -0,0 +1,2 @@
+$r.translate("chelp.details.1")<br/>
+$r.translate("chelp.details.2")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_chelp/new-collection.html b/src/main/java/org/olat/modules/qpool/ui/_chelp/new-collection.html
new file mode 100644
index 0000000000000000000000000000000000000000..1526d8f3828cacafa3d9221ddfa3cddbfaca4118
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/_chelp/new-collection.html
@@ -0,0 +1 @@
+$r.translate("chelp.new-collection.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/collection_choose.html b/src/main/java/org/olat/modules/qpool/ui/_content/collection_choose.html
index 1f43dc1fb15f08a9893a49313cd993d9cd53cc07..cb01effe37af6d2cb6b7674cc3320671b21ebfd8 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_content/collection_choose.html
+++ b/src/main/java/org/olat/modules/qpool/ui/_content/collection_choose.html
@@ -1,2 +1,4 @@
+$r.contextHelpWithWrapper("org.olat.modules.qpool.ui","add-to-collection.html","help.hover.add-to-collection")
+
 $r.render("collections")
 $r.render("buttons")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/collection_target.html b/src/main/java/org/olat/modules/qpool/ui/_content/collection_target.html
index e7fd2d36867e5e548878f8ed563069edc8f081bd..d4152d8c86484cc0bcbfd2461824a48a02ec2a03 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_content/collection_target.html
+++ b/src/main/java/org/olat/modules/qpool/ui/_content/collection_target.html
@@ -1,2 +1,8 @@
 $r.render("create.list")<br/>
-$r.render("add.to.list")
\ No newline at end of file
+$r.render("add.to.list")<br/>
+#if($r.available("rename.collection"))
+	$r.render("rename.collection")<br/>
+#end
+#if($r.available("delete.collection"))
+	$r.render("delete.collection")
+#end
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/item_details.html b/src/main/java/org/olat/modules/qpool/ui/_content/item_details.html
index 80776906c29a8e3c2476ac9b988e862f4b8ebd09..6fc9e7c1e1657b67de0d489aee10f7624a4ba635 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_content/item_details.html
+++ b/src/main/java/org/olat/modules/qpool/ui/_content/item_details.html
@@ -2,6 +2,7 @@
 	#if($r.available("edit"))
 		$r.render("edit")
 	#end
+	$r.contextHelpWithWrapper("org.olat.modules.qpool.ui","item-details.html","help.hover.itemDetails")
 	$r.render("previous")
 	$r.render("next")
 </div>
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
index e9e714617c9451cbfeb9c109cef039c621332fa1..5e6447aac6a281855ef7daf4e392f677303d8f97 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
@@ -1,4 +1,16 @@
 #Mon Mar 02 09:54:04 CET 2009
+chelp.item-details.title=Fragenpool: Detailansicht
+chelp.details.1=In der Detailansicht der Frage bearbeiten Sie die Informationen zur Frage. Sie können die Frage selbst anpassen, in dem Sie über die Schaltfläche "Editieren" den Testeditor öffnen.  
+chelp.details.2=Wenn Sie das Recht zur Bearbeitung besitzen, können die Punkte <b>Allgemein</b>, <b>Lebenszyklus</b>, <b>Rechte</b>, <b>Freigabe / Autoren</b>, <b>Didaktik</b>, <b>Itemanalyse</b> und <b>Technik</b> angepasst werden. Bitte beachten Sie jedoch, das insbesondere Änderungen unter Didaktik und Itemanalyse nur mit diesbezüglichen Vorkenntnissen vorgenommen werden sollten.
+chelp.new-collection.title=Fragenpool: Liste erstellen
+chelp.new-collection.1=Listen erlauben Ihnen, Fragen individuell zusammen zu stellen. Eine Liste ist nur für Sie sichtbar. Wenn Sie eine Frage zu einer Liste hinzufügen, wird diese nur referenziert und nicht kopiert. Änderungen an Fragen die Sie in einer Liste vornehmen, werden dementsprechend im Original unter "Meine Fragen" vorgenommen. Ihre Liste finden Sie im Anschluss Links im Menü unter "Meine Favoriten".
+chelp.add-to-collection.title=Fragenpool: Zur Liste hinzufügen
+chelp.add-to-collection.1=Wenn Sie bereits eine oder mehrere Listen erstellt haben, können Sie diese hier auswählen. Um eine Liste neu zu erstellen klicken Sie auf die Schaltfläche "Listen" und wählen dann die Funktion "Liste erstellen".
+
+help.hover.itemDetails=Hilfe zur Detailansicht
+help.hover.new-collection=Hilfe zur Liste erstellen
+help.hover.add-to-collection=Hilfe zur Liste hinzufügen
+
 create.list=Liste erstellen
 create.test=Test erstellen
 add.to.list=Zur Liste hinzufügen
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataController.java
index e4b2034f8556e6d159eeddde26b8bd1fa381449a..088f73a1e8585069d53e5ca4cfcd2602490bce90 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataController.java
@@ -62,6 +62,7 @@ public class EducationalMetadataController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("educational");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "educational.html", "help.hover.educational");
 		if(edit) {
 			editLink = uifactory.addFormLink("edit", "edit", null, formLayout, Link.BUTTON_XSMALL);
 			editLink.setCustomEnabledLinkCSS("b_link_left_icon b_link_edit");
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataEditController.java
index 87481584789b995bfc866d4361c5bc9d0e156707..ee8009c94ba779865a14b9da688e0d0847360f73 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/EducationalMetadataEditController.java
@@ -68,6 +68,7 @@ public class EducationalMetadataEditController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("educational");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "educational.html", "help.hover.educational");
 
 		List<QEducationalContext> levels = qpoolService.getAllEducationlContexts();
 		String[] contextKeys = new String[ levels.size() ];
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataController.java
index 23af80b7f1734efc1810f502b446318b0ba61d80..91e2c29049cf1b435a0365b1909d05a68b32c4fa 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataController.java
@@ -59,6 +59,7 @@ public class GeneralMetadataController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("general");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "general.html", "help.hover.general");
 		if(edit) {
 			editLink = uifactory.addFormLink("edit", "edit", null, formLayout, Link.BUTTON_XSMALL);
 			editLink.setCustomEnabledLinkCSS("b_link_left_icon b_link_edit");
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java
index 92d84279e8a8e3c3dfd24132fbacb4e12bcfb645..acbbb4ddcfa22da3cc1fe9719f88230a6eae467d 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/GeneralMetadataEditController.java
@@ -96,6 +96,7 @@ public class GeneralMetadataEditController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("general");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "general.html", "help.hover.general");
 		
 		String title = item.getTitle();
 		titleEl = uifactory.addTextElement("general.title", "general.title", 1000, title, formLayout);
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataController.java
index 98539b4308940c8f7b9d7e9b883a0ea32b72547b..8960e6b5018cc9b40fe39984d3a4ddd9b3e36076 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataController.java
@@ -61,6 +61,7 @@ public class LifecycleMetadataController extends FormBasicController  {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("lifecycle");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "lifecycle.html", "help.hover.lifecycle");
 		if(edit) {
 			editLink = uifactory.addFormLink("edit", "edit", null, formLayout, Link.BUTTON_XSMALL);
 			editLink.setCustomEnabledLinkCSS("b_link_left_icon b_link_edit");
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataEditController.java
index 3526c72082f70f6267d07fdee422ade70efd3070..86ce6a29376a9cfcd59d7f63f7cba240c7a5c3c0 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/LifecycleMetadataEditController.java
@@ -66,6 +66,7 @@ public class LifecycleMetadataEditController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("lifecycle");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "lifecycle.html", "help.hover.lifecycle");
 		
 		versionEl = uifactory.addTextElement("lifecycle.version", "lifecycle.version", 50, item.getItemVersion(), formLayout);
 		
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataController.java
index d5373a82e638e6b1b2d0c34d5117855b59fc41ae..e2fbe69e7a93afab34c9688a87b72b252e1509a8 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataController.java
@@ -63,6 +63,7 @@ public class QuestionMetadataController extends FormBasicController  {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("question");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "question.html", "help.hover.question");
 		if(edit) {
 			editLink = uifactory.addFormLink("edit", "edit", null, formLayout, Link.BUTTON_XSMALL);
 			editLink.setCustomEnabledLinkCSS("b_link_left_icon b_link_edit");
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataEditController.java
index c0210e2c0f6460760eec84949652f4e9ac682970..78900756331c5d0355ca34d299b64620eebfec83 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/QuestionMetadataEditController.java
@@ -74,6 +74,7 @@ public class QuestionMetadataEditController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("question");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "question.html", "help.hover.question");
 
 		KeyValues typeKeys = getQItemTypeKeyValues(getTranslator(), qpoolService);
 		typeEl = uifactory.addDropdownSingleselect("question.type", "question.type", formLayout, typeKeys.getKeys(), typeKeys.getValues(), null);
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataController.java
index fd37b4755aba70a5f29a8206328838fea61a426f..04f70f688f5d46eb6f050fdc30317bc89ff25ff9 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataController.java
@@ -76,6 +76,7 @@ public class RightsMetadataController extends FormBasicController  {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("rights");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "rights.html", "help.hover.rights");
 		if(edit) {
 			editLink = uifactory.addFormLink("edit", "edit", null, formLayout, Link.BUTTON_XSMALL);
 			editLink.setCustomEnabledLinkCSS("b_link_left_icon b_link_edit");
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataEditController.java
index 8d0244bfb38f31a5e0d633bb14a315c8e59554ec..5321f101ed9fb2b3e38469aacb673071666b58c1 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/RightsMetadataEditController.java
@@ -91,6 +91,7 @@ public class RightsMetadataEditController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("rights");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "rights.html", "help.hover.rights");
 		
 		String authorListPage = velocity_root + "/author_list.html";
 		authorCont = FormLayoutContainer.createCustomFormLayout("owners", getTranslator(), authorListPage);
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/SharingController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/SharingController.java
index f3df3d265cd46196beeaae5f09e12bafb6d3168b..c2ec99dec12d1b28ac0e74f91bb12ac156dd5cf4 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/SharingController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/SharingController.java
@@ -73,6 +73,7 @@ public class SharingController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("sharing");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "sharing.html", "help.hover.sharing");
 		
 		//list of pools
 		FlexiTableColumnModel poolInfosColumnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataController.java
index eefcb8121fd8df9c232bccb2659e2009874111d3..4516f800ef8a1663143db607f4e4d2d158104265 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataController.java
@@ -62,6 +62,7 @@ public class TechnicalMetadataController extends FormBasicController  {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("technical");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "technical.html", "help.hover.technical");
 		if(edit) {
 			editLink = uifactory.addFormLink("edit", "edit", null, formLayout, Link.BUTTON_XSMALL);
 			editLink.setCustomEnabledLinkCSS("b_link_left_icon b_link_edit");
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataEditController.java b/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataEditController.java
index e96a52962e51a1d6ade3dadc215c3f4d71f57ac6..a56f9d9303541caa183185a30aef409cfe3281f9 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataEditController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/TechnicalMetadataEditController.java
@@ -67,6 +67,7 @@ public class TechnicalMetadataEditController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("technical");
+		setFormContextHelp("org.olat.modules.qpool.ui.metadata", "technical.html", "help.hover.technical");
 		
 		uifactory.addStaticTextElement("general.identifier", item.getIdentifier(), formLayout);
 		uifactory.addStaticTextElement("general.master.identifier", item.getMasterIdentifier(), formLayout);
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/educational.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/educational.html
new file mode 100644
index 0000000000000000000000000000000000000000..6db9921e6c72bce7dcb19b4421058e3595b96377
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/educational.html
@@ -0,0 +1 @@
+$r.translate("chelp.educational.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/general.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/general.html
new file mode 100644
index 0000000000000000000000000000000000000000..68b2afaaf2aaf4432514a2aa441bcd62cb55c12f
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/general.html
@@ -0,0 +1 @@
+$r.translate("chelp.general.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/lifecycle.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/lifecycle.html
new file mode 100644
index 0000000000000000000000000000000000000000..a7f5dae532e315f707a80ea49f78f52ef648514c
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/lifecycle.html
@@ -0,0 +1 @@
+$r.translate("chelp.lifecycle.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/question.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/question.html
new file mode 100644
index 0000000000000000000000000000000000000000..86060de0145dde7c7d6a1e19de1fd6f4ed47d418
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/question.html
@@ -0,0 +1,6 @@
+$r.translate("chelp.question.1")<br/>
+$r.translate("chelp.question.2")<br/>
+$r.translate("chelp.question.3")<br/>
+$r.translate("chelp.question.4")<br/>
+$r.translate("chelp.question.5")<br/>
+$r.translate("chelp.question.6")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/rights.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/rights.html
new file mode 100644
index 0000000000000000000000000000000000000000..40d34357eac3ff4fe784b1b00da1274a13641ec4
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/rights.html
@@ -0,0 +1 @@
+$r.translate("chelp.rights.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/sharing.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/sharing.html
new file mode 100644
index 0000000000000000000000000000000000000000..318488e2695e577a9f76ed51171c087115eef22b
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/sharing.html
@@ -0,0 +1 @@
+$r.translate("chelp.sharing.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/technical.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/technical.html
new file mode 100644
index 0000000000000000000000000000000000000000..5e67bdf7c025275fb6ee21bd0632a4311ae5ca7e
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_chelp/technical.html
@@ -0,0 +1 @@
+$r.translate("chelp.technical.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_content/sharing.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_content/sharing.html
index 4028510fca6bb1efdac62787aedbdbe9399fb8a3..0e2d7bd03ad4a671ebc32b1d93da1cbe8048f263 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/_content/sharing.html
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_content/sharing.html
@@ -1,5 +1,6 @@
 <div class="b_form b_form_vertical b_clearfix">
 	<fieldset><legend>$r.translate("sharing")</legend>
+	#if ($off_chelp_package) $r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
 	#if($showPoolInfos) 
 		<span>$r.translate("menu.pools")</span>
 		$r.render("pools")
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html b/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html
index b38e689b81551cd8fb8eeaf0bf8c0c2563952d8c..eba5de34a548593e7dfec2b788f686dc28b12bf3 100644
--- a/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_content/view.html
@@ -1,8 +1,9 @@
 <div class="b_clearfix">
 	<fieldset>
 		<legend>$off_title</legend>
+		#if ($off_chelp_package) $r.contextHelpWithWrapper("$off_chelp_package","$off_chelp_page","$off_chelp_hover") #end
 		#if($r.available("edit"))
-			<div class="o_buttons_box_right">
+			<div class="o_buttons_box_right" style="margin-right:15px">
 				$r.render("edit")
 			</div>
 		#end
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/metadata/_i18n/LocalStrings_de.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f983a27ac6dd2f814839dbb918fd5b1a4351e59d
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_i18n/LocalStrings_de.properties
@@ -0,0 +1,29 @@
+#Mon Mar 02 09:54:04 CET 2009
+chelp.general.title=Fragenpool: Detailansicht Allgemein
+chelp.general.1=Sie erhalten hier Daten zur Kategorisierung wie Sprache, Thema und Fachbereich, sowie die Verschlagwortung. Abdeckung beschreibt das Themengebiet und grenzt dieses zusammen mit den Schlagworten ein. Unter Zusatzinformationen können weitere Metadaten eingegeben werden.
+chelp.lifecycle.title=Fragenpool: Detailansicht Lebenszyklus
+chelp.lifecycle.1=Der <b>Lebenszyklus</b> gibt Aufschluss über Versionsnummer und Status des Items, wie z.B. "in Überarbeitung" oder "Nicht verfügbar".
+chelp.rights.title=Fragenpool: Detailansicht Rechte
+chelp.rights.1=Hier finden Sie die eingetragenen Urheber der Frage, und gegebenenfalls die Lizenz unter der das Item zur Verwendung zur Verfügung steht.
+chelp.sharing.title=Fragenpool: Detailansicht Freigabe / Autoren
+chelp.sharing.1=Hier können Sie einsehen in welchen Pools und für welche Gruppen die Frage freigegeben ist, und wer der/die Autor/en sind. Des weiteren können Sie hier die Frage herunterladen, kopieren, löschen und für Gruppen freigeben.
+chelp.educational.title=Fragenpool: Detailansicht Didaktik
+chelp.educational.1=Hier finden Sie Informationen zur primären Zielgruppe dieser Frage, der Stufe, die vor allem der Einordnung und Zurordnung dient, sowie zur durchschnittlichen Bearbeitungszeit. Beide Angaben helfen dabei, Wissenstufen-gerechte Tests zusammen zu stellen.
+chelp.question.title=Fragenpool: Detailansicht Itemanalyse
+chelp.question.1=Die <b>Itemanalyse</b> ist ein Instrument zur Testerstellung und Testbewertung, bei der die Eignung einzelner Fragen für einen bestimmten Test respektive Wissensabfrage im Hinblick auf die Untersuchungsziele geprüft wird.
+chelp.question.2=Die <b>Itemschwierigkeit</b> drückt mit einem Wert zwischen 0 und 1 aus, wie schwer eine Frage zu beantworten ist, und gibt damit an wieviele Personen die Frage korrekt lösen. 
+chelp.question.3=Die <b>Standardabweichung</b> gibt mit einem Wert zwischen 0 und 1 an, wie stark sich die Antworten auf eine Frage zwischen mehreren Personen unterscheiden. 
+chelp.question.4=Die <b>Trennschärfe</b> gibt mit einem Wert zwischen -1 und +1 an, ob eine Frage etwas Ähnliches abfragt wie der übrige Test, also wie relevant die Frage für das Themengebiet ist. Die Trennschärfe ist daher der wichtigste Kennwert in der Itemselektion. 
+chelp.question.5=Des weiteren erhalten Sie hier Informationen zu der in der Frage enthaltenen Anzahl Distraktoren, also wieviele Antwortalternativen zur Verfügung stehen. 
+chelp.question.6=Wird die Frage in einem oder mehreren Tests verwendet, finden Sie hier die genaue Anzahl. Dies wird bei Einbindung in einen Test automatisch erhöht. Zuletzt erhalten Sie einen Hinweis über die Eignung der Frage für formative oder summative Tests.
+chelp.technical.title=Fragenpool: Detailansicht Technik
+chelp.technical.1=Unter Technik finden Sie Informationen zum Editor in der die Frage erstellt wurde, sowie dessen Version. Das Format gibt an, welches technische Format die Frage hat. Erstellt und letzte Änderung geben an, wann die Frage erstellt bzw. importiert wurde und ob z.B. anschliessend noch Änderungen daran vorgenommen wurden.
+
+help.hover.general=Hilfe zur Detailansicht Allgemein
+help.hover.lifecycle=Hilfe zur Detailansicht Lebenszyklus
+help.hover.rights=Hilfe zur Detailansicht Rechte
+help.hover.sharing=Hilfe zur Detailansicht Freigabe / Autoren
+help.hover.educational=Hilfe zur Detailansicht Didaktik
+help.hover.question=Hilfe zur Detailansicht Itemanalyse
+help.hover.technical=Hilfe zur Detailansicht Technik
+
diff --git a/src/main/java/org/olat/modules/qpool/ui/metadata/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/qpool/ui/metadata/_i18n/LocalStrings_en.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e1224a9a51848f02fca7db2ddce8b0947a2fb0c8
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/metadata/_i18n/LocalStrings_en.properties
@@ -0,0 +1 @@
+#Mon Mar 18 11:59:20 CET 2013
diff --git a/src/main/java/org/olat/modules/qpool/ui/wizard/ExportTypeController.java b/src/main/java/org/olat/modules/qpool/ui/wizard/ExportTypeController.java
index 57fb82218eacabdebe1d1eae2584f6b07d3d6551..c144e7a8e19d15cfd57b36cb8000a348fa29e9c8 100644
--- a/src/main/java/org/olat/modules/qpool/ui/wizard/ExportTypeController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/wizard/ExportTypeController.java
@@ -88,6 +88,8 @@ public class ExportTypeController extends StepFormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormDescription("export.type.desc");
+		setFormContextHelp("org.olat.modules.qpool.ui.wizard", "export-type.html", "help.hover.export-type");
+		
 		formatEl = uifactory.addDropdownSingleselect("export.type", "export.type", formLayout, formatKeys, formatValues, null);
 	}
 
diff --git a/src/main/java/org/olat/modules/qpool/ui/wizard/_chelp/export-type.html b/src/main/java/org/olat/modules/qpool/ui/wizard/_chelp/export-type.html
new file mode 100644
index 0000000000000000000000000000000000000000..dde6880ffb00a803688d2b3a466d6c71572c1a0f
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/wizard/_chelp/export-type.html
@@ -0,0 +1 @@
+$r.translate("chelp.export-type.1")
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/wizard/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/wizard/_i18n/LocalStrings_de.properties
index 54927735039825bbcd422b92848e6ef3d289759f..b28e5857ac752a9f998925f57a1b4742716a7ade 100644
--- a/src/main/java/org/olat/modules/qpool/ui/wizard/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/wizard/_i18n/LocalStrings_de.properties
@@ -1,4 +1,10 @@
 #Mon Mar 02 09:54:04 CET 2009
+
+chelp.export-type.title=Fragenpool: Export
+chelp.export-type.1=Vorab markierte Fragen können Sie mithilfe des Wizards in drei verschiedenen Formaten exportieren. Entweder werden die markierten Fragen als XML-Datei im <b>.zip-Format</b> heruntergeladen, oder Sie können die Fragen als fertigen Test im IMS QTI 1.2 Format entweder herunterladen, oder direkt als Lernressource wieder in OpenOLAT erstellen.
+
+help.hover.export-type=Hilfe zur Export
+
 author.item=Autoren
 author.choose.title=Autoren auswählen
 author.confirm.title=Bestätigen