This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push: new 59b86976b6 ISIS-3301: collection presentation selection done with a simple btn-link 59b86976b6 is described below commit 59b86976b63faa19a4a30fb91af40e8d894be65f Author: Andi Huber <ahu...@apache.org> AuthorDate: Mon Dec 12 13:47:33 2022 +0100 ISIS-3301: collection presentation selection done with a simple btn-link --- .../ui/components/CollectionContentsAsExcelFactory.java | 4 ++-- .../selector/CollectionPresentationSelectorPanel.html | 6 +++--- .../selector/CollectionPresentationSelectorPanel.java | 15 +++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java index 19a1a55a16..ca6a7ae5c1 100644 --- a/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java +++ b/extensions/vw/exceldownload/wicket-ui/src/main/java/org/apache/causeway/extensions/viewer/wicket/exceldownload/ui/components/CollectionContentsAsExcelFactory.java @@ -66,12 +66,12 @@ implements CollectionContentsAsFactory { @Override public IModel<String> getTitleLabel() { - return Model.of("Excel"); + return Model.of("Excel Download"); } @Override public IModel<String> getCssClass() { - return Model.of("fa fa-file-excel"); + return Model.of("fa-solid fa-file-excel"); } // -- HELPER diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.html index 74a7cc1456..ce4d68aebf 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.html +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.html @@ -21,10 +21,10 @@ <body> <wicket:panel> <div class="linksSelectorPanel"> - <div class="btn-group viewLinks" wicket:id="views"> - <button type="button" class="btn btn-sm btn-info dropdown-toggle" data-bs-toggle="dropdown"> + <div class="viewLinks" wicket:id="views"> + <button type="button" class="btn btn-link dropdown-toggle" data-bs-toggle="dropdown" style="text-decoration: none"> <span wicket:id="viewButtonIcon" class="ViewLinkItem"></span> - <span wicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span> +<!-- <span wicket:id="viewButtonTitle" class="ViewLinkItemTitle"></span> --> <span class="caret"></span> </button> <ul wicket:id="viewList" class="dropdown-menu dropdown-menu-right" role="menu"> diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java index d581fde610..aad10d784e 100644 --- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java +++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/collection/selector/CollectionPresentationSelectorPanel.java @@ -31,7 +31,6 @@ import org.apache.wicket.model.Model; import org.apache.causeway.core.metamodel.commons.StringExtensions; import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel; import org.apache.causeway.viewer.commons.model.components.UiComponentType; -import org.apache.causeway.viewer.commons.model.layout.UiPlacementDirection; import org.apache.causeway.viewer.wicket.model.hints.CausewaySelectorEvent; import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel; import org.apache.causeway.viewer.wicket.model.util.ComponentHintKey; @@ -40,7 +39,6 @@ import org.apache.causeway.viewer.wicket.ui.ComponentFactory; import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract; import org.apache.causeway.viewer.wicket.ui.util.Wkt; import org.apache.causeway.viewer.wicket.ui.util.WktLinks; -import org.apache.causeway.viewer.wicket.ui.util.WktTooltips; import lombok.val; @@ -61,7 +59,7 @@ extends PanelAbstract<DataTableModel, EntityCollectionModel> { private static final String ID_VIEW_ITEM_TITLE = "viewItemTitle"; private static final String ID_VIEW_ITEM_ICON = "viewItemIcon"; - private static final String ID_VIEW_BUTTON_TITLE = "viewButtonTitle"; +// private static final String ID_VIEW_BUTTON_TITLE = "viewButtonTitle"; private static final String ID_VIEW_BUTTON_ICON = "viewButtonIcon"; private final CollectionPresentationSelectorHelper selectorHelper; @@ -110,15 +108,16 @@ extends PanelAbstract<DataTableModel, EntityCollectionModel> { final WebMarkupContainer views = new WebMarkupContainer(ID_VIEWS); final WebMarkupContainer container = new WebMarkupContainer(ID_VIEW_LIST); - WktTooltips.addTooltip(UiPlacementDirection.TOP, - views, translate("Click to change view or see export options.")); + //XXX UI glitch, tooltip has tendency to not disappear +// WktTooltips.addTooltip(UiPlacementDirection.TOP, +// views, translate("Click to change view or see export options.")); views.addOrReplace(container); views.setOutputMarkupId(true); this.setOutputMarkupId(true); - final Label viewButtonTitle = Wkt.labelAdd(views, ID_VIEW_BUTTON_TITLE, translate("Hidden")); +// final Label viewButtonTitle = Wkt.labelAdd(views, ID_VIEW_BUTTON_TITLE, translate("Hidden")); final Label viewButtonIcon = Wkt.labelAdd(views, ID_VIEW_BUTTON_ICON, ""); Wkt.listViewAdd(container, ID_VIEW_ITEM, componentFactories, item->{ @@ -162,10 +161,10 @@ extends PanelAbstract<DataTableModel, EntityCollectionModel> { // hide the selected item val isSelected = componentFactory == CollectionPresentationSelectorPanel.this.selectedComponentFactory; if (isSelected) { - viewButtonTitle.setDefaultModel(nameFor(componentFactory)); + //viewButtonTitle.setDefaultModel(nameFor(componentFactory)); final IModel<String> cssClass = cssClassFor(componentFactory, viewButtonIcon); Wkt.cssReplace(viewButtonIcon, "ViewLinkItem " + cssClass.getObject()); - link.setVisible(false); + Wkt.cssAppend(link, "active"); } });