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 2022/03/09 20:27:10 UTC
[isis] branch master updated: ISIS-2877: responsive design fixes
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 47c31db ISIS-2877: responsive design fixes
47c31db is described below
commit 47c31dbdbe3f35c092bf1726447bd348990a9901
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 9 21:27:02 2022 +0100
ISIS-2877: responsive design fixes
---
.../wicket/ui/components/footer/FooterPanel.html | 83 +++++++++++-----------
.../wicket/ui/components/header/HeaderPanel.html | 76 +++++++++++---------
2 files changed, 84 insertions(+), 75 deletions(-)
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 ae453f8..e828978 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
@@ -18,48 +18,51 @@
under the License.
-->
<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
+<body>
+ <wicket:panel>
- <footer>
- <nav class="navbar navbar-expand-md fixed-bottom bg-light" role="navigation">
-
+ <footer>
+ <nav class="navbar navbar-expand-md fixed-bottom bg-light"
+ role="navigation">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggler collapsed" data-bs-toggle="collapse" data-target="#navbar-collapse-footer">
- <span class="navbar-toggler-icon"></span>
- </button>
- </div>
- <div class="collapse navbar-collapse navbar-wrap" id="navbar-collapse-footer">
- <form class="navbar-nav form-inline">
- <span wicket:id="breadcrumbs"></span>
- </form>
- <ul class="navbar-nav mr-auto">
- </ul>
- <span class="navbar-text">
- <span class="powered-by" wicket:id="creditsLabel">Credits:</span>
- </span>
- <ul class="navbar-nav">
- <li class="nav-item" wicket:id="creditItems">
- <a class="nav-link" tabindex="-1" wicket:id="creditLink" >
- <img wicket:id="creditImage" class="footer-image"/>
- <span wicket:id="creditName" class="creditName"></span>
- </a>
- </li>
- <li class="nav-item">
- <a wicket:id="aboutLink" tabindex="-1" id="aboutLink" class="nav-link">
- <span class="aboutMessage" wicket:id="aboutMessage">About</span>
- <i wicket:id="devModeWarning" class="fa fa-lg fa-warning text-danger" title="Running in Prototype (Development) mode!"/>
- </a>
- </li>
- <li class="nav-item" wicket:id="themePicker"></li>
- </ul>
- </div>
- </div>
+ <div class="container-fluid">
+ <div class="navbar-footer">
+ <button type="button" class="navbar-toggler collapsed"
+ data-bs-toggle="collapse" data-bs-target="#navbar-collapse-footer">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ </div>
+
+ <div class="collapse navbar-collapse navbar-wrap"
+ id="navbar-collapse-footer">
+ <form class="navbar-nav form-inline">
+ <span wicket:id="breadcrumbs"></span>
+ </form>
+ <ul class="navbar-nav mr-auto">
+ </ul>
+ <span class="navbar-text"> <span class="powered-by"
+ wicket:id="creditsLabel">Credits:</span>
+ </span>
+ <ul class="navbar-nav">
+ <li class="nav-item" wicket:id="creditItems"><a
+ class="nav-link" tabindex="-1" wicket:id="creditLink"> <img
+ wicket:id="creditImage" class="footer-image" /> <span
+ wicket:id="creditName" class="creditName"></span>
+ </a></li>
+ <li class="nav-item"><a wicket:id="aboutLink" tabindex="-1"
+ id="aboutLink" class="nav-link"> <span class="aboutMessage"
+ wicket:id="aboutMessage">About</span> <i
+ wicket:id="devModeWarning"
+ class="fa fa-lg fa-warning text-danger"
+ title="Running in Prototype (Development) mode!" />
+ </a></li>
+ <li class="nav-item" wicket:id="themePicker"></li>
+ </ul>
+ </div>
+ </div>
</nav>
- </footer>
- </wicket:panel>
- </body>
+ </footer>
+ </wicket:panel>
+</body>
</html>
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 c389d78..7242c75 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
@@ -18,43 +18,49 @@
under the License.
-->
<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
+<body>
+ <wicket:panel>
<!-- <header> -->
- <nav class="navbar navbar-expand-md sticky-top navbar-dark bg-primary" role="navigation">
+ <nav class="navbar navbar-expand-md sticky-top navbar-dark bg-primary"
+ role="navigation">
- <div class="container-fluid">
- <a class="navbar-brand mr-1 ml-n2 mt-n2 mb-n2" wicket:id="applicationName">
- <span wicket:id="brandText"></span>
- <img class="navbar-brand-logo" alt="Brand" wicket:id="brandLogo"/>
- </a>
- <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-target=".navbar-collapse.app-actions" aria-expanded="false" aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
- <div class="collapse navbar-collapse app-actions mr-auto">
- <ul class="navbar-nav navbar-wrap" wicket:id="primaryMenuBar"></ul>
- </div>
- <div class="navbar collapse navbar-collapse app-actions p-0 flex-grow-0">
- <ul class="navbar-nav" wicket:id="secondaryMenuBar"></ul>
- <ul class="navbar-nav tertiary">
- <li class="nav-item dropdown">
- <a href="#" class="nav-link dropdown-toggle" id="tertiaryDropdownMenuLink" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <span wicket:id="userIcon">
- <i class="fa fa-fw fa-user"></i>
- </span>
- <img class="avatar" alt="Avatar" wicket:id="userAvatar" />
- <span class="userName" wicket:id="userName"></span>
- <span class="caret"></span>
- </a>
- <ul wicket:id="tertiaryMenuBar" class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="tertiaryDropdownMenuLink">
- </ul>
- </li>
- </ul>
- </div>
- </div>
+ <div class="container-fluid">
+ <a class="navbar-brand mr-1 ml-n2 mt-n2 mb-n2"
+ wicket:id="applicationName"> <span wicket:id="brandText"></span>
+ <img class="navbar-brand-logo" alt="Brand" wicket:id="brandLogo" />
+ </a>
+ <button type="button" class="navbar-toggler"
+ data-bs-toggle="collapse"
+ data-bs-target=".navbar-collapse.app-actions" aria-expanded="false"
+ aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse app-actions mr-auto">
+ <ul class="navbar-nav navbar-wrap" wicket:id="primaryMenuBar"></ul>
+ </div>
+ <div
+ class="navbar collapse navbar-collapse app-actions p-0 flex-grow-0">
+ <ul class="navbar-nav" wicket:id="secondaryMenuBar"></ul>
+ <ul class="navbar-nav tertiary">
+ <li class="nav-item dropdown"><a href="#"
+ class="nav-link dropdown-toggle" id="tertiaryDropdownMenuLink"
+ role="button" data-bs-toggle="dropdown" aria-haspopup="true"
+ aria-expanded="false"> <span wicket:id="userIcon"> <i
+ class="fa fa-fw fa-user"></i>
+ </span> <img class="avatar" alt="Avatar" wicket:id="userAvatar" /> <span
+ class="userName" wicket:id="userName"></span> <span
+ class="caret"></span>
+ </a>
+ <ul wicket:id="tertiaryMenuBar"
+ class="dropdown-menu dropdown-menu-right" role="menu"
+ aria-labelledby="tertiaryDropdownMenuLink">
+ </ul></li>
+ </ul>
+ </div>
+ </div>
- </nav>
+ </nav>
<!-- </header> -->
- </wicket:panel>
- </body>
+ </wicket:panel>
+</body>
</html>