[causeway] branch master updated: CAUSEWAY-3573: changes EntityIconAndLink back to using an

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git


The following commit(s) were added to refs/heads/master by this push:
     new bb972c72fe CAUSEWAY-3573: changes EntityIconAndLink back to using an <a href=...>
bb972c72fe is described below

commit bb972c72fe6e3ae493bd33144e67700aaa50d1d1
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Sep 20 19:37:03 2023 +0100

    CAUSEWAY-3573: changes EntityIconAndLink back to using an <a href=...>
    
    and adds some CSS to suppress the default underline that <a> attracts
---
 .../entity/icontitle/EntityIconAndTitlePanel.html        |  8 ++++----
 .../common/bootstrap/css/bootstrap-overrides-all-v2.css  | 16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
index b413ada7fd..f6097f05ef 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
@@ -7,9 +7,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
          http://www.apache.org/licenses/LICENSE-2.0
-         
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,11 +21,11 @@
     <body>
         <wicket:panel>
              <span wicket:id="entityLinkWrapper" class="entityIconAndTitlePanel entityIconAndTitleComponentType">
-                 <div wicket:id="entityLink" class="entityUrlSource">
+                 <a href="#" wicket:id="entityLink" class="entityUrlSource">
                      <span wicket:id="entityFontAwesome"></span>
                      <img wicket:id="entityImage" class="entityImage"/>
                      <span wicket:id="entityTitle" class="entityTitle">[title]</span>
-                 </div>
+                 </a>
                  <wicket:child/>
             </span>
         </wicket:panel>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
index 1b78cdd8a3..8c36994964 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
@@ -300,7 +300,7 @@ footer > .navbar {
     padding:0 0;
 }
 
-/* bootstrap seems to set to 'pointer' 
+/* bootstrap seems to set to 'pointer'
 .collectionContentsAsAjaxTablePanel label:hover {
     cursor: default;
 }
@@ -719,11 +719,11 @@ div.label-none label.col-form-label {
     display: none;
 }
 
-div.label-left .scalarValueWrapper { 
+div.label-left .scalarValueWrapper {
     width: var(--form-field-width);
     float: left;
 }
-div.label-right .scalarValueWrapper { 
+div.label-right .scalarValueWrapper {
 	width: var(--form-field-width);
     float: left;
 }
@@ -1306,15 +1306,15 @@ div.dataTables_wrapper ul.pagination {
 
 .toast.alert-info {
   --bs-toast-bg: rgba(var(--bs-info-rgb), 0.85);
-  --bs-toast-color: var(--bs-dark);  
+  --bs-toast-color: var(--bs-dark);
 }
 .toast.alert-warning {
   --bs-toast-bg: rgba(var(--bs-warning-rgb), 0.85);
-  --bs-toast-color: var(--bs-dark);  
+  --bs-toast-color: var(--bs-dark);
 }
 .toast.alert-danger {
   --bs-toast-bg: rgba(var(--bs-danger-rgb), 0.85);
-  --bs-toast-color: var(--bs-light);  
+  --bs-toast-color: var(--bs-light);
 }
 
 /* TOOLTIPS */
@@ -1335,5 +1335,9 @@ strong.wkt-component-with-tooltip  {
 
 .ui-helper-hidden-accessible { display:none; }
 
+span.entityIconAndTitlePanel > a {
+    text-decoration: none;
+}
+
 /* --- */