You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/18 14:09:52 UTC
[isis] 06/11: Adapting secondary and tertiary header menu,
removing all occurences of .panel-default
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2617_wicketstuff.bs4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e86d6bcfff5d473d1187c09a087d0218c57f2682
Author: mwhesse <mw...@gmail.com>
AuthorDate: Sun Apr 18 11:57:26 2021 +0700
Adapting secondary and tertiary header menu, removing all occurences of .panel-default
---
.../entityactions/AdditionalLinksAsDropDownPanel.html | 2 +-
.../ui/components/actions/ActionParametersPanel.html | 2 +-
.../components/bookmarkedpages/BookmarkedPagesPanel.html | 2 +-
.../entity/collection/EntityCollectionPanel.html | 2 +-
.../ui/components/entity/fieldset/PropertyGroup.html | 2 +-
.../viewer/wicket/ui/components/header/HeaderPanel.html | 12 ++++++------
.../wicket/ui/components/property/PropertyEditPanel.html | 2 +-
.../standalonecollection/StandaloneCollectionPanel.html | 2 +-
.../viewer/wicket/ui/errors/ExceptionStackTracePanel.html | 2 +-
.../viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css | 15 ++++++++++++++-
.../viewer/wicket/ui/pages/bootstrap-overrides-darkly.css | 2 +-
.../viewer/wicket/ui/pages/bootstrap-overrides-flatly.css | 6 ++++++
.../isis/viewer/wicket/ui/pages/value/ValuePage.html | 2 +-
.../viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html | 2 +-
14 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
index 96f82f4..56a6dee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksAsDropDownPanel.html
@@ -30,7 +30,7 @@
<span class="fa fa-ellipsis-v"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
- <li wicket:id="additionalLinkItem" class="additionalLinkItem">
+ <li wicket:id="additionalLinkItem" class="dropdown-item additionalLinkItem">
<a href="#" wicket:id="additionalLink" class="btn btn-sm">
<span wicket:id="additionalLinkTitle" class="additionalLinkItem">[link title]</span>
</a>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
index dbdbf0a..ad446ed 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.html
@@ -25,7 +25,7 @@
<body>
<wicket:panel>
<div class="actionPanel actionComponentType">
- <div wicket:id="header" class="iconAndTitle card panel-default actionPanelHeaderNew">
+ <div wicket:id="header" class="iconAndTitle card actionPanelHeaderNew">
<wicket:container wicket:id="entityIconAndTitle">[icon and title]</wicket:container>
<h3 wicket:id="actionName" class="actionName">[action name]</h3>
</div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
index df48998..3b23f4a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.html
@@ -30,7 +30,7 @@
<div class="row">
<div class="col-xs-12">
<div class="panel-group">
- <div class="card panel-default">
+ <div class="card">
<div class="card-header">
<h4 class="card-title"><span class="fa fa-fw fa-bookmark"></span> Bookmarks</h4>
</div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
index eeaf887..94b1d25 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<div wicket:id="collectionGroup">
- <div class="card panel-default">
+ <div class="card">
<div class="card-header">
<span wicket:id="collectionName" class="card-title">[collection name]</span>
<div class="additionalLinksAndSelectorDropDown float-right">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
index 99d0480..4a306be 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<fieldset class="memberGroup" wicket:id="memberGroup">
- <div class="card panel-default">
+ <div class="card">
<div class="card-header" wicket:id="panelHeading">
<span wicket:id="memberGroupName" class="card-title">[group name]</span>
<div class="float-right additionalLinks">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
index 0d3a6ef..c05eeaf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.html
@@ -33,14 +33,14 @@
<img alt="Brand" wicket:id="brandLogo"/>
</a>
</div>
- <div class="navbar-collapse app-actions collapse navbar-left">
+ <div class="navbar-collapse app-actions collapse mr-auto">
<ul class="navbar-nav" wicket:id="primaryMenuBar"></ul>
</div>
- <div class="navbar-collapse app-actions collapse navbar-right">
+ <div class="navbar-collapse app-actions collapse flex-grow-0">
<ul class="navbar-nav" wicket:id="secondaryMenuBar"></ul>
<ul class="navbar-nav tertiary">
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="padding-bottom: 5px;">
+ <li class="nav-item dropdown">
+ <a href="#" class="nav-link dropdown-toggle" id="tertiaryDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span wicket:id="userIcon">
<i class="fa fa-fw fa-user"></i>
</span>
@@ -48,8 +48,8 @@
<span class="userName" wicket:id="userName"></span>
<span class="caret"></span>
</a>
- <ul wicket:id="tertiaryMenuBar" class="dropdown-menu" role="menu" style="min-width: 0px;">
- </ul>
+ <ul wicket:id="tertiaryMenuBar" class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="tertiaryDropdownMenuLink">
+ </ul>
</li>
</ul>
</div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
index 4ba5cae..4cae5d1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.html
@@ -25,7 +25,7 @@
<body>
<wicket:panel>
<div class="propertyEditPanel propertyEditComponentType">
- <div wicket:id="header" class="iconAndTitle card panel-default actionPanelHeaderNew">
+ <div wicket:id="header" class="iconAndTitle card actionPanelHeaderNew">
<wicket:container wicket:id="entityIconAndTitle">[icon and title]</wicket:container>
</div>
<div wicket:id="propertyEditForm"></div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
index 5544f14..3bfc4da 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.html
@@ -27,7 +27,7 @@
<div wicket:id="standaloneCollection">
- <div class="standaloneCollectionPanel actionComponentType card panel-default">
+ <div class="standaloneCollectionPanel actionComponentType card">
<div class="iconAndTitle card-header actionPanelHeaderNew">
<span wicket:id="actionName" class="actionName card-title">[action name]</span>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
index 317ca23..f1c9308 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.html
@@ -41,7 +41,7 @@
</div>
</div>
<br/>
- <div class="errorDetail card panel-default" wicket:id="exceptionDetailDiv">
+ <div class="errorDetail card" wicket:id="exceptionDetailDiv">
<div class="heading card-header">
<a class="btn btn-info" href="#" role="button">Exception details</a>
<span class="card-title"></span>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
index 1e69acb..2c34b48 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-all-v2.css
@@ -43,6 +43,12 @@ header.navbar-fixed-top {
left: initial;
}
+/* emulate .dropdown-menu-right for secondary dropdown menus */
+.navbar-nav.secondary .dropdown-menu {
+ right: 0;
+ left: auto;
+}
+
.card {
margin-bottom: 21px;
}
@@ -55,6 +61,10 @@ header.navbar-fixed-top {
min-height: 3em; /* for card-headers that contain no buttons, to make them same height */
}
+.card .card-header .card-title {
+ margin-bottom: 0rem;
+}
+
.table .form-control:disabled {
background-color: transparent;
border: none;
@@ -513,7 +523,10 @@ span.containedButtonPanel {
padding-bottom: 0px;
}
-
+/* add some space between an FA icon and the text on the right */
+.btn .fa {
+ margin-right: 2px;
+}
/* from additionalLinksPanel.css */
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
index fb6c893..a3346f4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-darkly.css
@@ -41,6 +41,6 @@ a.scalarValueInlinePromptLink:focus textarea,
}
/* ISIS-2092 fixing Darkly Theme: buttons and fieldset-headers have same background-color */
-.panel-default > .card-header {
+.card > .card-header {
background-color: #515050;
}
\ No newline at end of file
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
index 286636b..2e0a76d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides-flatly.css
@@ -27,6 +27,12 @@
background-color: #ecf0f1;
}
+header nav.navbar {
+ padding: 0.5rem 0.5rem;
+}
+header .navbar-header .navbar-brand {
+ padding-bottom: 0px;
+}
.sidebar-panel :focus,
h4.iconAndTitle a:focus,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
index c32dc63..4f2eea9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.html
@@ -26,7 +26,7 @@
<wicket:extend>
<div class="valuePage">
<div wicket:id="bookmarks"></div>
- <div class="iconAndTitle card panel-default actionPanelHeaderNew">
+ <div class="iconAndTitle card actionPanelHeaderNew">
<div class="card-header">
<div wicket:id="actionName" class="card-title actionName">[action name]</div>
</div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
index 4392728..e9c3aed 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
@@ -26,7 +26,7 @@
<wicket:extend>
<div class="voidReturnPage">
<div wicket:id="bookmarks"></div>
- <div class="iconAndTitle card panel-default actionPanelHeaderNew">
+ <div class="iconAndTitle card actionPanelHeaderNew">
<div class="card-header">
<div class="card-title">
<div wicket:id="actionName" class="actionName">[action name]</div>