diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionPoolAdminStatisticsController.java b/src/main/java/org/olat/core/gui/control/controller/BlankController.java
similarity index 67%
rename from src/main/java/org/olat/modules/qpool/ui/QuestionPoolAdminStatisticsController.java
rename to src/main/java/org/olat/core/gui/control/controller/BlankController.java
index 9f340681541623e8f8c1949fb90869f811b6aabf..9802241cc1876159fde3d3dee1a6ed17a7594d19 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionPoolAdminStatisticsController.java
+++ b/src/main/java/org/olat/core/gui/control/controller/BlankController.java
@@ -17,45 +17,34 @@
* frentix GmbH, http://www.frentix.com
* <p>
*/
-package org.olat.modules.qpool.ui;
+package org.olat.core.gui.control.controller;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
-import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
-import org.olat.core.gui.control.controller.BasicController;
/**
+ * Convenience controller to show a blank area.
*
- * Initial date: 21.02.2013<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ * Initial date: 04.01.2018<br>
+ * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
*
*/
-public class QuestionPoolAdminStatisticsController extends BasicController {
-
- private final VelocityContainer mainVC;
-
- public QuestionPoolAdminStatisticsController(UserRequest ureq, WindowControl wControl) {
+public class BlankController extends BasicController {
+
+ public BlankController(UserRequest ureq, WindowControl wControl) {
super(ureq, wControl);
-
- mainVC = createVelocityContainer("admin_overview");
- putInitialPanel(mainVC);
}
-
+
@Override
- protected void doDispose() {
+ protected void event(UserRequest ureq, Component source, Event event) {
//
}
@Override
- protected void event(UserRequest ureq, Component source, Event event) {
+ protected void doDispose() {
//
}
-
-
-
-
-
}
diff --git a/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java b/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java
index 2479c4382672d0b0984251a7ea72be4f4930594c..6e546128f505963f35faf006bcbc296b6dd00125 100644
--- a/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java
+++ b/src/main/java/org/olat/modules/qpool/QuestionPoolModule.java
@@ -49,6 +49,8 @@ import org.springframework.stereotype.Service;
@Service("qpoolModule")
public class QuestionPoolModule extends AbstractSpringModule implements ConfigOnOff {
+ private static final String DIRECTORY = "qpool";
+ private static final String INFOS_PAGE_DIRECTORY = "infospage";
private static final String COLLECTIONS_ENABLED = "collections.enabled";
private static final String POOLS_ENABLED = "pools.enabled";
private static final String SHARES_ENABLED = "shares.enabled";
@@ -161,10 +163,15 @@ public class QuestionPoolModule extends AbstractSpringModule implements ConfigOn
public VFSContainer getRootContainer() {
if(rootContainer == null) {
- rootContainer = new OlatRootFolderImpl(File.separator + "qpool", null);
+ rootContainer = new OlatRootFolderImpl(File.separator + DIRECTORY, null);
}
return rootContainer;
}
+
+ public VFSContainer getInfoPageContainer() {
+ String path = "/" + DIRECTORY + "/" + INFOS_PAGE_DIRECTORY;
+ return new OlatRootFolderImpl(path, null);
+ }
public List<QPoolSPI> getQuestionPoolProviders() {
List<QPoolSPI> providers = new ArrayList<>(questionPoolProviders);
diff --git a/src/main/java/org/olat/modules/qpool/ui/PresentationController.java b/src/main/java/org/olat/modules/qpool/ui/PresentationController.java
index 95c7008d4677fb390ceb11d66052e10aad54cd9a..06fc6dc1c77e836fedc754e8d1005ffaf7adae05 100644
--- a/src/main/java/org/olat/modules/qpool/ui/PresentationController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/PresentationController.java
@@ -19,11 +19,16 @@
*/
package org.olat.modules.qpool.ui;
+import org.olat.core.commons.modules.singlepage.SinglePageController;
import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.control.Controller;
+import org.olat.core.gui.components.Component;
+import org.olat.core.gui.components.velocity.VelocityContainer;
+import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BasicController;
+import org.olat.core.util.vfs.VFSContainer;
+import org.olat.modules.qpool.QuestionPoolModule;
+import org.springframework.beans.factory.annotation.Autowired;
/**
*
@@ -31,16 +36,23 @@ import org.olat.core.gui.control.WindowControl;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
-public class PresentationController extends FormBasicController {
+public class PresentationController extends BasicController {
+
+ @Autowired
+ QuestionPoolModule qpoolModule;
public PresentationController(UserRequest ureq, WindowControl wControl) {
- super(ureq, wControl, "presentation");
- initForm(ureq);
- }
-
- @Override
- protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
- //
+ super(ureq, wControl);
+
+ VelocityContainer mainVC = createVelocityContainer("presentation");
+
+ VFSContainer container = qpoolModule.getInfoPageContainer();
+ if(container.resolve("index.html") != null) {
+ SinglePageController indexCtrl = new SinglePageController(ureq, getWindowControl(), container, "index.html", false);
+ mainVC.put("index", indexCtrl.getInitialComponent());
+ }
+
+ putInitialPanel(mainVC);
}
@Override
@@ -49,7 +61,8 @@ public class PresentationController extends FormBasicController {
}
@Override
- protected void formOK(UserRequest ureq) {
+ protected void event(UserRequest ureq, Component source, Event event) {
//
}
+
}
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 95ea1397132de08dbc6f35dbd68cffe6c0b0a674..bf3b3418ddfbec4712bf48c0c5c88a7f041f933c 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java
@@ -32,6 +32,7 @@ import org.olat.core.gui.components.panel.Panel;
import org.olat.core.gui.components.stack.TooledStackedPanel;
import org.olat.core.gui.components.tree.MenuTree;
import org.olat.core.gui.components.tree.TreeDropEvent;
+import org.olat.core.gui.components.tree.TreeEvent;
import org.olat.core.gui.components.tree.TreeNode;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
@@ -128,19 +129,31 @@ public class QuestionPoolMainEditorController extends BasicController implements
String dropId = e.getDroppedNodeId();
//drop id w_o_fi1000002357-4
doDrop(ureq, targetId, dropId);
- } else if(menuTree.getSelectedNode() != null){
- TreeNode node = menuTree.getSelectedNode();
- doSelectControllerTreeNode(ureq, node, null, null);
+ } else if (event instanceof TreeEvent){
+ TreeEvent te = (TreeEvent) event;
+ if (MenuTree.COMMAND_TREENODE_CLICKED.equals(te.getCommand())) {
+ TreeNode node = menuTree.getTreeModel().getNodeById(te.getNodeId());
+ doSelectControllerTreeNode(ureq, node, null, null);
+ }
}
}
}
-
+
private void doSelectControllerTreeNode(UserRequest ureq, TreeNode node, List<ContextEntry> entries, StateEntry state) {
- if (node instanceof ControllerTreeNode) {
- ControllerTreeNode cNode = (ControllerTreeNode) node;
+ TreeNode nodeToShow = getDelegate(node);
+ menuTree.setSelectedNode(nodeToShow);
+ if (nodeToShow instanceof ControllerTreeNode) {
+ ControllerTreeNode cNode = (ControllerTreeNode) nodeToShow;
doSelectQuestionsNode(ureq, cNode, entries, state);
}
}
+
+ private TreeNode getDelegate(TreeNode node) {
+ if (node.getDelegate() != null) {
+ getDelegate(node.getDelegate());
+ }
+ return node;
+ }
@Override
protected void event(UserRequest ureq, Controller source, Event event) {
diff --git a/src/main/java/org/olat/modules/qpool/ui/SharePresentationController.java b/src/main/java/org/olat/modules/qpool/ui/SharePresentationController.java
deleted file mode 100644
index e8c1f5e55401736657fbdb7dac77323cb108c530..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/qpool/ui/SharePresentationController.java
+++ /dev/null
@@ -1,55 +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.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-
-/**
- *
- * Initial date: 12.07.2013<br>
- * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
- *
- */
-public class SharePresentationController extends FormBasicController {
-
- public SharePresentationController(UserRequest ureq, WindowControl wControl) {
- super(ureq, wControl, "share_presentation");
- initForm(ureq);
- }
-
- @Override
- protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
- //
- }
-
- @Override
- protected void doDispose() {
- //
- }
-
- @Override
- protected void formOK(UserRequest ureq) {
- //
- }
-}
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/admin_overview.html b/src/main/java/org/olat/modules/qpool/ui/_content/admin_overview.html
deleted file mode 100644
index 8c88a263121afc34b4bf48103a04981bbdbdb11e..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/qpool/ui/_content/admin_overview.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<fieldset>
- <legend>$r.translate("menu.admin") $r.contextHelpWithWrapper("Question Bank Administration")</legend>
- <p>$r.translate("menu.admin.overview.1")</p>
- <p>$r.translate("menu.admin.overview.2")</p>
- <p>$r.translate("menu.admin.overview.3")</p>
- <p>$r.translate("menu.admin.overview.4")</p>
- <p>$r.translate("menu.admin.overview.5")</p>
-</fieldset>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/presentation.html b/src/main/java/org/olat/modules/qpool/ui/_content/presentation.html
index bee601984745d0eaf6d00cf9fd468d2c42f5dccc..5bf66893421dbb93860b1690f19cfdcbe10a07a7 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_content/presentation.html
+++ b/src/main/java/org/olat/modules/qpool/ui/_content/presentation.html
@@ -1,23 +1,4 @@
-<div class="o_sel_qpool_presentation">
- <h4><i class="o_icon o_icon_qpool"> </i> $r.translate("presentation.title")$r.contextHelpWithWrapper("Question Bank")</h4>
- <p>$r.translate("presentation.1")</p>
- <p>$r.translate("presentation.2")</p>
- <h5>$r.translate("presentation.subtitle")</h5>
- <div class="row">
- <div class="col-sm-4">
- <ol>
- <li><p>$r.translate("presentation.3")</p></li></ol>
- <ul>
- <li>$r.translate("presentation.4")</li>
- <li>$r.translate("presentation.5")</li>
- <li>$r.translate("presentation.6")</li>
- </ul>
- </div>
- <div class="col-sm-4">
- <ol start="2"><li>$r.translate("presentation.7")</li></ol>
- </div>
- <div class="col-sm-4">
- <ol start="3"><li>$r.translate("presentation.8")</li></ol>
- </div>
- </div>
-</div>
\ No newline at end of file
+<h4><i class="o_icon o_icon_qpool"> </i> $r.translate("presentation.title")$r.contextHelpWithWrapper("Question Bank")</h4>
+#if($r.available("index"))
+ $r.render("index")
+#end
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/_content/share_presentation.html b/src/main/java/org/olat/modules/qpool/ui/_content/share_presentation.html
deleted file mode 100644
index 5435080d58da936af5876b5fadd9abe81afc402e..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/qpool/ui/_content/share_presentation.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="o_sel_qpool_presentation">
- <h4><i class="o_icon o_sel_qpool_pool"> </i> $r.translate("share.presentation.title")</h4>
- <p>$r.translate("share.presentation.1")</p>
- <p>$r.translate("share.presentation.2")</p>
- <p>$r.translate("share.presentation.3")</p>
- <p>$r.translate("share.presentation.4")</p>
- <h5>$r.translate("share.presentation.subtitle")</h5>
- <div class="row">
- <div class="col-sm-4">
- <ol>
- <li><p>$r.translate("share.presentation.5")</p></li></ol>
- <ul>
- <li>$r.translate("share.presentation.6")</li>
- <li>$r.translate("share.presentation.7")</li>
- </ul>
- </div>
- <div class="col-sm-4">
- <ol start="2"><li>$r.translate("share.presentation.8")</li></ol>
- <ul>
- <li>$r.translate("share.presentation.9")</li>
- <li>$r.translate("share.presentation.10")</li>
- </ul>
- </div>
- <div class="col-sm-4">
- <ol start="3"><li>$r.translate("share.presentation.11")</li></ol>
- </div>
- </div>
-</div>
\ No newline at end of file
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 e986b06a7a801c3add25ce4a3510f3da90347d68..b3490604e5c61ba1b315aa6c532b9b4ebcc10267 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
@@ -109,11 +109,6 @@ menu.admin.levels=Stufe
menu.admin.levels.alt=Stufe
menu.admin.licenses=Lizenz
menu.admin.licenses.alt=Lizenz
-menu.admin.overview.1=Im Administrationsbereich werden die f\u00FCnf Bereiche zur Organisation der Inhalte des Fragenpools verwaltet. Das sind zum einen die <b>Fachbereiche</b>, die der fachlichen Verschlagwortung von Frageitems dienen. Sie werden in einer hierarchischen Struktur dargestellt, und k\u00F6nnen z.B. Studieng\u00E4nge oder Organisationseinheiten abbilden.
-menu.admin.overview.2=<b>Pools</b>, oder auch Datenbanken, zum Austausch von Fragen f\u00FCr freigegebene Benutzer werden vom Administrator erstellt\: Sie dienen der inhaltlichen Organisation f\u00FCr kollaboratives Arbeiten.
-menu.admin.overview.3=Sollten Autoren zu den bereits bestehenden f\u00FCnf Standard-Fragetypen weitere <b>Fragetypen</b> ben\u00F6tigen, k\u00F6nnen Sie diese hier erstellen.
-menu.admin.overview.4=<b>Stufen</b> stellen eine weitere Kategorisierungsm\u00F6glichkeit dar, und k\u00F6nnen z.B. mit Schwierigkeitsstufen verglichen werden. Wie auch bei den Fachbereichen ist es ratsam, Stufen vorab zu erstellen, d.h. bevor der Fragenpool bef\u00FCllt wird.Zu den bereits vorhandenen acht Standardlizenzen (davon sieben Creative Commons) k\u00F6nnen bei Bedarf weitere <b>Lizenzen</b> hinzugef\u00FCgt werden.
-menu.admin.overview.5=Mehr Informationen zu den einzelnen Bereiche finden Sie in der Hilfe des jeweiligen Bereichs.
menu.admin.pools=Pool-Verwaltung
menu.admin.studyfields=Fachbereich
menu.admin.studyfields.alt=Fachbereich
@@ -142,15 +137,6 @@ pool.key=ID
pool.name=Name
pool.owners=Besitzer
pool.public=\u00D6ffentlich
-presentation.1=Der kollaborative Fragenpool erlaubt Autoren, Testfragen als einzelne Items in einer katalog\u00E4hnlichen Struktur zu speichern. Die Fragen k\u00F6nnen mit anderen Benutzern, Gruppen oder Autoren geteilt werden.
-presentation.2=Aus dem Fragenpool heraus k\u00F6nnen Benutzer eigene Fragen, Listen und Tests erstellen und exportieren.
-presentation.3=Um Fragen verwenden zu k\u00F6nnen, m\u00FCssen sich die Fragen in "Meine Fragen" befinden. Fragen k\u00F6nnen
-presentation.4=aus dem Katalog oder anderen Pools sowie eventuellen Gruppenfreigaben kopiert werden
-presentation.5=aus externen .zip-Dateien oder aus den Lernressourcen importiert werden
-presentation.6=direkt erstellt werden mit dem Testeditor
-presentation.7=Fragen lassen sich leicht mit Listen organisieren, und bleiben so \u00FCbersichtlich. Fragen k\u00F6nnen von Listen wieder entfernt werden
-presentation.8=Fragen k\u00F6nnen als Test in die OpenOLAT Lernressourcen, im QTI 1.2 Format oder als .zip-Datei exportiert werden.
-presentation.subtitle=Was muss ich tun?
presentation.title=Fragenpool
previous=Vorherige
process.comment=Kommentar
@@ -206,19 +192,6 @@ share.group=Zur Gruppe freigeben
share.item=Freigeben
share.options=Wollen Sie anderen Personen erlauben diese Frage(n) zu bearbeiten?
share.pool=Zu Pool freigeben
-share.presentation.1=In den Freigaben befinden sich alle durch Benutzer freigegebenen Fragen.
-share.presentation.10=Gruppen freigegeben werden. Nur Benutzer die sich in dieser Gruppe befinden und Zugriffsrechte auf den Fragenpool haben, bekommen diese Freigabe angezeigt.
-share.presentation.11=Bereits freigegebene Fragen k\u00F6nnen aus Pools, Gruppen und von Listen wieder entfernt werden. Die Frage selbst wird dabei nicht aus "Meine Fragen" gel\u00F6scht.
-share.presentation.2=Mit Hilfe von Pools und Gruppenfreigaben bestimmen die Benutzer, wer Zugriff auf einzelne Fragen hat.
-share.presentation.3=Der Catalog ist der Standardpool auf den alle Benutzer mit Autorenrechten Zugriff haben. Der Fragenpool-Administrator kann neue Pools erstellen und deren Zugriffsrechte festlegen, weshalb sich die Anzahl Pools pro OpenOLAT-Benutzer unterscheiden kann.
-share.presentation.4=Fragen k\u00F6nnen auch f\u00FCr Gruppen freigegeben werden. Ob und wieviele Gruppen unter "Freigaben" angezeigt werden, h\u00E4ngt vom Benutzer ab.
-share.presentation.5=Um Fragen verwenden zu k\u00F6nnen, m\u00FCssen sich die Fragen in "Meine Fragen" oder auf einer Liste befinden. Fragen k\u00F6nnen
-share.presentation.6=aus dem Catalog oder anderen Pools sowie eventuellen Gruppenfreigaben kopiert werden
-share.presentation.7=zu Listen organisiert werden. Fragen k\u00F6nnen von Listen entfernt werden ohne die Frage selbst zu l\u00F6schen.
-share.presentation.8=Damit andere Benutzer Zugriff auf Fragen anderer Autoren haben, m\u00FCssen diese zuerst freigegeben werden. Fragen k\u00F6nnen an
-share.presentation.9=Pools freigegeben werden. Neben dem Standardkatalog kann es noch weitere, eventuell nicht \u00F6ffentliche, Pools geben
-share.presentation.subtitle=Was muss ich tun?
-share.presentation.title=Freigaben
shared=Freigegeben
wharing.shares=Gruppen
sharing.shares.empty.table=Diese Frage ist mit keiner Gruppe freigegeben.
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
index f6324ba1e50d24d208704c82a934e0f49420a299..450f57b5e9aa0fa43fed8066d89d74b48f8ca469 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
@@ -105,11 +105,6 @@ manage.owners=Authors
mark=<i class\="o_icon o_icon_bookmark_header o_icon-lg" title\="Bookmark"> </i>
menu.admin=Administration
menu.admin.alt=Administration
-menu.admin.overview.1=The administration area of the question bank provides question bank managers with access to the five organisational domains of the question bank.
-menu.admin.overview.2=A <b>pool</b>, or data bank, allows the exchange of items for users with the appropriate rights. Pools thus enable collaborative work for specified groups of authors.
-menu.admin.overview.3=If authors need more question types in addition to the already existing five default types, you can create them here.
-menu.admin.overview.4=<b>Level</b> add another categorisation option to the question bank, and can be compared to difficulty levels. Just like with subjects, we advise administrators to create levels beforehand. Create additional <b>license</b> types to complement the already existing eight default licenses (of which seven are Creative Commons).
-menu.admin.overview.5=More information on the different areas can be found in the respective help.
menu.admin.levels=Level
menu.admin.levels.alt=Level
menu.admin.licenses=License
@@ -144,15 +139,6 @@ pool.key=ID
pool.name=Name
pool.owners=Owners
pool.public=Public
-presentation.1=The collaborative question bank allows authors to save assessment questions as individual items in a structure similar to a catalog. All such items can be shared with other users or groups.
-presentation.2=The question bank allows users to create questions, lists and tests and export them.
-presentation.3=In order to be able to edit questions, they need to be listed in the "My questions" table. Questions can be
-presentation.4=copied from the catalog, other pools or group shares
-presentation.5=imported from the learning ressources or as .zip-file
-presentation.6=created from scratch with the test editor
-presentation.7=It is easy to structure and organize questions using lists. Questions can be removed from lists.
-presentation.8=You can export questions either as learning ressource back into OpenOLAT, or download it as .zip-file, in the QTI 1.2 standard format or as a Word document.
-presentation.subtitle=What do I have to do?
presentation.title=Question bank
previous=Previous
process.comment=Comment
@@ -208,19 +194,6 @@ share.group=Share with group
share.item=Share
share.options=Do you want to allow other users to edit the imported question(s)?
share.pool=Share with pool
-share.presentation.1=In Shares you find all the questions shared by other users.
-share.presentation.10=with groups. Only members of that group who also have access rights to the question bank will see this question share.
-share.presentation.11=Already shared questions can be removed from pools, groups and list. Using this workflow, the removed question will not be deleted from "My questions".
-share.presentation.2=By using pool and group shares authors define who has access to questions.
-share.presentation.3=The catalog is the standard pool which is accessible by all users with the author role. The question bank manager can create new pools and regulate the access rights of every pool. Therefore, the number of visible pools can vary between OpenOLAT users.
-share.presentation.4=Question items can also be shared with groups. If and how many group are listed under "Shares" depends on the current user.
-share.presentation.5=To use question items they have to be in "My questions" or on a list. Questions can
-share.presentation.6=be copied from the catalog or any pool or group share.
-share.presentation.7=be organized as lists. Question can be removed from lists without deleting the item itself.
-share.presentation.8=To make question items available to other authors you first have to share the items with them. Question items can be shared
-share.presentation.9=with pools. Besides the standard catalog there might also exist other pools which may not be public.
-share.presentation.subtitle=What do I have to do?
-share.presentation.title=Shares
shared=Shared
sharing.shares=Groups
sharing.shares.empty.table=This question is not shared with any group.
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties
index 90aeec0d33d0f2708f111863be649b11452f43bd..7b0e581d7c014ffebadf3d52850352c2494714ce 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_fr.properties
@@ -104,11 +104,6 @@ menu.admin.levels=Niveau
menu.admin.levels.alt=Niveau
menu.admin.licenses=Licenses
menu.admin.licenses.alt=Administrer les licenses
-menu.admin.overview.1=La partie administration de la banque de questions donne acc\u00E8s au cinq domaines qui permettent d'organiser les questions. Vous y trouverez en particulier la gestion des sujets qui permettent de classer vos questions au sein d'une hi\u00E9rarchie, par exemple un cursus scolaire ou les unit\u00E9s d'une organisation ou d'une entreprise.
-menu.admin.overview.2=Un <b>pool</b>, ou une banque de donn\u00E9es, permet d'\u00E9changer les questions avec les utilisateurs qui ont re\u00E7u les droits appropri\u00E9s pour y acc\u00E9der. Les pools permettent la collaboration au sein d'un groupe sp\u00E9cifique d'auteurs.
-menu.admin.overview.3=Si les auteurs ont besoins de plus de type de questions que les cinq types originaux, vous pouvez les ajouter ici.
-menu.admin.overview.4=<b>Niveau</b> ajouter une autre possibilit\u00E9 d'organiser la banque de questions et peut-\u00EAtre compar\u00E9 aux niveaux de difficult\u00E9. Comme pour les sujets, nous conseillons les administrateurs de cr\u00E9er une liste de niveau \u00E0 l'avance. Pour compl\u00E9ter la liste de licences, vous pouvez en ajouter au huit d\u00E9j\u00E0 disponibles ( sept sont des licenses "Creative Commons").
-menu.admin.overview.5=Vous pouvez trouvez de plus amples informations avec le bouton d'aide int\u00E9gr\u00E9 aux divers fonctions.
menu.admin.pools=Gestion des pools
menu.admin.studyfields=Sujet
menu.admin.studyfields.alt=Sujet
@@ -134,15 +129,6 @@ pool.key=ID
pool.name=Nom
pool.owners=Propri\u00E9taires
pool.public=Public
-presentation.1=La banque de questions collaborative permet aux auteurs de mettre les questions comme des \u00E9l\u00E9ments individuels dans une structure similaire \u00E0 un catalogue. Tous ces \u00E9l\u00E9ments peuvent \u00EAtre partag\u00E9s avec d'autres utilisateurs ou groupes.
-presentation.2=La banque de questions permet aux utilisateurs de cr\u00E9er des questions, des listes et des tests et de les exporter.
-presentation.3=Afin de pouvoir modifier les questions, elles doivent \u00EAtre r\u00E9pertori\u00E9es dans le tableau "Mes questions". Les questions peuvent \u00EAtre
-presentation.4=copi\u00E9s \u00E0 partir du catalogue, d'autres pools ou depuis la liste partag\u00E9e d'un groupe
-presentation.5=import\u00E9e d'une ressource didactique ou comme fichier zip
-presentation.6=cr\u00E9er avec l'\u00E9diteur de test
-presentation.7=Il est facile de structurer et d'organiser vos questions en utilisant une liste. Les questions peuvent \u00EAtre retir\u00E9es des listes.
-presentation.8=Vous pouvez exporter des questions comme ressource didactique, les t\u00E9l\u00E9charger sous la forme d'un fichier zip ou dans au format standard QTI 1.2.
-presentation.subtitle=Que dois-je faire?
presentation.title=Banque de questions
previous=Pr\u00E9c\u00E9dent
question=Analyse \u00E9l\u00E9ment
@@ -176,19 +162,6 @@ share.group=Partagez avec un groupe
share.item=Partagez
share.options=Voulez-vous permettre \u00E0 une autre personne d'\u00E9diter cette/ces question(s)?
share.pool=Partagez dans un pool
-share.presentation.1=Dans "Partag\u00E9", vous trouverez toutes les questions partag\u00E9es par les autres auteurs.
-share.presentation.10=Partager avec un groupe. Seuls les membres de ce groupe qui ont acc\u00E8s \u00E0 la banque de questions verront cette question.
-share.presentation.11=Des questions d\u00E9j\u00E0 partag\u00E9s peuvent \u00EAtre retir\u00E9s des pools, des groupes et des listes. La question retir\u00E9e ne sera pas supprim\u00E9 de "Mes questions".
-share.presentation.2=Les auteurs peuvent d\u00E9finir qui a acc\u00E8s \u00E0 leurs questions en utilisant les pools et le partage par les groupes.
-share.presentation.3=Le catalogue est le pool standard qui est accessible par tous les utilisateurs ayant le r\u00F4le d'auteur. L'administrateur de la banque de questions peut cr\u00E9er de nouveaux pools et en limiter les droits d'acc\u00E8s pour chacun d'eux. Par cons\u00E9quent, le nombre de pools disponibles peut varier entre les utilisateurs OpenOLAT.
-share.presentation.4=Les questions peuvent \u00E9galement \u00EAtre partag\u00E9s avec des groupes. Si des groupes sont \u00E9num\u00E9r\u00E9s sous la rubrique "Partag\u00E9" et combien d\u00E9pend de l'utilisateur.
-share.presentation.5=Pour utiliser des \u00E9l\u00E9ments, ils doivent \u00EAtre dans "Mes questions" ou sous une liste. Les questions peuvent
-share.presentation.6=\u00EAtre copi\u00E9 \u00E0 partir du catalogue ou n'importe quel pool ou un groupe.
-share.presentation.7=\u00EAtre organis\u00E9s sous forme de listes. Les questions peuvent \u00EAtre retir\u00E9es des listes sans supprimer l'\u00E9l\u00E9ment lui-m\u00EAme.
-share.presentation.8=Pour modifier et cr\u00E9er des questions \u00E0 la disposition des autres auteurs, vous devez d'abord les partager avec eux. Les questions peuvent
-share.presentation.9=partag\u00E9es dans des pools. Outre le catalogue standard, il peut \u00E9galement exister d'autres pools qui ne sont pas public.
-share.presentation.subtitle=Que dois-je faire?
-share.presentation.title=Partage
shared=Partag\u00E9
sharing.shares=Groupes
technical=Technique
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_it.properties
index 35e1258131918a947ac7a9bc25b8f781624c6c9e..b02b1cbc230a2591f61f2b6b21c0f54c9f7ccf8e 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_it.properties
@@ -97,11 +97,6 @@ menu.admin.levels=Livello
menu.admin.levels.alt=Livello
menu.admin.licenses=Licenze
menu.admin.licenses.alt=Amministrare le licenze
-menu.admin.overview.1=L'area di amministrazione del pool delle domande permette l'accesso agli amministratori del pool ai cinque domini organizzativi del pool delle domande.
-menu.admin.overview.2=Un <b>pool</b>, o blocco di dati, permette lo scambio delle domande con utenti che hanno gli appropriati diritti. I pool permettono quindi un lavoro collaborativo per un gruppo specifico di autori.
-menu.admin.overview.3=Se gli autori necessitassero di pi\u00F9 tipi di domande in aggiunta ai cinque tipi predefiniti, puoi aggiungerli qui.
-menu.admin.overview.4=Il <b>livello</b> aggiunge un altra opzione di categorizzazione al blocco delle domande e pu\u00F2 essere assimilato ai livelli di difficolt\u00E0. Cos\u00EC come con gli oggetti, consigliamo agli amministratori di creare i livelli in anticipo. Creare tipi di <b>licenza</b> aggiuntivi per completare le esistenti otto licenze predefinite (delle quali sette sono Creative Commons).
-menu.admin.overview.5=Informazioni aggiuntive sulle differenti aree possono essere trovate utilizzando il bottone di aiuto integrato nelle varie funzioni.
menu.admin.pools=Gestione dei pool
menu.admin.studyfields=Disciplina
menu.admin.studyfields.alt=Oggetto
@@ -127,15 +122,6 @@ pool.key=ID
pool.name=Nome
pool.owners=Proprietari
pool.public=Pubblico
-presentation.1=Il blocco domande collaborativo permette agli autori di memorizzare le domande di valutazione come elementi individuali in una struttura simile ad un catalogo. Tutti questi elementi possono essere condivisi con altri utenti o gruppi.
-presentation.2=Il pool delle domande permette agli utenti di creare e successivamente esportare domande, liste e test.
-presentation.3=Al fine di poter modificare le domande, queste devono essere elencate nella tabella "Le mie domande". Le domande possono essere
-presentation.4=copiate dal catalogo, da altri pool o da condivisioni di gruppo
-presentation.5=importate da una risorsa didattica, o come file .zip
-presentation.6=create da zero con l'editore di test
-presentation.7=\u00C8 facile strutturare e organizzare le domande utilizzando le liste. Le domande possono essere rimosse dalle liste.
-presentation.8=Puoi esportare le domande come risorsa didattica in OpenOLAT; oppure scaricarle come file .zip, nel formato standard QTI 1.2 o come documento Word.
-presentation.subtitle=Cosa devo fare?
presentation.title=Pool delle domande
previous=Precedente
question=Analisi dell'elemento
@@ -169,19 +155,6 @@ share.group=Condivisione con un gruppo
share.item=Condivisione
share.options=Vuoi permettere ad altri utenti di modificare la/le domanda/e importata/e?
share.pool=Condivisione con un pool
-share.presentation.1=In Condivisione troverai tutte le domande condivise dagli altri utenti.
-share.presentation.10=con gruppi. Solo i membri di quel gruppo che hanno anche diritto di accesso al pool delle domande potr\u00E0 visualizzare questa domanda condivisa.
-share.presentation.11=Domande gi\u00E0 condivise possono essere rimosse dai pool, gruppi e liste. Usando questa funzione, le domande rimosse non saranno eliminate da "Le mie domande".
-share.presentation.2=Con l'uso dei pool e delle condivisioni di gruppo gli autori definiscono chi ha accesso alle domande.
-share.presentation.3=Il catalogo \u00E8 il pool standard che \u00E8 accessibile da tutti gli utenti con ruolo di autore. L'amministratore del pool delle domande pu\u00F2 creare nuovi pool e regolare il diritto di accesso ad ogni pool. Per questo motivo il numero di pool visibili pu\u00F2 variare tra gli utenti di OpenOLAT.
-share.presentation.4=Le domande possono altres\u00EC essere condivise con dei gruppi. La quantit\u00E0 dei gruppi listati sotto "Condivisioni" dipende dall'utente corrente.
-share.presentation.5=Per usare degli elementi, questi devono essere elencati in "Le mie domande" o in una lista. Le domande possono
-share.presentation.6=essere copiate dal catalogo o da un pool o da una condivisione di gruppo.
-share.presentation.7=essere organizzate in liste. Le domande possono essere rimosse dalle liste senza eliminare la domanda stessa.
-share.presentation.8=Per rendere disponibili le domande ad altri autori, occorre prima di tutto condividerle con essi. Le domande possono essere condivise
-share.presentation.9=con i pool. Oltre il catalogo standard, possono esistere altri pool che potrebbero non essere pubblici.
-share.presentation.subtitle=Che devo fare?
-share.presentation.title=Condivisioni
shared=Condivisa
sharing.shares=Gruppi
technical=Tecnica
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pl.properties
index c14779fa9e1f032393ea572b943a21efea19302e..2a25b6ed7e97b9508dce6acec758e79fca70faea 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pl.properties
@@ -91,15 +91,6 @@ pool.key=ID
pool.name=Nazwa
pool.owners=W\u0142a\u015Bciciele
pool.public=Publiczne
-presentation.1=Wsp\u00F3lna baza pyta\u0144 pozwala autorom zapisywa\u0107 pytania testowe jako poszczeg\u00F3lne elementy w strukturze podobnej do katalogu. Wszystkie te elementy mog\u0105 by\u0107 udost\u0119pniane innym u\u017Cytkownikom lub grupom.
-presentation.2=Baza pyta\u0144 pozwala u\u017Cytkownikom na tworzenie pyta\u0144, list i test\u00F3w oraz ich eksport.
-presentation.3=\u017Beby edytowa\u0107 pytania, musz\u0105 one by\u0107 wymienione w tabeli "Moje pytania". Pytania mog\u0105 by\u0107
-presentation.4=skopiowane z katalogu, innych pul lub grup
-presentation.5=importowane z zasob\u00F3w edukacyjnych lub plik\u00F3w .zip
-presentation.6=tworzone od podstaw w edytorze test\u00F3w
-presentation.7=Za pomoc\u0105 list \u0142atwo jest zarz\u0105dza\u0107 pytaniami. Pytania mog\u0105 by\u0107 usuwane z list.
-presentation.8=Mo\u017Cna eksportowa\u0107 pytania jako zasoby edukacyjne (do powt\u00F3rnego u\u017Cycia w OpenOLAT), lub pobra\u0107 je jako plik zip, w standardzie QTI 1.2 albo jako dokument programu Word.
-presentation.subtitle=Co mam zrobi\u0107?
presentation.title=Baza pyta\u0144
previous=Poprzedni
question.assessmentType=Rodzaj testu
@@ -123,19 +114,6 @@ share.group=Udost\u0119pnij w grupie
share.item=Udost\u0119pnij
share.options=Czy chcesz pozwoli\u0107 innym osobom edytowa\u0107 to pytanie (te pytania)?
share.pool=Udost\u0119pnij w puli
-share.presentation.1=W Udost\u0119pnionych znajdziesz wszystkie pytania udost\u0119pnione przez innych u\u017Cytkownik\u00F3w.
-share.presentation.10=poprzez grupy. Tylko cz\u0142onkowie tych grup maj\u0105cy tak\u017Ce prawa dost\u0119pu do bazy pyta\u0144 zobacz\u0105 te udost\u0119pnione pytania.
-share.presentation.11=Udost\u0119pnione pytania mog\u0105 by\u0107 usuwane z pul, grup i list. Nie powoduje to usuni\u0119cia pyta\u0144 z "Moich pyta\u0144".
-share.presentation.2=Wykorzystuj\u0105c pule i grupy, autorzy mog\u0105 decydowa\u0107, kto ma dost\u0119p do ich pyta\u0144.
-share.presentation.3=Katalog jest standardow\u0105 pul\u0105, kt\u00F3ra jest dost\u0119pna dla wszystkich u\u017Cytkownik\u00F3w maj\u0105cych uprawnienia autora. Mened\u017Cer bazy pyta\u0144 mo\u017Ce tworzy\u0107 nowe pule i regulowa\u0107 prawa dost\u0119pu ka\u017Cdej z nich. Dlatego liczba widocznych pul mo\u017Ce by\u0107 inna dla ka\u017Cdego u\u017Cytkownika platformy OpenOLAT.
-share.presentation.4=Pytania mog\u0105 by\u0107 r\u00F3wnie\u017C udost\u0119pniane w grupach. Czy i ile grup jest dost\u0119pnych w tym celu, zale\u017Cy od konkretnego u\u017Cytkownika.
-share.presentation.5=\u017Beby u\u017Cy\u0107 pyta\u0144, musz\u0105 one by\u0107 w "Moich pytaniach" lub na li\u015Bcie. Pytania mog\u0105
-share.presentation.6=by\u0107 kopiowane z katalogu lub dowolnej udost\u0119pnionej puli czy grupy.
-share.presentation.7=by\u0107 zorganizowane w listy. Pytania mo\u017Cna usuwa\u0107 z list nie kasuj\u0105c ich (zupe\u0142nie).
-share.presentation.8=\u017Beby uczyni\u0107 pytania dost\u0119pnymi dla innych autor\u00F3w, nale\u017Cy je udost\u0119pni\u0107. Pytania mog\u0105 by\u0107 udost\u0119pnione
-share.presentation.9=poprzez pule. Poza standardowym katalogiem, mog\u0105 istnie\u0107 inne pule, kt\u00F3re mog\u0105 nie by\u0107 publiczne.
-share.presentation.subtitle=Co mam zrobi\u0107?
-share.presentation.title=Udost\u0119pnione
sharing.shares=Grupy
technical=Techniczne
technical.creation=Utworzono
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
index c53cb1016e4456f29b7697adc55c291c5600c6a4..7d407f1ace0a3759a0187c8d9a8450c4c2c9c087 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_pt_BR.properties
@@ -105,11 +105,6 @@ menu.admin.levels=N\u00EDvel
menu.admin.levels.alt=N\u00EDvel
menu.admin.licenses=Licen\u00E7a
menu.admin.licenses.alt=Licen\u00E7a
-menu.admin.overview.1=A \u00E1rea de administra\u00E7\u00E3o do banco de quest\u00F5es fornece a gestores do banco de quest\u00E3o acesso aos cinco dom\u00EDnios da organiza\u00E7\u00E3o do banco de quest\u00F5es.
-menu.admin.overview.2=O <b>reservat\u00F3rio</b>, ou banco de dados, permite a troca de itens para os usu\u00E1rios com os direitos apropriados. Reservat\u00F3rios permitim, assim, o trabalho colaborativo para grupos espec\u00EDficos de autores.
-menu.admin.overview.3=Se autores precisarem de mais tipos de perguntas, al\u00E9m dos cinco tipos padr\u00E3o j\u00E1 existentes, voc\u00EA pode cri\u00E1-los aqui.
-menu.admin.overview.4=<b>N\u00EDvel</b> adiciona outra op\u00E7\u00E3o de categoriza\u00E7\u00E3o do banco de quest\u00F5es, e pode ser comparado com os n\u00EDveis de dificuldade. Assim como com os indiv\u00EDduos, aconselhamos aos administradores criar n\u00EDveis. Crie <b>licen\u00E7a</b> de tipos adicionais para complementar as oito licen\u00E7as padr\u00E3o j\u00E1 existentes (dos quais sete s\u00E3o da Creative Commons).
-menu.admin.overview.5=Mais informa\u00E7\u00F5es sobre as diferentes \u00E1reas podem ser encontradas na respectiva ajuda.
menu.admin.pools=Administra\u00E7\u00E3o do reservat\u00F3rio
menu.admin.studyfields=Assunto
menu.admin.studyfields.alt=Assunto
@@ -135,15 +130,6 @@ pool.key=ID
pool.name=Nome
pool.owners=Propriet\u00E1rios
pool.public=P\u00FAblico
-presentation.1=O banco de perguntas colaborativo permite que autores registrem quest\u00F5es de avalia\u00E7\u00E3o como itens individuais em uma estrutura semelhante \u00E0 um cat\u00E1logo. Todos esses itens podem ser compartilhados com outros usu\u00E1rios ou grupos.
-presentation.2=O banco de perguntas permite que os usu\u00E1rios criem perguntas, listas e testes e depois os exportem.
-presentation.3=A fim de ser capaz de editar as perguntas, elas precisam estar listadas na tabela "Minhas perguntas". As perguntas podem ser
-presentation.4=copiadas a partir do cat\u00E1logo, reservat\u00F3rios ou compartilhadas em grupos
-presentation.5=importadas de recursos did\u00E1ticos ou de arquivos .zip
-presentation.6=criadas do zero, com o editor de teste
-presentation.7=\u00C9 f\u00E1cil de estruturar e organizar perguntas usando a lista. As perguntas podem ser removidas das listas.
-presentation.8=Voc\u00EA pode exportar perguntas como um recurso did\u00E1tico de volta para o OpenOLAT, ou baix\u00E1-la como. Zip no formato padr\u00E3o QTI 1.2.
-presentation.subtitle=O que deseja fazer ?
presentation.title=Banco de perguntas
previous=Anterior
question=An\u00E1lise de itens
@@ -178,19 +164,6 @@ share.group=Compartilhar com grupo
share.item=Compartilhar
share.options=Voc\u00EA quer permitir que outra pessoa possa editar este/estas pergunta(s)?
share.pool=Compartilhar com reservat\u00F3rio
-share.presentation.1=Em compartilhamentos voc\u00EA pode encontrar todas as perguntas compartilhadas por outros usu\u00E1rios.
-share.presentation.10=Compartilhar com o grupo. Apenas os membros do grupo, que tamb\u00E9m tem direitos de acesso ao banco de perguntas v\u00E3o ver esse compartilhamento.
-share.presentation.11=Quest\u00F5es j\u00E1 compartilhadas podem ser removidos de reservat\u00F3rios, grupos e listas. Usando este fluxo de trabalho, as perguntas removidos n\u00E3o ser\u00E3o exclu\u00EDdas de "Minhas perguntas".
-share.presentation.2=Usando reservat\u00F3rios e compartilhamento em grupos, os autores definem quem tem acesso \u00E0s perguntas.
-share.presentation.3=O cat\u00E1logo \u00E9 o reservat\u00F3rio padr\u00E3o, que pode ser acessado por todos os usu\u00E1rios com a fun\u00E7\u00E3o autor. O administrador do banco perguntas pode criar novos reservat\u00F3rios e limitar o acesso \u00E0 cada um deles. Portanto, o n\u00FAmero de reservat\u00F3rios vis\u00EDveis podem variar entre os utilizadores do OpenOLAT.
-share.presentation.4=As perguntas tamb\u00E9m podem ser compartilhadas em grupos. Se, e quantos grupo s\u00E3o listados sob "Compartilhamentos", vai depender do usu\u00E1rio atual.
-share.presentation.5=Para usar itens tipo pergunta, eles precisam estar em "Minhas perguntas", ou em uma lista. As perguntas podem
-share.presentation.6=ser copiados do cat\u00E1logo ou qualquer reservat\u00F3rio ou compartilhamento com grupo.
-share.presentation.7=ser organizados como listas. Perguntas podem ser removidas da lista sem apagar o item em si.
-share.presentation.8=Para fazer as perguntas dispon\u00EDveis \u00E0 outros autores, voc\u00EA primeiro tem que compartilhar os itens com eles. Perguntas podem
-share.presentation.9=compartilhar em reservat\u00F3rios. Al\u00E9m do cat\u00E1logo padr\u00E3o tamb\u00E9m como existir em outros reservat\u00F3rios que n\u00E3o precisam ser p\u00FAblicos.
-share.presentation.subtitle=O que preciso fazer ?
-share.presentation.title=Compartilhamentos
shared=Compartilhados
sharing.shares=Grupos
technical=T\u00E9cnico
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
index b82bd4031b158648566ddc03970f9e4a0a6ef1a0..38c0977b9b1076751bc2e0d669cdba5166904a8c 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
@@ -111,15 +111,6 @@ pool.key=ID
pool.name=\u540D\u79F0
pool.owners=\u6240\u6709\u8005
pool.public=\u516C\u5F00\u7684
-presentation.1=\u534F\u4F5C\u95EE\u9898\u6C60\u5141\u8BB8\u4F5C\u8005\u628A\u6D4B\u8BD5\u95EE\u9898\u5728\u548C\u76EE\u5F55\u7C7B\u4F3C\u7684\u7ED3\u6784\u4E2D\u4EE5\u5355\u4E2A\u9879\u76EE\u7684\u5F62\u5F0F\u5B58\u50A8\u3002\u8FD9\u4E9B\u95EE\u9898\u53EF\u4EE5\u548C\u5176\u4ED6\u7684\u7528\u6237\uFF0C\u7FA4\u7EC4\u6216\u8005\u4F5C\u8005\u5171\u4EAB\u3002
-presentation.2=\u7528\u6237\u53EF\u4EE5\u4ECE\u95EE\u9898\u6C60\u4E2D\u521B\u5EFA\u548C\u8F93\u51FA\u81EA\u5DF1\u7684\u95EE\u9898\uFF0C\u8868\u5355\u548C\u6D4B\u8BD5\u3002
-presentation.3=\u201C\u6211\u7684\u95EE\u9898\u201D\u4E2D\u7684\u95EE\u9898\u624D\u80FD\u88AB\u4F7F\u7528\u3002\u95EE\u9898\u53EF\u4EE5
-presentation.4=\u4ECE\u76EE\u5F55\u6216\u8005\u5176\u4ED6\u6C60\u53CA\u53EF\u80FD\u7684\u7FA4\u7EC4\u91CA\u653E\u4E2D\u590D\u5236
-presentation.5=\u4ECE\u5916\u90E8\u7684.zip\u6587\u4EF6\u6216\u8005\u5B66\u4E60\u8D44\u6E90\u4E2D\u5BFC\u5165
-presentation.6=\u7528\u6D4B\u8BD5\u7F16\u8F91\u5668\u76F4\u63A5\u521B\u5EFA
-presentation.7=\u95EE\u9898\u5BB9\u6613\u7528\u8868\u5355\u6765\u7EC4\u7EC7\u5E76\u6E05\u6670\u53EF\u89C1\u3002\u95EE\u9898\u53EF\u4EE5\u518D\u4ECE\u8868\u5355\u4E2D\u5220\u9664
-presentation.8=\u95EE\u9898\u53EF\u4EE5\u4F5C\u4E3A\u6D4B\u8BD5\u4EE5QTI 1.2\u683C\u5F0F\u6216\u8005.zip\u6587\u4EF6\u5411OpenOLAT\u5B66\u4E60\u8D44\u6E90\u8F93\u51FA\u3002
-presentation.subtitle=\u6211\u9700\u8981\u505A\u4EC0\u4E48\uFF1F
presentation.title=\u95EE\u9898\u6C60
previous=\u4E0A\u4E2A
question=\u9879\u76EE\u5206\u6790
@@ -153,19 +144,6 @@ share.group=\u91CA\u653E\u5230\u7FA4\u7EC4\u4E2D
share.item=\u91CA\u653E
share.options=\u60A8\u5141\u8BB8\u5176\u4ED6\u4EBA\u7F16\u8F91\u8FD9\u4E2A\u95EE\u9898\u5417\uFF1F
share.pool=\u91CA\u653E\u5230\u6C60\u4E2D
-share.presentation.1=\u6240\u7528\u7528\u6237\u91CA\u653E\u7684\u95EE\u9898\u90FD\u5728\u201C\u91CA\u653E\u201D\u7248\u5757\u4E2D\u3002
-share.presentation.10=\u7FA4\u7EC4\u91CA\u653E\u3002\u53EA\u6709\u5728\u8FD9\u4E2A\u7FA4\u7EC4\u4E2D\u5E76\u6709\u95EE\u9898\u6C60\u8BBF\u95EE\u6743\u9650\u7684\u7528\u6237\u53EF\u4EE5\u770B\u5230\u91CA\u653E\u3002
-share.presentation.11=\u53EF\u4EE5\u4ECE\u6C60\u3001\u7FA4\u7EC4\u548C\u8868\u5355\u4E2D\u518D\u6B21\u5220\u9664\u5DF2\u7ECF\u91CA\u653E\u7684\u95EE\u9898\u3002\u95EE\u9898\u672C\u8EAB\u4E0D\u4ECE\u201C\u6211\u7684\u95EE\u9898\u201D\u4E2D\u5220\u9664\u3002
-share.presentation.2=\u7528\u6237\u53EF\u4EE5\u7528\u6C60\u548C\u7FA4\u7EC4\u91CA\u653E\u5E2E\u52A9\u6765\u786E\u5B9A\u8C01\u5177\u6709\u8BBF\u95EE\u5355\u4E2A\u95EE\u9898\u7684\u6743\u9650\u3002
-share.presentation.3=\u76EE\u5F55\u662F\u6240\u6709\u5177\u6709\u4F5C\u8005\u6743\u9650\u7684\u7528\u6237\u53EF\u4EE5\u8BBF\u95EE\u7684\u57FA\u672C\u6C60\u3002\u95EE\u9898\u6C60\u7BA1\u7406\u5458\u53EF\u4EE5\u8BBE\u7F6E\u65B0\u6C60\u5E76\u786E\u5B9A\u8BBF\u95EE\u6743\u9650\uFF0C\u8FD9\u4E5F\u662F\u6BCF\u4E2AOpenOLAT\u7528\u6237\u7684\u95EE\u9898\u6C60\u6570\u91CF\u4E0D\u540C\u7684\u539F\u56E0\u3002
-share.presentation.4=\u95EE\u9898\u53EF\u4EE5\u5411\u7FA4\u7EC4\u91CA\u653E\u3002\u5728\u201C\u91CA\u653E\u201D\u4E0B\u662F\u5426\u5C55\u793A\u6216\u8005\u5C55\u793A\u591A\u5C11\u7FA4\u7EC4\u53D6\u51B3\u4E8E\u7528\u6237\u3002
-share.presentation.5=\u201C\u6211\u7684\u95EE\u9898\u201D\u6216\u8005\u8868\u5355\u4E2D\u7684\u95EE\u9898\u624D\u80FD\u88AB\u4F7F\u7528\u3002\u95EE\u9898\u53EF\u4EE5
-share.presentation.6=\u4ECE\u76EE\u5F55\u6216\u8005\u5176\u4ED6\u6C60\u53CA\u53EF\u80FD\u7684\u7FA4\u7EC4\u91CA\u653E\u4E2D\u590D\u5236
-share.presentation.7=\u7EC4\u7EC7\u4E3A\u8868\u5355\u3002\u5373\u4F7F\u95EE\u9898\u672C\u8EAB\u4E0D\u88AB\u5220\u9664\uFF0C\u95EE\u9898\u4E5F\u53EF\u4EE5\u4ECE\u8868\u5355\u4E2D\u88AB\u5220\u9664\u3002
-share.presentation.8=\u4F5C\u8005\u7684\u95EE\u9898\u5FC5\u987B\u9996\u5148\u88AB\u91CA\u653E\uFF0C\u5176\u4ED6\u7528\u6237\u624D\u80FD\u8BBF\u95EE\u3002\u95EE\u9898\u53EF\u4EE5
-share.presentation.9=\u5411\u6C60\u91CA\u653E\u3002\u9664\u57FA\u672C\u76EE\u5F55\u5916\uFF0C\u8FD8\u53EF\u80FD\u6709\u5176\u4ED6\u7684\u751A\u81F3\u5C1A\u672A\u516C\u5F00\u7684\u6C60\u5B58\u5728
-share.presentation.subtitle=\u6211\u9700\u8981\u505A\u4EC0\u4E48\uFF1F
-share.presentation.title=\u91CA\u653E
shared=\u88AB\u91CA\u653E
sharing.shares=\u7FA4\u7EC4
technical=\u6280\u672F
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/i18nBundleMetadata.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/i18nBundleMetadata.properties
deleted file mode 100644
index bd7dfccbf920a76ca3151993d1e408c438d8d7f5..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/i18nBundleMetadata.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Aug 23 17:38:22 CEST 2013
-share.presentation.5.annotation=Intro of a list of what you can do with questions
-share.presentation.6.annotation=part of a list of what you can do with items
-share.presentation.7.annotation=part of a list of what you can do with items
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/InfoPageController.java b/src/main/java/org/olat/modules/qpool/ui/admin/InfoPageController.java
new file mode 100644
index 0000000000000000000000000000000000000000..973a08942317528e697a22b06a107c326e196f1f
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/InfoPageController.java
@@ -0,0 +1,125 @@
+/**
+ * <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.admin;
+
+import org.olat.core.commons.editor.htmleditor.HTMLEditorController;
+import org.olat.core.commons.editor.htmleditor.WysiwygFactory;
+import org.olat.core.commons.modules.singlepage.SinglePageController;
+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;
+import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BasicController;
+import org.olat.core.util.vfs.VFSContainer;
+import org.olat.modules.qpool.QuestionPoolModule;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ *
+ * Initial date: 24.12.2017<br>
+ * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
+ *
+ */
+public class InfoPageController extends BasicController {
+
+ private Link createPageButton;
+ private Link editPageButton;
+ private final VelocityContainer mainVC;
+
+ private SinglePageController indexCtrl;
+ private HTMLEditorController editInfoPageCtrl;
+
+ @Autowired
+ private QuestionPoolModule qpoolModule;
+
+ public InfoPageController(UserRequest ureq, WindowControl wControl) {
+ super(ureq, wControl);
+
+ mainVC = createVelocityContainer("infos_page_admin");
+
+ editPageButton = LinkFactory.createButton("edit.info.page", mainVC, this);
+ editPageButton.setIconLeftCSS("o_icon o_icon_edit");
+
+ VFSContainer container = qpoolModule.getInfoPageContainer();
+ if(container.resolve("index.html") == null) {
+ createPageButton = LinkFactory.createButton("create.infos.page", mainVC, this);
+ createPageButton.setCustomEnabledLinkCSS("btn btn-primary");
+ } else {
+ doViewInfoPage(ureq);
+ }
+ putInitialPanel(mainVC);
+ }
+
+ @Override
+ protected void doDispose() {
+ //
+ }
+
+ @Override
+ protected void event(UserRequest ureq, Component source, Event event) {
+ if(createPageButton == source) {
+ doEditInfoPage(ureq);
+ } else if(editPageButton == source) {
+ doEditInfoPage(ureq);
+ }
+ }
+
+ @Override
+ protected void event(UserRequest ureq, Controller source, Event event) {
+ if(editInfoPageCtrl == source) {
+ doViewInfoPage(ureq);
+ }
+ super.event(ureq, source, event);
+ }
+
+ private void cleanUp() {
+ removeAsListenerAndDispose(editInfoPageCtrl);
+ removeAsListenerAndDispose(indexCtrl);
+ editInfoPageCtrl = null;
+ indexCtrl = null;
+ }
+
+ private void doEditInfoPage(UserRequest ureq) {
+ cleanUp();
+
+ VFSContainer container = qpoolModule.getInfoPageContainer();
+ String pageRelPath = "index.html";
+ if(container.resolve(pageRelPath) == null) {
+ container.createChildLeaf(pageRelPath);
+ }
+ editInfoPageCtrl = WysiwygFactory.createWysiwygControllerWithInternalLink(ureq, getWindowControl(), container, pageRelPath, true, null);
+ listenTo(editInfoPageCtrl);
+ mainVC.put("index", editInfoPageCtrl.getInitialComponent());
+ mainVC.remove(createPageButton);
+ }
+
+ private void doViewInfoPage(UserRequest ureq) {
+ cleanUp();
+
+ VFSContainer container = qpoolModule.getInfoPageContainer();
+ indexCtrl = new SinglePageController(ureq, getWindowControl(), container, "index.html", false);
+ listenTo(indexCtrl);
+ mainVC.put("index", indexCtrl.getInitialComponent());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/QuestionPoolAdminController.java b/src/main/java/org/olat/modules/qpool/ui/admin/QuestionPoolAdminController.java
index 57bb7b9ded1646dd5689954114ec9e1ce0691046..f3c26ff3470d3bafc0d65d917ebfcae3e3550f2e 100644
--- a/src/main/java/org/olat/modules/qpool/ui/admin/QuestionPoolAdminController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/QuestionPoolAdminController.java
@@ -42,6 +42,7 @@ public class QuestionPoolAdminController extends BasicController {
private static final String SEGMENTS_CMP = "segmentCmp";
private final Link configurationLink;
+ private final Link infoPageLink;
private final Link reviewProcessLink;
private final Link taxonomyLink;
private final Link poolsLink;
@@ -53,6 +54,7 @@ public class QuestionPoolAdminController extends BasicController {
private final SegmentViewComponent segmentView;
private QuestionPoolAdminConfigurationController configurationCtrl;
+ private InfoPageController infoPageCtrl;
private ReviewProcessAdminController reviewProcessCtrl;
private TaxonomyAdminController taxonomyCtrl;
private PoolsAdminController poolsCtrl;
@@ -67,6 +69,8 @@ public class QuestionPoolAdminController extends BasicController {
segmentView = SegmentViewFactory.createSegmentView("segments", mainVC, this);
configurationLink = LinkFactory.createLink("segment.configuration", mainVC, this);
segmentView.addSegment(configurationLink, true);
+ infoPageLink = LinkFactory.createLink("segment.info.page", mainVC, this);
+ segmentView.addSegment(infoPageLink, false);
reviewProcessLink = LinkFactory.createLink("segment.review.process", mainVC, this);
segmentView.addSegment(reviewProcessLink, false);
taxonomyLink = LinkFactory.createLink("segment.taxonomy", mainVC, this);
@@ -97,6 +101,8 @@ public class QuestionPoolAdminController extends BasicController {
Component clickedLink = mainVC.getComponent(segmentCName);
if (clickedLink == configurationLink) {
doOpenConfiguration(ureq);
+ } else if(clickedLink == infoPageLink) {
+ doOpenInfosPage(ureq);
} else if (clickedLink == reviewProcessLink) {
doOpenReviewProcess(ureq);
} else if (clickedLink == taxonomyLink) {
@@ -120,6 +126,14 @@ public class QuestionPoolAdminController extends BasicController {
}
mainVC.put(SEGMENTS_CMP, configurationCtrl.getInitialComponent());
}
+
+ private void doOpenInfosPage(UserRequest ureq) {
+ if(infoPageCtrl == null) {
+ infoPageCtrl = new InfoPageController(ureq, getWindowControl());
+ listenTo(infoPageCtrl);
+ }
+ mainVC.put(SEGMENTS_CMP, infoPageCtrl.getInitialComponent());
+ }
private void doOpenReviewProcess(UserRequest ureq) {
if(reviewProcessCtrl == null) {
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/_content/infos_page_admin.html b/src/main/java/org/olat/modules/qpool/ui/admin/_content/infos_page_admin.html
new file mode 100644
index 0000000000000000000000000000000000000000..591329e67ce17c7cba1affe2f4ac0a9b4c2c2252
--- /dev/null
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/_content/infos_page_admin.html
@@ -0,0 +1,6 @@
+#if($r.available("create.infos.page"))
+ <div class="o_button_group">$r.render("create.infos.page")</div>
+#else
+ <div class="o_button_group o_button_group_right">$r.render("edit.info.page")</div>
+ $r.render("index")
+#end
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_de.properties
index a4ce4eeb5084653a7e4cac46c84ffc748b1b9c55..e9d24c7adfe57fa238dac431fb28366c567fe8bb 100644
--- a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_de.properties
@@ -10,6 +10,7 @@ admin.studyfields.intro=Fachbereiche dienen der fachlichen Verschlagwortung der
admin.types.intro=Erstellen Sie zus\u00E4tzliche Fragetypen, wenn die Standard Fragetypen von OpenOLAT nicht gen\u00FCgen. Die Standard Fragetypen k\u00F6nnen nicht gel\u00F6scht werden.
average.rating.for.final=Durchschnittliche Bewertung f\u00FCr Status "final"
collections.enabled=Listen
+create.infos.page=Infoseite erstellen
create.level=Stufe erstellen
create.license=Lizenz erstellen
create.type=Fragetyp erstellen
@@ -21,6 +22,7 @@ delete.taxonomyLevel=L\u00F6schen
delete.taxonomyLevel.confirm=Wollen Sie wirklich diese Fachbereich "{0}" l\u00F6schen?
delete.type=L\u00F6schen
delete.type.confirm=Wollen Sie wirklich diesen Typ l\u00F6schen?
+edit.info.page=Infoseite bearbeiten
edit.taxonomyLevel=Fachbereich bearbeiten
educational.context.deleted=Fachbereich wurde erfolgreich gel\u00F6scht
educational.context.notdeleted=Fachbereich konnte nicht gel\u00F6scht werden, eventuell wird er bereits verwendet
@@ -49,6 +51,7 @@ review.process.confirm.enable.title=Beurteilungsprozess einschalten
review.process.enabled=Beurteilungsprozess
segment.configuration=Fragenpool
segment.educational.context=Stufen
+segment.info.page=Infoseite
segment.item.types=Fragetypen
segment.licenses=Lizenzen
segment.pools=Pool-Verwaltung
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_en.properties
index 88ce5a7e28ad6e3fa38f71b6642d6fe305a1a531..b1813d49432ee392d6e91612bc1d9fd275619aa7 100644
--- a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_en.properties
@@ -9,6 +9,7 @@ admin.review.process.title=Review process
admin.studyfields.intro=Subjects allow for technical indexing the question items. It's organized as a hierarchical structure for modelling the potential degree programs. Select the "$\:add.taxonomyLevel" in order to create a new subject, or select an existing one for editing purposes.
admin.types.intro=Create more question types if the existing default types aren't sufficient. Please note that the default question types can not be deleted.
collections.enabled=Lists
+create.infos.page=Create infos page
create.level=Create level
create.license=Create license
create.type=Create type
@@ -20,6 +21,7 @@ delete.license=Delete
delete.license.confirm=Do you really want to delete this license?
delete.type=Delete
delete.type.confirm=Do you really want to delete this type?
+edit.info.page=Edit infos page
edit.taxonomyLevel=Edit subject
educational.context.deleted=Subject has been successfully deleted.
educational.context.notdeleted=Subject cannot be deleted, it is probably in use.
@@ -49,6 +51,7 @@ review.process.enabled=Review process
shares.enabled=Groups
segment.configuration=Question bank
segment.educational.context=Levels
+segment.info.page=Infos page
segment.item.types=Question types
segment.licenses=Licenses
segment.pools=Pools
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_fr.properties
index 4ad34e061a431c7595f6611893ed8ab6212c1f63..405e5b06dcd730fd5a31c91986cfbe7104e00bc5 100644
--- a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_fr.properties
@@ -6,6 +6,7 @@ admin.licenses.intro=Vous pouvez cr\u00E9er plusieurs types de licence si ceux p
admin.pools.intro=Cr\u00E9ez un ou plusieurs pools de questions. Un pool est une banque de questions qui permet \u00E0 tous les utilisateurs avec droits d'auteur d'\u00E9changer des \u00E9l\u00E9ments - questions (si en acc\u00E8s public). Vous pouvez \u00E9galement opter pour un pool partag\u00E9 par seulement quelques auteurs, par exemple le personnel d'un d\u00E9partement (en acc\u00E8s priv\u00E9).
admin.studyfields.intro=Les sujets permettent une indexation technique des questions. Elle est organis\u00E9e comme une structure hi\u00E9rarchique pour mod\u00E9liser les \u00E9ventuels programmes d'\u00E9tudes. S\u00E9lectionner le r\u00E9pertoire "$\:add.taxonomyLevel" afin de cr\u00E9er un nouveau sujet, ou s\u00E9lectionnez un existant pour l'\u00E9diter.
admin.types.intro=Cr\u00E9er davantage de types de questions si les types par d\u00E9faut ne sont pas suffisants. Veuillez noter que les types de questions par d\u00E9faut ne peuvent pas \u00EAtre supprim\u00E9s.
+create.infos.page=Cr\u00E9er une page d'information
create.level=Cr\u00E9er un niveau
create.license=Cr\u00E9er une license
create.type=Cr\u00E9er un type
@@ -17,6 +18,7 @@ delete.license=Effacer
delete.license.confirm=Voulez-vous vraiment effacer cette license?
delete.type=Effacer
delete.type.confirm=Voulez-vous vraiment effacer ce type?
+edit.info.page=Editer la page d'informations
edit.taxonomyLevel=Editer le sujet
educational.context.deleted=Le sujet a \u00E9t\u00E9 effac\u00E9 avec succ\u00E8s.
educational.context.notdeleted=Le sujet n'a pas pu \u00EAtre effac\u00E9, il est probablement utilis\u00E9.
@@ -30,6 +32,7 @@ level.level=Niveau
level.translation=Traduction
license.id=ID
license.key=License
+segment.info.page=Page d'informations
selected.taxonomy.tree=Taxonomie
taxonomyLevel.deleted=Le sujet a \u00E9t\u00E9 effac\u00E9 avec succ\u00E8s.
taxonomyLevel.notdeleted=Le sujet n'a pas pu \u00EAtre effac\u00E9 avec succ\u00E8s, il est probablement encore utilis\u00E9.
diff --git a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_pt_BR.properties
index f44350bea5a58b65441e920bc43e7879ccdd94fc..759552f9a44c1c4e835d209aeadf79991ca5da46 100644
--- a/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/admin/_i18n/LocalStrings_pt_BR.properties
@@ -5,6 +5,7 @@ admin.licenses.intro=Voc\u00EA pode criar mais tipos de licen\u00E7a, se os tipo
admin.pools.intro=Criar um ou mais grupos de perguntas. O reservat\u00F3rio \u00E9 um banco de perguntas que permite que todos os usu\u00E1rios com direitos de autor a troquem perguntas (acesso p\u00FAblico). Voc\u00EA tamb\u00E9m pode optar por um reservat\u00F3rio com apenas um grupo selecionado de autores. Por exemplo, usu\u00E1rios de um departamento (acesso privado).
admin.studyfields.intro=Assuntos, permitem a indexa\u00E7\u00E3o t\u00E9cnica de perguntas. \u00C9 organizado como uma estrutura hier\u00E1rquica para modelar potenciais programas de gradua\u00E7\u00E3o. Selecione a op\u00E7\u00E3o "$\:add.taxonomyLevel", a fim de criar um novo assunto, ou selecionar um j\u00E1 existente para fins de edi\u00E7\u00E3o.
admin.types.intro=Crie mais tipos de perguntas se os tipos existentes n\u00E3o s\u00E3o suficientes. Por favor, note que os tipos de perguntas padr\u00E3o n\u00E3o podem ser exclu\u00EDdos.
+create.infos.page=Criar p\u00E1gina de informa\u00E7\u00F5es
create.level=Criar n\u00EDvel
create.license=Criar licen\u00E7a
create.type=Criar tipo
@@ -16,6 +17,7 @@ delete.taxonomyLevel=Excluir
delete.taxonomyLevel.confirm=Voc\u00EA realmente quer excluir este assunto "{0}"?
delete.type=Excluir
delete.type.confirm=Voc\u00EA realmente deseja excluir este tipo?
+edit.info.page=Editar p\u00E1gina de informa\u00E7\u00F5es
edit.taxonomyLevel=Editar assunto
educational.context.deleted=Assunto foi exclu\u00EDdo com sucesso.
educational.context.notdeleted=Assunto n\u00E3o pode ser exclu\u00EDdo, provavelmente est\u00E1 em uso.
@@ -29,6 +31,7 @@ level.level=N\u00EDvel
level.translation=Tradu\u00E7\u00E3o
license.id=ID
license.key=Licen\u00E7a
+segment.info.page=P\u00E1gina de informa\u00E7\u00F5es
taxonomyLevel.deleted=Assunto foi exclu\u00EDdo com sucesso.
taxonomyLevel.notdeleted=O assunto n\u00E3o pode ser exclu\u00EDdo, provavelmente est\u00E1 em uso.
type.key=ID
diff --git a/src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolAdminStatisticsTreeNode.java b/src/main/java/org/olat/modules/qpool/ui/tree/AdministrationTreeNode.java
similarity index 82%
rename from src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolAdminStatisticsTreeNode.java
rename to src/main/java/org/olat/modules/qpool/ui/tree/AdministrationTreeNode.java
index 67d2d9fc8e00b3a8a528d05df1ccfc8f0a83b99b..63fb97d6550fed30f78132621361c3a0c245d542 100644
--- a/src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolAdminStatisticsTreeNode.java
+++ b/src/main/java/org/olat/modules/qpool/ui/tree/AdministrationTreeNode.java
@@ -23,10 +23,10 @@ import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.tree.GenericTreeNode;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BlankController;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.util.resource.OresHelper;
-import org.olat.modules.qpool.ui.QuestionPoolAdminStatisticsController;
/**
*
@@ -34,15 +34,15 @@ import org.olat.modules.qpool.ui.QuestionPoolAdminStatisticsController;
* @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
*
*/
-public class QuestionPoolAdminStatisticsTreeNode extends GenericTreeNode implements ControllerTreeNode {
+public class AdministrationTreeNode extends GenericTreeNode implements ControllerTreeNode {
private static final long serialVersionUID = 6080671566469619774L;
public static final OLATResourceable ORES = OresHelper.createOLATResourceableType("Statistics");
- private QuestionPoolAdminStatisticsController controller;
+ private Controller controller;
- public QuestionPoolAdminStatisticsTreeNode(String title) {
+ public AdministrationTreeNode(String title) {
super();
this.setTitle(title);
}
@@ -52,7 +52,7 @@ public class QuestionPoolAdminStatisticsTreeNode extends GenericTreeNode impleme
if(controller == null) {
WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ORES, null,
wControl, true);
- controller = new QuestionPoolAdminStatisticsController(ureq, swControl);
+ controller = new BlankController(ureq, swControl);
}
return controller;
}
diff --git a/src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolMenuTreeModel.java b/src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolMenuTreeModel.java
index 3cc0d4d48341f98fca5a7ddfb9b9b9e0735fe169..4175755d63a868c402896be47f03c85706cc0fa5 100644
--- a/src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolMenuTreeModel.java
+++ b/src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolMenuTreeModel.java
@@ -168,16 +168,18 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
//pools + shares
if (securityCallback.canUsePools() || securityCallback.canUseGroups()) {
- sharesNode = new SharePresentationTreeNode(translator.translate("menu.share"));
+ sharesNode = new SharesTreeNode(translator.translate("menu.share"));
rootNode.addChild(sharesNode);
buildShareSubTreeModel();
+ setFirstChildAsDelegate(sharesNode);
}
//administration
if(securityCallback.canAdmin()) {
- TreeNode adminNode = new QuestionPoolAdminStatisticsTreeNode(translator.translate("menu.admin"));
+ TreeNode adminNode = new AdministrationTreeNode(translator.translate("menu.admin"));
rootNode.addChild(adminNode);
buildAdminSubTreeModel(adminNode);
+ setFirstChildAsDelegate(adminNode);
}
}
@@ -234,6 +236,7 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
TreeNode node = new ReviewTreeNode(stackPanel, securityCallback, taxonomyLevel, identity, roles);
reviewNode.addChild(node);
}
+ setFirstChildAsDelegate(reviewNode);
}
}
@@ -246,10 +249,12 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
finalNode = new GenericTreeNode(translator.translate("menu.final"));
finalNode.setTitle(translator.translate("menu.final"));
rootNode.addChild(finalNode);
+
for(TaxonomyLevel taxonomyLevel:taxonomyLevels) {
TreeNode node = new FinalTreeNode(stackPanel, securityCallback, taxonomyLevel);
finalNode.addChild(node);
}
+ setFirstChildAsDelegate(finalNode);
}
}
@@ -300,5 +305,16 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
node = new QLicensesAdminTreeNode(translator.translate("menu.admin.licenses"));
adminNode.addChild(node);
}
+
+ private void setFirstChildAsDelegate(INode node) {
+ if (node.getChildCount() > 0) {
+ INode childNode = node.getChildAt(0);
+ if (node instanceof GenericTreeNode && childNode instanceof TreeNode) {
+ GenericTreeNode parent = (GenericTreeNode) node;
+ TreeNode child = (TreeNode) childNode;
+ parent.setDelegate(child);
+ }
+ }
+ }
}
diff --git a/src/main/java/org/olat/modules/qpool/ui/tree/SharePresentationTreeNode.java b/src/main/java/org/olat/modules/qpool/ui/tree/SharesTreeNode.java
similarity index 81%
rename from src/main/java/org/olat/modules/qpool/ui/tree/SharePresentationTreeNode.java
rename to src/main/java/org/olat/modules/qpool/ui/tree/SharesTreeNode.java
index 1d2e8682da00f0a60a3a58891fd32413c503b254..e2737823814cb462c45047c45db260995713a43d 100644
--- a/src/main/java/org/olat/modules/qpool/ui/tree/SharePresentationTreeNode.java
+++ b/src/main/java/org/olat/modules/qpool/ui/tree/SharesTreeNode.java
@@ -23,10 +23,10 @@ import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.tree.GenericTreeNode;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl;
+import org.olat.core.gui.control.controller.BlankController;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.util.resource.OresHelper;
-import org.olat.modules.qpool.ui.SharePresentationController;
/**
*
@@ -34,27 +34,27 @@ import org.olat.modules.qpool.ui.SharePresentationController;
* @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
*
*/
-public class SharePresentationTreeNode extends GenericTreeNode implements ControllerTreeNode {
+public class SharesTreeNode extends GenericTreeNode implements ControllerTreeNode {
private static final long serialVersionUID = -3800071301195017030L;
public static final OLATResourceable ORES = OresHelper.createOLATResourceableType("SharePresentation");
- private Controller sharePresentationCtrl;
+ private Controller controller;
- public SharePresentationTreeNode(String title) {
+ public SharesTreeNode(String title) {
super();
this.setTitle(title);
}
@Override
public Controller getController(UserRequest ureq, WindowControl wControl) {
- if(sharePresentationCtrl == null) {
+ if(controller == null) {
WindowControl swControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ORES, null,
wControl, true);
- sharePresentationCtrl = new SharePresentationController(ureq, swControl);
+ controller = new BlankController(ureq, swControl);
}
- return sharePresentationCtrl;
+ return controller;
}
}