diff --git a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java
index 2c17b817369818800f66c4bc5467279c5f98bc2b..632f15aa57934a7d4c6478b5181ac8de3d8bb720 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java
@@ -193,6 +193,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.show",
translate("table.header.show"), CMD_SHOW));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lastModified));
+ tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.lastUserUpdate));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.certificate, new DownloadCertificateCellRenderer(assessedIdentity, getLocale())));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.recertification, new DateFlexiCellRenderer(getLocale())));
tableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel("table.header.launchcourse",
@@ -238,7 +239,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
wrapper.setEfficiencyStatementKey(efficiencyStatement.getKey());
wrapper.setResourceKey(efficiencyStatement.getArchivedResourceKey());
wrapper.setLastModified(efficiencyStatement.getLastModified());
-
+ wrapper.setLastUserModified(efficiencyStatement.getLastUserModified());
statments.add(wrapper);
resourceKeyToStatments.put(efficiencyStatement.getArchivedResourceKey(), wrapper);
}
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListModel.java b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListModel.java
index aafd8b3f90dbb9cfe9bf6722a54a6e77d2a2f260..b523b164398d369793c6089b31b3ce2471cccf9e 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListModel.java
+++ b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListModel.java
@@ -76,6 +76,7 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
return AssessmentHelper.getRoundedScore(score);
case passed: return statement.getPassed();
case lastModified: return statement.getLastModified();
+ case lastUserUpdate: return statement.getLastUserModified();
case certificate: return statement.getCertificate();
case recertification: {
if(statement.getCertificate() != null) {
@@ -89,12 +90,13 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
return null;
}
- public static enum Cols implements FlexiSortableColumnDef {
+ public enum Cols implements FlexiSortableColumnDef {
displayName("table.header.course", true),
score("table.header.score", true),
passed("table.header.passed", true),
lastModified("table.header.lastScoreDate", true),
+ lastUserUpdate("table.header.lastUserModificationDate", true),
efficiencyStatement("table.header.certificate", true),
certificate("table.header.certificate", true),
recertification("table.header.recertification", true),
@@ -132,6 +134,7 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
private Boolean passed;
private Date lastModified;
private String displayName;
+ private Date lastUserModified;
private Long resourceKey;
private Long efficiencyStatementKey;
@@ -169,6 +172,14 @@ public class CertificateAndEfficiencyStatementListModel extends DefaultFlexiTabl
this.lastModified = lastModified;
}
+ public Date getLastUserModified() {
+ return lastUserModified;
+ }
+
+ public void setLastUserModified(Date lastUserModified) {
+ this.lastUserModified = lastUserModified;
+ }
+
public CertificateLight getCertificate() {
return certificate;
}
diff --git a/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java b/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
index a7847d13c79ea2fb2bc5a824fe592e2d72747da8..db9b0bd6f4caa8ba55d152b8e99fcf13c2a54619 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java
@@ -475,7 +475,7 @@ public class IQIdentityListCourseNodeController extends IdentityListCourseNodeCo
resetDataCtrl = new QTI21ResetDataController(ureq, getWindowControl(), courseEnv, asOptions, (IQTESTCourseNode)courseNode);
listenTo(resetDataCtrl);
- String title = translate("tool.reset");
+ String title = translate("reset.test.data.title");
cmc = new CloseableModalController(getWindowControl(), null, resetDataCtrl.getInitialComponent(), true, title, true);
listenTo(cmc);
cmc.activate();
diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessedIdentityListController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessedIdentityListController.java
index 60f45310a65bb7c8ead84ad4349955e62fedd407..82ededb7f8c91823ba8d4d9415afa142f0cff9a3 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21AssessedIdentityListController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21AssessedIdentityListController.java
@@ -121,11 +121,6 @@ public class QTI21AssessedIdentityListController extends AssessedIdentityListCon
private void doResetData(UserRequest ureq) {
if(resetDataCtrl != null) return;
-
- /*
- if(identities == null || identities.isEmpty()) {
- showWarning("warning.reset.test.data.nobody");
- } */
AssessmentToolOptions asOptions = getOptions();
resetDataCtrl = new QTI21ResetDataController(ureq, getWindowControl(), this.getRepositoryEntry(), asOptions);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
index 3e0897cca8c9bcb91f55028bf5c29f80635e2cc5..72aa63094f3292d28c9b1f87d90cca63dec2bfb2 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
@@ -25,7 +25,7 @@ convert.to=Convert to\:
copy.at=Copied at
copy.qpool.question=make a copy and edit
correct.answers=Correct
-cut.value=Cut value
+cut.value=Necessary score for "Passed"
delete=Delete
delete.item=$org.olat.ims.qti.editor\:delete.item
delete.section=$org.olat.ims.qti.editor\:delete.section
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/MergeTaxonomyLevelController.java b/src/main/java/org/olat/modules/taxonomy/ui/MergeTaxonomyLevelController.java
index 502e52f6e2be3c19cd9dc5f9d8a5a30146e6677e..b2a7993c7ce5f583a0671c73d6164f1983ae761f 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/MergeTaxonomyLevelController.java
+++ b/src/main/java/org/olat/modules/taxonomy/ui/MergeTaxonomyLevelController.java
@@ -92,9 +92,9 @@ public class MergeTaxonomyLevelController extends FormBasicController {
mergeToEl = uifactory.addDropdownSingleselect("mergeto", "merge.to", formLayout,
keyList.toArray(new String[keyList.size()]), valueList.toArray(new String[valueList.size()]), null);
mergeToEl.setEscapeHtml(false);
-
+
uifactory.addFormCancelButton("cancel", formLayout, ureq, getWindowControl());
- uifactory.addFormSubmitButton("delete", formLayout);
+ uifactory.addFormSubmitButton("merge.taxonomy.level", formLayout);
}
private void buildMergeToSelection(TreeNode node, String identation, List<String> keys, List<String> values) {
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_content/confirm_delete_levels.html b/src/main/java/org/olat/modules/taxonomy/ui/_content/confirm_delete_levels.html
index f5e3eea3de9e60364b57eb436ee798236b728fa9..8afc11f866b6a984e285596ababd1ec275026fab 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_content/confirm_delete_levels.html
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_content/confirm_delete_levels.html
@@ -23,10 +23,12 @@
</div>
</div>
#end
- <div class="o_button_group">
+ <div class="form-group clearfix">
+ <div class="col-sm-offset-3 col-sm-9 ">
$r.render("cancel")
#if($r.available("delete"))
$r.render("delete")
#end
+ </div>
</div>
</div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_content/merge_taxonomy_levels.html b/src/main/java/org/olat/modules/taxonomy/ui/_content/merge_taxonomy_levels.html
index 6e9d38639b9eb70bfe1f48ce987d280e635958f5..e0f2eba7b7f6bcfa952dcfa7a6ff0d66146cbd97 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_content/merge_taxonomy_levels.html
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_content/merge_taxonomy_levels.html
@@ -1,4 +1,4 @@
-<div class="o_form form-horizontal" role="form">
+<div class="o_form form-horizontal clearfix" role="form">
#if($r.isNotEmpty($errorMsg))
<div class="o_error">$errorMsg</div>
#else
@@ -11,10 +11,12 @@
</div>
</div>
#end
- <div class="o_button_group">
- $r.render("cancel")
- #if($r.available("delete"))
- $r.render("delete")
- #end
+ <div class="form-group clearfix">
+ <div class="col-sm-offset-3 col-sm-9 ">
+ $r.render("cancel")
+ #if($r.available("merge.taxonomy.level"))
+ $r.render("merge.taxonomy.level")
+ #end
+ </div>
</div>
</div>
\ No newline at end of file
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
index 32809bd849dbf6a1f46bb057f4af0554289a85e2..d1e27a8903dd34fa7645e695ee51622b9fccdae8 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_de.properties
@@ -64,8 +64,8 @@ level.type.docs.enabled=Dokumenten einschalten
level.visible=Sichtbar
level.types.to.assign=Ebenentypen
manage=Verwalten
-merge.taxonomy.level=Zusammenf\u00fchren
-merge.to=Zusammenf\u00fchren
+merge.taxonomy.level=Zusammenf\u00FChren
+merge.to=Zusammenf\u00FChren in
move.taxonomy.level=Verschieben
move.taxonomy.level.title="{0}" verschieben
move.taxonomy.levels.title=Verschieben
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties
index 69244cd42f050f21802ec4a2b5dff1f735509622..02f794d965b7bbdbd4705e3577ae20d28fde352d 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_en.properties
@@ -65,7 +65,7 @@ level.types.to.assign=Level types
level.visible=Visible
manage=Manage
merge.taxonomy.level=Merge
-merge.to=Merge
+merge.to=Merge in
move.taxonomy.level=Move
move.taxonomy.level.title=Move "{0}"
move.taxonomy.levels.title=Move
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties
index b535d441ede2627035b43052674a9e50fe6f4365..c9bf00b9e3883c539c13bfd9dc39e0de99c8104d 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_fr.properties
@@ -67,7 +67,7 @@ level.types.to.assign=Types de niveaux
level.visible=Visible
manage=G\u00E9rer
merge.taxonomy.level=Fusionner
-merge.to=Fusionner
+merge.to=Fusionner avec
move.taxonomy.level=D\u00E9placer
move.taxonomy.level.title=D\u00E9placer "{0}"
move.taxonomy.levels.title=D\u00E9placer
diff --git a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties
index a898973aaa8288c73ebf0016fff8d4d445ae5525..0adec4d8b9947a718c743558bdcdda97e97d85f3 100644
--- a/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/taxonomy/ui/_i18n/LocalStrings_pt_BR.properties
@@ -67,7 +67,7 @@ level.types.to.assign=Tipos de n\u00EDvel
level.visible=Vis\u00EDvel
manage=Gerenciar
merge.taxonomy.level=Mesclar
-merge.to=Mesclar
+merge.to=Mesclar em
move.taxonomy.level=Mover
move.taxonomy.level.title=Mover "{0}"
move.taxonomy.levels.title=Mover