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

OO-1068: fix breadcrumb close button

parent db1e6f67
No related branches found
No related tags found
No related merge requests found
......@@ -74,7 +74,7 @@ public class BreadcrumbedStackedPanel extends Panel implements StackedPanel, Com
// Add back link before the bread crumbs, when pressed delegates click to current bread-crumb - 1
closeLink = LinkFactory.createCustomLink("close", "close", null, Link.NONTRANSLATED + Link.LINK_CUSTOM_CSS, null, this);
closeLink.setCustomEnabledLinkCSS("b_close");
closeLink.setIconCSS("o_icon o_icon_close_tab");
closeLink.setCustomDisplayText(translator.translate("doclose"));
closeLink.setAccessKey("x"); // allow navigation using keyboard
}
......
......@@ -46,27 +46,27 @@ public class BreadcrumbedStackedPanelRenderer extends DefaultComponentRenderer {
if(breadCrumbs.size() > 1) {
String mainCssClass = panel.getCssClass();
sb.append("<div id='o_main_toolbar' class='b_clearfix ").append(mainCssClass, mainCssClass != null).append("'>")
.append("<div class='b_breadcumb_path'>")
.append("<div class='o_breadcumb'>")
.append("<ol class='breadcrumb'>");
Link backLink = panel.getBackLink();
if(backLink.isVisible()) {
sb.append("<li class='b_breadcumb_back'>");
sb.append("<li class='o_breadcumb_back'>");
backLink.getHTMLRendererSingleton().render(renderer, sb, backLink, ubu, translator, renderResult, args);
sb.append("</li>");
}
int numOfCrumbs = breadCrumbs.size();
for(int i=0; i<numOfCrumbs; i++) {
sb.append("<li class='").append("b_first", i==0).append("b_last", i==(numOfCrumbs-1)).append("'><span>");
sb.append("<li>");
renderer.render(breadCrumbs.get(i), sb, args);
sb.append("</span></li>");
sb.append("</li>");
}
sb.append("</ol>");
sb.append("</ol>");
Link closeLink = panel.getCloseLink();
if(closeLink.isVisible()) {
sb.append("<div class='b_breadcumb_close'>");
sb.append("<div class='o_breadcumb_close'>");
closeLink.getHTMLRendererSingleton().render(renderer, sb, closeLink, ubu, translator, renderResult, args);
sb.append("</div>");
}
......
......@@ -23,6 +23,7 @@
@import "modules/dialog";
@import "modules/footer";
@import "modules/tree";
@import "modules/breadcrumb";
@import "modules/form";
@import "modules/table";
......
.o_breadcumb {
position:relative;
.o_breadcumb_close {
position: absolute;
top: 8px;
right: 15px;
}
}
\ No newline at end of file
This diff is collapsed.
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