Skip to content
Snippets Groups Projects
Commit af9e047b authored by srosse's avatar srosse
Browse files

OO-4480: adjust tool to jump from a course element to the other

parent 8fb72607
No related branches found
No related tags found
No related merge requests found
...@@ -91,6 +91,7 @@ public class Link extends AbstractComponent { ...@@ -91,6 +91,7 @@ public class Link extends AbstractComponent {
private String customDisabledLinkCSS; private String customDisabledLinkCSS;
private String iconLeftCSS; private String iconLeftCSS;
private String iconRightCSS; private String iconRightCSS;
private String labelCSS;
private String target; private String target;
private FormLink flexiLink; private FormLink flexiLink;
private Object userObject; private Object userObject;
...@@ -632,6 +633,20 @@ public class Link extends AbstractComponent { ...@@ -632,6 +633,20 @@ public class Link extends AbstractComponent {
return iconRightCSS; return iconRightCSS;
} }
/**
* @return The label (span tag) CSS classes or NULL
*/
public String getLabelCSS() {
return labelCSS;
}
/**
* @param labelCSS The CSS classes used for the label (span tag)
*/
public void setLabelCSS(String labelCSS) {
this.labelCSS = labelCSS;
}
/** /**
* Compare also with isEnabled(); * Compare also with isEnabled();
* @return true if the link is active (only a rendering issue); false if link not active * @return true if the link is active (only a rendering issue); false if link not active
......
...@@ -243,7 +243,11 @@ public class LinkRenderer extends DefaultComponentRenderer { ...@@ -243,7 +243,11 @@ public class LinkRenderer extends DefaultComponentRenderer {
sb.append("<i class='o_icon o_icon_back'> </i> "); // one space needed sb.append("<i class='o_icon o_icon_back'> </i> "); // one space needed
} }
sb.append("<span>"); // inner wrapper for layouting sb.append("<span"); // inner wrapper for layouting
if(StringHelper.containsNonWhitespace(link.getLabelCSS())) {
sb.append(" class='").append(link.getLabelCSS()).append("'");
}
sb.append(">");
if (customDisplayText != null) { if (customDisplayText != null) {
//link is not translated but has custom text //link is not translated but has custom text
sb.append(customDisplayText); sb.append(customDisplayText);
......
...@@ -71,8 +71,10 @@ public class AssessmentIdentityCourseController extends BasicController ...@@ -71,8 +71,10 @@ public class AssessmentIdentityCourseController extends BasicController
private final TooledStackedPanel stackPanel; private final TooledStackedPanel stackPanel;
private final VelocityContainer identityAssessmentVC; private final VelocityContainer identityAssessmentVC;
private Link nextLink, previousLink, courseNodeSelectionLink;
private Link pdfLink; private Link pdfLink;
private Link nextLink;
private Link previousLink;
private Link courseNodeSelectionLink;
private IdentityCertificatesController certificateCtrl; private IdentityCertificatesController certificateCtrl;
private AssessedIdentityLargeInfosController infosController; private AssessedIdentityLargeInfosController infosController;
...@@ -288,7 +290,7 @@ public class AssessmentIdentityCourseController extends BasicController ...@@ -288,7 +290,7 @@ public class AssessmentIdentityCourseController extends BasicController
stackPanel.pushController(courseNode.getShortTitle(), currentNodeCtrl); stackPanel.pushController(courseNode.getShortTitle(), currentNodeCtrl);
previousLink = LinkFactory.createToolLink("previouselement", translate("previous"), this, "o_icon_previous"); previousLink = LinkFactory.createToolLink("previouselement", translate("previous"), this, "o_icon_previous");
previousLink.setTitle(translate("command.previous")); previousLink.setTitle(translate("command.previous.node"));
previousLink.setEnabled(hasPrevious(courseNode)); previousLink.setEnabled(hasPrevious(courseNode));
stackPanel.addTool(previousLink, Align.rightEdge, false); stackPanel.addTool(previousLink, Align.rightEdge, false);
...@@ -298,10 +300,11 @@ public class AssessmentIdentityCourseController extends BasicController ...@@ -298,10 +300,11 @@ public class AssessmentIdentityCourseController extends BasicController
courseNodeSelectionLink.setElementCssClass("dropdown-toggle "); courseNodeSelectionLink.setElementCssClass("dropdown-toggle ");
courseNodeSelectionLink.setIconLeftCSS("o_icon " + courseNodeCssClass); courseNodeSelectionLink.setIconLeftCSS("o_icon " + courseNodeCssClass);
courseNodeSelectionLink.setIconRightCSS("o_icon o_icon_caret"); courseNodeSelectionLink.setIconRightCSS("o_icon o_icon_caret");
courseNodeSelectionLink.setLabelCSS("o_label");
stackPanel.addTool(courseNodeSelectionLink, Align.rightEdge, false, "o_tool_dropdown dropdown"); stackPanel.addTool(courseNodeSelectionLink, Align.rightEdge, false, "o_tool_dropdown dropdown");
nextLink = LinkFactory.createToolLink("nextelement", translate("next"), this, "o_icon_next"); nextLink = LinkFactory.createToolLink("nextelement", translate("next"), this, "o_icon_next");
nextLink.setTitle(translate("command.next")); nextLink.setTitle(translate("command.next.node"));
CourseNode nextNode = treeOverviewCtrl.getNextNode(courseNode); CourseNode nextNode = treeOverviewCtrl.getNextNode(courseNode);
boolean hasNext = (nextNode != null && nextNode.getParent() != null); boolean hasNext = (nextNode != null && nextNode.getParent() != null);
nextLink.setEnabled(hasNext); nextLink.setEnabled(hasNext);
......
...@@ -23,7 +23,9 @@ certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.t ...@@ -23,7 +23,9 @@ certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.t
change.visibility=Sichtbarkeit \u00E4ndern change.visibility=Sichtbarkeit \u00E4ndern
change.visibility.title=Sichtbarkeit vom Ergebnis \u00E4ndern change.visibility.title=Sichtbarkeit vom Ergebnis \u00E4ndern
command.next=Weiter zu n\u00E4chste Benutzer command.next=Weiter zu n\u00E4chste Benutzer
command.next.node=Weiter zum n\u00E4chsten Kursbaustein
command.previous=Zur\u00FCck zum letzten Benutzer command.previous=Zur\u00FCck zum letzten Benutzer
command.previous.node=Zur\u00FCck zum letzten Kursbaustein
confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted
confirm.delete.certificate.text=$org.olat.course.certificate.ui\:confirm.delete.certificate.text confirm.delete.certificate.text=$org.olat.course.certificate.ui\:confirm.delete.certificate.text
confirm.delete.certificate.title=$org.olat.course.certificate.ui\:confirm.delete.certificate.title confirm.delete.certificate.title=$org.olat.course.certificate.ui\:confirm.delete.certificate.title
......
...@@ -23,7 +23,9 @@ certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.t ...@@ -23,7 +23,9 @@ certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.t
change.visibility=Change visibility change.visibility=Change visibility
change.visibility.title=Change the visibility of results change.visibility.title=Change the visibility of results
command.next=To the next user command.next=To the next user
command.next.node=To the next course element
command.previous=Back to previous user command.previous=Back to previous user
command.previous.node=Back to previous course element
confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted
confirm.delete.certificate.text=$org.olat.course.certificate.ui\:confirm.delete.certificate.text confirm.delete.certificate.text=$org.olat.course.certificate.ui\:confirm.delete.certificate.text
confirm.delete.certificate.title=$org.olat.course.certificate.ui\:confirm.delete.certificate.title confirm.delete.certificate.title=$org.olat.course.certificate.ui\:confirm.delete.certificate.title
......
...@@ -24,7 +24,9 @@ certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.t ...@@ -24,7 +24,9 @@ certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.t
change.visibility=Modifier la visibilit\u00E9 change.visibility=Modifier la visibilit\u00E9
change.visibility.title=Changer la visibilit\u00E9 des r\u00E9sultats change.visibility.title=Changer la visibilit\u00E9 des r\u00E9sultats
command.next=Utilisateur suivant command.next=Utilisateur suivant
command.next.node=El\u00E9ment de cours suivant
command.previous=Utilisateur pr\u00E9c\u00E9dent command.previous=Utilisateur pr\u00E9c\u00E9dent
command.previous.node=El\u00E9ment de cours pr\u00E9c\u00E9dent
confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted
confirm.delete.certificate.text=$org.olat.course.certificate.ui\:confirm.delete.certificate.text confirm.delete.certificate.text=$org.olat.course.certificate.ui\:confirm.delete.certificate.text
confirm.delete.certificate.title=$org.olat.course.certificate.ui\:confirm.delete.certificate.title confirm.delete.certificate.title=$org.olat.course.certificate.ui\:confirm.delete.certificate.title
......
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