Skip to content
Snippets Groups Projects
Commit c1a23a7f authored by gnaegi's avatar gnaegi
Browse files

OO-986 usability: add spacers to course tools

parent dfd7f3e0
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,7 @@ import org.olat.core.gui.UserRequest; ...@@ -46,6 +46,7 @@ import org.olat.core.gui.UserRequest;
import org.olat.core.gui.Windows; import org.olat.core.gui.Windows;
import org.olat.core.gui.components.Component; import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.dropdown.Dropdown; import org.olat.core.gui.components.dropdown.Dropdown;
import org.olat.core.gui.components.dropdown.Dropdown.Spacer;
import org.olat.core.gui.components.htmlheader.jscss.CustomCSS; import org.olat.core.gui.components.htmlheader.jscss.CustomCSS;
import org.olat.core.gui.components.htmlsite.OlatCmdEvent; import org.olat.core.gui.components.htmlsite.OlatCmdEvent;
import org.olat.core.gui.components.link.Link; import org.olat.core.gui.components.link.Link;
...@@ -1346,6 +1347,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -1346,6 +1347,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
} }
private void initEditionTools() { private void initEditionTools() {
boolean managed = RepositoryEntryManagedFlag.isManaged(courseRepositoryEntry, RepositoryEntryManagedFlag.editcontent);
// 1) administrative tools // 1) administrative tools
if (isCourseAdmin || isCourseCoach || hasCourseRight(CourseRights.RIGHT_COURSEEDITOR) if (isCourseAdmin || isCourseCoach || hasCourseRight(CourseRights.RIGHT_COURSEEDITOR)
|| hasCourseRight(CourseRights.RIGHT_GROUPMANAGEMENT) || hasCourseRight(CourseRights.RIGHT_ARCHIVING) || hasCourseRight(CourseRights.RIGHT_GROUPMANAGEMENT) || hasCourseRight(CourseRights.RIGHT_ARCHIVING)
...@@ -1361,7 +1363,6 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -1361,7 +1363,6 @@ public class RunMainController extends MainLayoutBasicController implements Gene
editTools.addComponent(runLink); editTools.addComponent(runLink);
if (hasCourseRight(CourseRights.RIGHT_COURSEEDITOR) || isCourseAdmin) { if (hasCourseRight(CourseRights.RIGHT_COURSEEDITOR) || isCourseAdmin) {
boolean managed = RepositoryEntryManagedFlag.isManaged(courseRepositoryEntry, RepositoryEntryManagedFlag.editcontent);
editLink = LinkFactory.createToolLink("edit.cmd", translate("command.openeditor"), this, "o_icon_courseeditor"); editLink = LinkFactory.createToolLink("edit.cmd", translate("command.openeditor"), this, "o_icon_courseeditor");
editLink.setElementCssClass("o_sel_course_editor"); editLink.setElementCssClass("o_sel_course_editor");
editLink.setEnabled(!managed); editLink.setEnabled(!managed);
...@@ -1374,23 +1375,23 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -1374,23 +1375,23 @@ public class RunMainController extends MainLayoutBasicController implements Gene
folderLink.setElementCssClass("o_sel_course_folder"); folderLink.setElementCssClass("o_sel_course_folder");
folderLink.setEnabled(!managed); folderLink.setEnabled(!managed);
editTools.addComponent(folderLink); editTools.addComponent(folderLink);
areaLink = LinkFactory.createToolLink("careas", translate("command.courseareas"), this, "o_icon_courseareas");
areaLink.setElementCssClass("o_sel_course_areas");
areaLink.setEnabled(!managed);
editTools.addComponent(areaLink);
} }
editTools.addComponent(new Spacer(""));
if (hasCourseRight(CourseRights.RIGHT_GROUPMANAGEMENT) || isCourseAdmin) { if (hasCourseRight(CourseRights.RIGHT_GROUPMANAGEMENT) || isCourseAdmin) {
userMgmtLink = LinkFactory.createToolLink("unifiedusermngt", translate("command.opensimplegroupmngt"), this, "o_icon_membersmanagement"); userMgmtLink = LinkFactory.createToolLink("unifiedusermngt", translate("command.opensimplegroupmngt"), this, "o_icon_membersmanagement");
editTools.addComponent(userMgmtLink); editTools.addComponent(userMgmtLink);
} }
if (hasCourseRight(CourseRights.RIGHT_ARCHIVING) || isCourseAdmin) {
archiverLink = LinkFactory.createToolLink("archiver", translate("command.openarchiver"), this, "o_icon_archive_tool");
editTools.addComponent(archiverLink);
}
if (hasCourseRight(CourseRights.RIGHT_ASSESSMENT) || isCourseCoach || isCourseAdmin) { if (hasCourseRight(CourseRights.RIGHT_ASSESSMENT) || isCourseCoach || isCourseAdmin) {
assessmentLink = LinkFactory.createToolLink("assessment",translate("command.openassessment"), this, "o_icon_assessment_tool"); assessmentLink = LinkFactory.createToolLink("assessment",translate("command.openassessment"), this, "o_icon_assessment_tool");
editTools.addComponent(assessmentLink); editTools.addComponent(assessmentLink);
} }
if (hasCourseRight(CourseRights.RIGHT_COURSEEDITOR) || isCourseAdmin) {
areaLink = LinkFactory.createToolLink("careas", translate("command.courseareas"), this, "o_icon_courseareas");
areaLink.setElementCssClass("o_sel_course_areas");
areaLink.setEnabled(!managed);
editTools.addComponent(areaLink);
}
editTools.addComponent(new Spacer(""));
if (hasCourseRight(CourseRights.RIGHT_STATISTICS) || isCourseAdmin || isCourseCoach) { if (hasCourseRight(CourseRights.RIGHT_STATISTICS) || isCourseAdmin || isCourseCoach) {
final AtomicInteger testNodes = new AtomicInteger(); final AtomicInteger testNodes = new AtomicInteger();
final AtomicInteger surveyNodes = new AtomicInteger(); final AtomicInteger surveyNodes = new AtomicInteger();
...@@ -1418,6 +1419,11 @@ public class RunMainController extends MainLayoutBasicController implements Gene ...@@ -1418,6 +1419,11 @@ public class RunMainController extends MainLayoutBasicController implements Gene
courseStatisticLink = LinkFactory.createToolLink("statistic",translate("command.openstatistic"), this, "o_icon_statistics_tool"); courseStatisticLink = LinkFactory.createToolLink("statistic",translate("command.openstatistic"), this, "o_icon_statistics_tool");
editTools.addComponent(courseStatisticLink); editTools.addComponent(courseStatisticLink);
} }
editTools.addComponent(new Spacer(""));
if (hasCourseRight(CourseRights.RIGHT_ARCHIVING) || isCourseAdmin) {
archiverLink = LinkFactory.createToolLink("archiver", translate("command.openarchiver"), this, "o_icon_archive_tool");
editTools.addComponent(archiverLink);
}
if (CourseDBManager.getInstance().isEnabled() && (hasCourseRight(CourseRights.RIGHT_DB) || isCourseAdmin)) { if (CourseDBManager.getInstance().isEnabled() && (hasCourseRight(CourseRights.RIGHT_DB) || isCourseAdmin)) {
dbLink = LinkFactory.createToolLink("customDb",translate("command.opendb"), this, "o_icon_coursedb"); dbLink = LinkFactory.createToolLink("customDb",translate("command.opendb"), this, "o_icon_coursedb");
editTools.addComponent(dbLink); editTools.addComponent(dbLink);
......
...@@ -28,7 +28,7 @@ command.openteststatistic=Test Statistiken ...@@ -28,7 +28,7 @@ command.openteststatistic=Test Statistiken
command.opensurveystatistic=Fragebogen Statistiken command.opensurveystatistic=Fragebogen Statistiken
command.personalnote=Notizen command.personalnote=Notizen
command.previous=Zur\u00FCck zur letzten Seite command.previous=Zur\u00FCck zur letzten Seite
command.run=Kurs command.run=Kurs Laufzeitumgebung
command.settings=Lernressource Einstellungen command.settings=Lernressource Einstellungen
course.closed = Dieser Kurs wurde beendet und wird nicht l\u00e4nger bearbeitet oder aktualisiert. course.closed = Dieser Kurs wurde beendet und wird nicht l\u00e4nger bearbeitet oder aktualisiert.
course.disposed.command.restart=Den Kurs beenden und neu starten course.disposed.command.restart=Den Kurs beenden und neu starten
......
...@@ -29,6 +29,7 @@ command.openstatistic=Course statistics ...@@ -29,6 +29,7 @@ command.openstatistic=Course statistics
command.personalnote=Notes command.personalnote=Notes
command.previous=Go to previous page command.previous=Go to previous page
command.settings=Learning resource settings command.settings=Learning resource settings
command.run=Course runtime
course.closed=This course is closed and can therefore no longer be edited or updated. course.closed=This course is closed and can therefore no longer be edited or updated.
course.disposed.command.restart=Close course and restart course.disposed.command.restart=Close course and restart
course.disposed.message=Please close this course and restart. course.disposed.message=Please close this course and restart.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment