[isis] 09/11: Adapting bookmarks panel, themechooser, removing occurences of xs-breakpoints, fixing missing popper.js dependency

[ah...@apache.org]

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 0844f0deddbc281b427eeb72487be4e2c25afc92
Author: mwhesse <mw...@gmail.com>
AuthorDate: Sun Apr 18 14:41:21 2021 +0700

    Adapting bookmarks panel, themechooser, removing occurences of xs-breakpoints, fixing missing popper.js dependency
---
 core/pom.xml                                           |  9 ++++++++-
 .../bookmarkedpages/BookmarkedPagesPanel.html          |  4 ++--
 .../bookmarkedpages/BookmarkedPagesPanel.java          |  2 +-
 .../ajaxtable/IsisAjaxNavigationToolbar.html           |  2 +-
 .../wicket/ui/components/footer/FooterPanel.html       |  2 +-
 .../wicket/ui/components/header/HeaderPanel.html       |  2 +-
 .../wicket/ui/components/welcome/WelcomePanel.html     |  2 +-
 .../components/widgets/themepicker/ThemeChooser.html   | 18 +++++++++++-------
 .../isis/viewer/wicket/ui/pages/about/AboutPage.html   |  2 +-
 .../wicket/ui/pages/actionprompt/ActionPromptPage.html |  2 +-
 .../wicket/ui/pages/bootstrap-overrides-all-v2.css     | 12 +-----------
 .../wicket/ui/pages/bootstrap-overrides-darkly.css     |  7 +++++++
 .../isis/viewer/wicket/ui/pages/home/HomePage.html     |  2 +-
 viewers/wicket/viewer/pom.xml                          |  5 +++++
 14 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index f3a85d5..45abdc6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -180,13 +180,15 @@
 		<togglz.version>2.9.6</togglz.version>
 
 		<vaadin.version>19.0.4</vaadin.version>
-
+		
 		<wicket.version>8.11.0</wicket.version>
 		<wicket-bootstrap.version>3.0.0-M17</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
 		<wicket-fullcalendar.version>4.2</wicket-fullcalendar.version>
 		<wicket-source.version>7.0.0</wicket-source.version>
 		<wicket-webjars.version>2.0.19</wicket-webjars.version>
 
+		<popper-js.version>1.16.0</popper-js.version>
+
 		<wicketstuff.version>8.11.0</wicketstuff.version> <!-- org.wicketstuff:wicketstuff-select2 -->
 		<wicketstuff-gmap3.version>${wicket.version}</wicketstuff-gmap3.version>
 
@@ -972,6 +974,11 @@
 				<type>pom</type>
 			</dependency>
 
+			<dependency>
+			    <groupId>org.webjars</groupId>
+			    <artifactId>popper.js</artifactId>		    
+				<version>${popper-js.version}</version>
+			</dependency>
 
 			<dependency>
 				<groupId>de.agilecoders.wicket</groupId>
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 d8c6b34..1c85fc2 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
@@ -25,10 +25,10 @@
 	<body>
         <wicket:panel>
             <div class="bookmarkedPagesPanel">
-                <div class="showPanelTab bookmarkRibbon navbar-inverse"></div>
+                <div class="showPanelTab bookmarkRibbon bg-light ml-0"></div>
                 <div id="bookmarkedPagesSlidingDiv">
                     <div class="row">
-                        <div class="col-xs-12">
+                        <div class="col-12">
                             <div class="panel-group">
                                 <div class="card">
                                     <div class="card-header">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index cdedf8d..7c60900 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -87,7 +87,7 @@ extends PanelAbstract<List<BookmarkTreeNode>, BookmarkedPagesModel> {
     public void renderHead(IHeaderResponse response) {
         super.renderHead(response);
 
-        response.render(OnDomReadyHeaderItem.forScript("$('.bookmarkRibbon').height($('.navbar.navbar-fixed-top').height()-5);"));
+        response.render(OnDomReadyHeaderItem.forScript("$('.bookmarkRibbon').height($('nav.navbar.fixed-top')[0].offsetHeight - 5);"));
     }
 
     private void buildGui() {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
index 4aa6e44..50dc0bb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.html
@@ -20,7 +20,7 @@
         <td wicket:id="span">
             <div class="navigatorLabel">
                 <span wicket:id="navigatorLabel">[navigator-label]</span>
-                <button wicket:id="showAll" type="button" class="btn btn-xs btn-link">Show all</button>
+                <button wicket:id="showAll" type="button" class="btn btn-sm btn-link">Show all</button>
                 <span wicket:id="prototypingLabel" class="navigator-prototyping-label">[prototyping-label]</span>
             </div>
             <div class="navigator"><div wicket:id="navigator">[navigator]</div></div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
index cec2fe3..37ff0fb 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.html
@@ -22,7 +22,7 @@
         <wicket:panel>
 
             <footer>
-			<nav class="navbar navbar-expand-lg bg-dark navbar-dark" role="navigation">
+			<nav class="navbar navbar-expand-md fixed-bottom bg-dark navbar-dark" role="navigation">
             
 
             <div class="container-fluid">
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 c05eeaf..3175077 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
@@ -21,7 +21,7 @@
     <body>
         <wicket:panel>
         	<header>
-            <nav class="navbar navbar-expand-sm navbar-fixed-top bg-dark navbar-dark" role="navigation">
+            <nav class="navbar navbar-expand-sm fixed-top bg-dark navbar-dark" role="navigation">
 
             <div class="container-fluid">
                 <div class="navbar-header">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
index f137d2f..f230628 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.html
@@ -21,7 +21,7 @@
     <div class="page-header container">
         <div class="row">
             <wicket:remove>TODO do something about DISABLED-** classes</wicket:remove>
-            <div class="col-xs-8 col-md-7 col-sm-6 DISABLED-welcomePanel DISABLED-welcomeComponentType">
+            <div class="col-8 col-md-7 col-sm-6 DISABLED-welcomePanel DISABLED-welcomeComponentType">
                 <div wicket:id="message" id="message" class="lead">A calm blue sky</div>
             </div>
         </div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
index 929f229..11ed13e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.html
@@ -20,13 +20,17 @@
 <html xmlns:wicket="http://wicket.apache.org">
     <body>
         <wicket:panel>
-            <a href="#" tabindex="-1" class="dropdown-toggle" data-toggle="dropdown">Change theme <span class="caret"></span></a>
-            <ul class="dropdown-menu" role="menu">
-                <li wicket:id="themes">
-                    <a tabindex="-1" wicket:id="themeLink">
-
-                    </a></li>
-            </ul>
+        	<div class="btn-group dropup">
+	            <a href="#" tabindex="-1" class="nav-link dropdown-toggle" role="button" data-toggle="dropdown">
+	            	Change theme <span class="caret"></span>
+	            </a>
+	            <ul class="dropdown-menu dropdown-menu-right" role="menu">
+	                <li wicket:id="themes">
+	                    <a class="dropdown-item" tabindex="-1" wicket:id="themeLink">
+	
+	                    </a></li>
+	            </ul>
+			</div>
         </wicket:panel>
     </body>
 </html>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
index 2c2fe10..8b1c46c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/about/AboutPage.html
@@ -33,7 +33,7 @@
                 <div>
                     <div wicket:id="bookmarks"></div>
                     <div class="row">
-                        <div class="offset-2 col-xs-8">
+                        <div class="offset-2 col-8">
                             <div wicket:id="about"></div>
                         </div>
                     </div>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
index 4600f80..f9d8b71 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.html
@@ -27,7 +27,7 @@
 			<div class="actionPromptPage">
 				<div wicket:id="bookmarks"></div>
 				<div class="row">
-					<div class="offset-2 col-xs-8">
+					<div class="offset-2 col-8">
 						<div wicket:id="actionPrompt"></div>
 					</div>
 				</div>
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 66c6186..ba8cf8d 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
@@ -25,7 +25,7 @@
 }
 
 #body {
-    padding-top: 0px;
+    padding-top: 61px;
 }
 
 body {
@@ -33,16 +33,6 @@ body {
     margin-bottom: 0px;
 }
 
-header.navbar-fixed-top {
-    position: sticky;
-}
-
-.navbar-fixed-top {
-    position: initial;
-    right: initial;
-    left: initial;
-}
-
 /* emulate .dropdown-menu-right for secondary dropdown menus */
 .navbar-nav.secondary .dropdown-menu {
 	right: 0;
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 a3346f4..f3c9639 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
@@ -17,6 +17,13 @@
  *  under the License.
  */
 
+header nav.navbar {
+	padding: 0.5rem 0.5rem;
+}
+header .navbar-header .navbar-brand {
+	padding-bottom: 0px;
+}
+
 .bootstrap-datetimepicker-widget {
     background-color: #ffffff;
     color: #000000;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
index ffef62a..7c952da 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.html
@@ -28,7 +28,7 @@
                 <div wicket:id="bookmarks"></div>
                 <div wicket:id="welcome"></div>
                 <div class="row">
-                    <div class="offset-2 col-xs-8">
+                    <div class="offset-2 col-8">
                         <div wicket:id="actionPrompt"></div>
                     </div>
                 </div>
diff --git a/viewers/wicket/viewer/pom.xml b/viewers/wicket/viewer/pom.xml
index f3c4c1e..4468ece 100644
--- a/viewers/wicket/viewer/pom.xml
+++ b/viewers/wicket/viewer/pom.xml
@@ -94,6 +94,11 @@
             </exclusions>
         </dependency>
 
+		<dependency>
+		    <groupId>org.webjars</groupId>
+		    <artifactId>popper.js</artifactId>		    
+		</dependency>
+
         <dependency>
             <groupId>de.agilecoders.wicket</groupId>
             <artifactId>wicket-bootstrap-core</artifactId>