Skip to content

Commit

Permalink
sidebar panel migration for 3.1 AdminLTE version
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Dec 1, 2021
1 parent b1cd902 commit 9261607
Show file tree
Hide file tree
Showing 10 changed files with 325 additions and 251 deletions.
12 changes: 6 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public class GuiStyleConstants {

public static final String CLASS_OBJECT_COLLECTION_ICON = "fa fa-filter";

public static final String CLASS_OBJECT_TEMPLATE_ICON = "fa fa-file-text";
public static final String CLASS_OBJECT_TEMPLATE_ICON = "far fa-file-code";

public static final String CLASS_REPORT_ICON = "fa fa-pie-chart";
public static final String CLASS_REPORT_ICON = "fas fa-chart-pie";

public static final String CLASS_ICON_STYLE = "icon-style-"; //some icon styles start with this string
public static final String CLASS_ICON_STYLE_NORMAL = "icon-style-normal";
Expand All @@ -98,11 +98,11 @@ public class GuiStyleConstants {
public static final String CLASS_SHADOW_ICON_PROTECTED = "fa fa-shield";
public static final String CLASS_SHADOW_ICON_UNKNOWN = "fa fa-eye";

public static final String CLASS_ICON_DASHBOARD = "fa fa-dashboard";
public static final String CLASS_ICON_DASHBOARD = "fas fa-tachometer-alt";
public static final String CLASS_ICON_PROFILE = "fa fa-user";
public static final String CLASS_ICON_CREDENTIALS = "fa fa-shield";
public static final String CLASS_ICON_REQUEST = "fa fa-pencil-square-o";
public static final String CLASS_ICON_CONSENT = "fa fa-check-square-o";
public static final String CLASS_ICON_CREDENTIALS = "fas fa-key";
public static final String CLASS_ICON_REQUEST = "fas fa-shopping-basket";
public static final String CLASS_ICON_CONSENT = "far fa-check-square";

public static final String CLASS_APPROVAL_OUTCOME_ICON_UNKNOWN_COLORED = "fa fa-check text-warning";
public static final String CLASS_APPROVAL_OUTCOME_ICON_APPROVED_COLORED = "fa fa-check text-success";
Expand Down
155 changes: 91 additions & 64 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@

<link href="css/fonts.css" type="text/css" rel="stylesheet"/>
<link href="css/font-evosome.css" type="text/css" rel="stylesheet"/>
<link type="text/css" rel="stylesheet" href="dist/midpoint-theme.css"/>


<wicket:link>
<link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/Ionicons/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/datatables.net-bs/css/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
<!-- <link href="../../../../../../webjars/AdminLTE/3.1.0/plugins/bootstrap/js/css/bootstrap.min.css" rel="stylesheet" type="text/css" />-->
<!-- <link href="../../../../../../webjars/font-awesome/5.15.3/css/fontawesome.min.css" rel="stylesheet" type="text/css" />-->
<!-- <link href="../../../../../../webjars/AdminLTE/3.1.0/bower_components/Ionicons/css/ionicons.min.css" rel="stylesheet" type="text/css" />-->
<!-- <link href="../../../../../../webjars/AdminLTE/3.1.0/plugins/datatables-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />-->
</wicket:link>


Expand All @@ -48,67 +50,81 @@

<!-- OBSOLETE START -->
<link type="text/css" rel="stylesheet" href="css/silk.css"/>
<link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
<!-- <link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>-->
<!-- OBSOLETE END -->
<link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>
</head>

<body wicket:id="body">
<div wicket:id="mainPopup"/>
<div class="wrapper">
<header wicket:id="mainHeader" class="main-header" style="max-height:550px;">
<!-- <header wicket:id="mainHeader" class="main-header navbar navbar-expand navbar-white navbar-light" > &lt;!&ndash;style="max-height:550px;"&ndash;&gt;-->
<!-- Logo -->
<a class="custom-logo" wicket:id="customLogo">
<i wicket:id="customLogoImgCss"/>
<img wicket:id="customLogoImgSrc"/>
</a>
<a class="logo" wicket:id="logo">
<span>&nbsp;</span>
</a>
<!-- <a class="custom-logo" wicket:id="customLogo">-->
<!-- <i wicket:id="customLogoImgCss"/>-->
<!-- <img wicket:id="customLogoImgSrc"/>-->
<!-- </a>-->
<!-- <a class="logo" wicket:id="logo">-->
<!-- <span>&nbsp;</span>-->
<!-- </a>-->
<!-- Header Navbar: style can be found in header.less -->
<nav wicket:id="navigation" role="navigation" class="navbar navbar-static-top">
<!-- Sidebar toggle button-->
<a wicket:id="menuToggle" role="button" data-toggle="push-menu" class="sidebar-toggle" href="#">
<span class="sr-only"><wicket:message key="PageTemplate.toggleNavigation"/></span>
</a>

<div class="navbar-title" wicket:id="pageTitleContainer" style="max-width:94%;">
<span class="page-title" wicket:id="pageTitle">
<span wicket:id="deploymentName"/>
<span wicket:id="pageTitleReal"/>
</span>
</div>
<div class="navbar-ajax">
<img id="ajax_busy" src="img/ajax-loader.gif" style="display: inline; visibility: hidden;"/>
</div>

<!-- Navbar Right Menu -->
<div class="navbar-custom-menu">
<ol class="breadcrumb">
<li wicket:id="breadcrumb">
<a wicket:id="bcLink">
<i wicket:id="bcIcon"></i>&nbsp;
<span wicket:id="bcName"/>
</a>
</li>
</ol>
<div class="pull-right">
<a wicket:id="cartButton" class="shopping-cart-icon">
<i class="fa fa-shopping-cart fa-2x shopping-cart-icon"></i>
<span wicket:id="itemsCount" class="badge bg-red"
style="position: absolute; top: 1px; margin-left: -10px;"></span>
</a>
<ul class="nav navbar-nav pull-right">
<!-- User Account: style can be found in dropdown.less -->
<li>
<div wicket:id="locale"/>
</li>
<li class="dropdown user user-menu" wicket:id="rightMenu"/>
</ul>
</div>
</div>
<nav wicket:id="navigation" class="main-header navbar navbar-expand navbar-white navbar-light">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<div class="navbar-title" wicket:id="pageTitleContainer" style="max-width:94%;">
<span class="page-title" wicket:id="pageTitle">
<span wicket:id="deploymentName"/>
<span wicket:id="pageTitleReal"/>
</span>
</div>
</li>
</ul>
</nav>
</header>
<!-- <nav wicket:id="navigation" role="navigation" class="navbar navbar-static-top">-->
<!-- &lt;!&ndash; Sidebar toggle button&ndash;&gt;-->
<!-- <a wicket:id="menuToggle" role="button" data-toggle="push-menu" class="sidebar-toggle" href="#">-->
<!-- <span class="sr-only"><wicket:message key="PageTemplate.toggleNavigation"/></span>-->
<!-- </a>-->

<!-- <div class="navbar-title" wicket:id="pageTitleContainer" style="max-width:94%;">-->
<!-- <span class="page-title" wicket:id="pageTitle">-->
<!-- <span wicket:id="deploymentName"/>-->
<!-- <span wicket:id="pageTitleReal"/>-->
<!-- </span>-->
<!-- </div>-->
<!-- <div class="navbar-ajax">-->
<!-- <img id="ajax_busy" src="img/ajax-loader.gif" style="display: inline; visibility: hidden;"/>-->
<!-- </div>-->

<!-- &lt;!&ndash; Navbar Right Menu &ndash;&gt;-->
<!-- <div class="navbar-custom-menu">-->
<!-- <ol class="breadcrumb">-->
<!-- <li wicket:id="breadcrumb">-->
<!-- <a wicket:id="bcLink">-->
<!-- <i wicket:id="bcIcon"></i>&nbsp;-->
<!-- <span wicket:id="bcName"/>-->
<!-- </a>-->
<!-- </li>-->
<!-- </ol>-->
<!-- <div class="pull-right">-->
<!-- <a wicket:id="cartButton" class="shopping-cart-icon">-->
<!-- <i class="fa fa-shopping-cart fa-2x shopping-cart-icon"></i>-->
<!-- <span wicket:id="itemsCount" class="badge bg-red"-->
<!-- style="position: absolute; top: 1px; margin-left: -10px;"></span>-->
<!-- </a>-->
<!-- <ul class="nav navbar-nav pull-right">-->
<!-- &lt;!&ndash; User Account: style can be found in dropdown.less &ndash;&gt;-->
<!-- <li>-->
<!-- <div wicket:id="locale"/>-->
<!-- </li>-->
<!-- <li class="dropdown user user-menu" wicket:id="rightMenu"/>-->
<!-- </ul>-->
<!-- </div>-->
<!-- </div>-->
<!-- </nav>-->
<!-- </header>-->
<wicket:enclosure child="sidebarMenu">
<!-- <aside class="main-sidebar">-->
<!-- &lt;!&ndash; sidebar: style can be found in sidebar.less &ndash;&gt;-->
Expand All @@ -117,7 +133,7 @@
<!-- </section>-->
<!-- &lt;!&ndash; /.sidebar &ndash;&gt;-->
<!-- </aside>-->
<aside class="main-sidebar" wicket:id="sidebarMenu"/>
<aside class="main-sidebar sidebar-dark-primary" wicket:id="sidebarMenu"/>

</wicket:enclosure>
<div class="content-wrapper" style="min-height: 916px; overflow: auto; overflow-x: hidden;">
Expand Down Expand Up @@ -151,17 +167,28 @@
</div>

<wicket:link>
<script src="../../../../../../webjars/AdminLTE/2.4.18/bower_components/bootstrap/dist/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../../../../../../webjars/AdminLTE/2.4.18/bower_components/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
<script src='../../../../../../webjars/AdminLTE/2.4.18/bower_components/fastclick/lib/fastclick.js'></script>
<script src="../../../../../../webjars/AdminLTE/2.4.18/dist/js/adminlte.min.js" type="text/javascript"></script>
<script src="../../../../../../webjars/AdminLTE/3.1.0/plugins/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../../../../../../webjars/AdminLTE/3.1.0/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
<script src='../../../../../../webjars/AdminLTE/3.1.0/plugins/fastclick/fastclick.js'></script>
<script src="../../../../../../webjars/AdminLTE/3.1.0/dist/js/adminlte.min.js" type="text/javascript"></script>
</wicket:link>

<script type="text/javascript" src="js/bootstrap-select/bootstrap-select.js"></script>
<script type="text/javascript" src="js/bootstrap-select/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>
<script type="text/javascript" src="js/ace/ext-language_tools.js" charset="utf-8"></script>

<script type="text/javascript" src="wro/midpoint-theme.js"></script>
<script type="text/javascript" src="dist/midpoint.bundle.js"></script>
<!-- <script type="text/javascript" src="css/bootstrap.bundle.js"></script>-->
<!-- <script type="text/javascript" src="css/adminlte.bundle.js"></script>-->
<!-- <script type="text/javascript" src="js/ace/ace.js" charset="utf-8"></script>-->
<!-- <script type="text/javascript" src="js/ace/ext-language_tools.js" charset="utf-8"></script>-->

<!-- <script type="text/javascript" src="js/midpoint-theme.js"></script>-->
<!-- <script type="text/javascript" src="js/ace.bundle.js"></script>-->
<!-- <script type="text/javascript" src="js/runtime.bundle.js"></script>-->
<!-- <script type="text/javascript" src="js/all.bundle.js"></script>-->
<!-- <script type="text/javascript" src="js/bootstrap.bundle.js"></script>-->
<!-- <script type="text/javascript" src="js/adminlte.min.js"></script>-->
<!-- <script type="text/javascript" src="js/fastclick.bundle.js"></script>-->

</body>
</html>

0 comments on commit 9261607

Please sign in to comment.