mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-13 08:09:41 +00:00
Merge branch 'marjohn56-Sidebar'
This commit is contained in:
Ad Schellevis
commit
f115eadb97
@ -191,6 +191,7 @@
|
||||
|
||||
<!-- OPNsense standard toolkit -->
|
||||
<script src="/ui/js/opnsense.js"></script>
|
||||
<script src="/ui/js/opnsense_theme.js"></script>
|
||||
<script src="/ui/js/opnsense_ui.js"></script>
|
||||
<script src="/ui/js/opnsense_bootgrid_plugin.js"></script>
|
||||
<script src="{{theme_file_or_default('/js/theme.js', theme_name)}}"></script>
|
||||
@ -219,6 +220,7 @@
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
<button class="toggle-sidebar glyphicon glyphicon-chevron-left" style="display:none;"></button>
|
||||
<div class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li id="menu_messages"><a href="#">{{session_username}}@{{system_hostname}}.{{system_domain}}</a></li>
|
||||
@ -290,6 +292,5 @@
|
||||
<script src="/ui/js/bootstrap-select.min.js"></script>
|
||||
<!-- bootstrap dialog -->
|
||||
<script src="/ui/js/bootstrap-dialog.min.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
104
src/opnsense/www/js/opnsense_theme.js
Normal file
104
src/opnsense/www/js/opnsense_theme.js
Normal file
@ -0,0 +1,104 @@
|
||||
/**
|
||||
* Copyright (C) 2018 Deciso B.V.
|
||||
* Copyright (C) 2018 Team Rebellion
|
||||
*
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice,
|
||||
* this list of conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
* hook-in additional theme functionality
|
||||
*/
|
||||
|
||||
$(document).ready(function () {
|
||||
// traverse loaded css files
|
||||
var toggle_sidebar_loaded = false;
|
||||
$.each(document.styleSheets, function(sheetIndex, sheet) {
|
||||
if (sheet.href != undefined && sheet.href.endsWith('main.css')){
|
||||
$.each(sheet.cssRules || sheet.rules, function(ruleIndex, rule) {
|
||||
if (rule.cssText.indexOf('toggle-sidebar') >= 0) {
|
||||
toggle_sidebar_loaded = true;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
if (toggle_sidebar_loaded) {
|
||||
/** navigation toggle **/
|
||||
$(".toggle-sidebar").click(function () {
|
||||
$("#navigation").toggleClass("col-sidebar-left");
|
||||
$("main").toggleClass("col-sm-9 col-sm-push-3 col-lg-10 col-lg-push-2 col-lg-12");
|
||||
$(".toggle-sidebar").toggleClass("glyphicon-chevron-right glyphicon-chevron-left");
|
||||
if ($("#navigation").hasClass("col-sidebar-left")) {
|
||||
$(".brand-logo").css("display", "none");
|
||||
$(".brand-icon").css("display", "inline-block");
|
||||
} else {
|
||||
$(".brand-icon").css("display", "none");
|
||||
$(".brand-logo").css("display", "inline-block");
|
||||
$("#navigation.page-side.col-xs-12.col-sm-3.col-lg-2.hidden-xs").css("width", "");
|
||||
}
|
||||
});
|
||||
/** sidebar mouseevents **/
|
||||
$("#navigation").hover(function () {
|
||||
if ($("#navigation").hasClass("col-sidebar-left")) {
|
||||
$("#navigation > div > nav > #mainmenu > div > div").on({
|
||||
mouseout: function() {$("#navigation.col-sidebar-left").css("width", "70px"); },
|
||||
mouseover: function() {$("#navigation.col-sidebar-left").css("width", "380px"); }
|
||||
});
|
||||
$("#navigation > div > nav > #mainmenu > div > a").on({
|
||||
mouseout: function() {$("#navigation.col-sidebar-left").css("width", "70px"); },
|
||||
mouseover: function() {$("#navigation.col-sidebar-left").css("width", "380px"); }
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
/** on resize - toggle sidebar / main navigation **/
|
||||
$(window).on('resize', function(){
|
||||
var win = $(this);
|
||||
if (((win.height() <= 669) && $("#navigation").hasClass("col-sidebar-left"))) {
|
||||
$("main").toggleClass("col-sm-9 col-sm-push-3 col-lg-10 col-lg-push-2 col-lg-12");
|
||||
$("#navigation").toggleClass("col-sidebar-left");
|
||||
$(".toggle-sidebar").toggleClass("glyphicon-chevron-right glyphicon-chevron-left");
|
||||
$(".brand-icon").css("display", "none");
|
||||
$(".brand-logo").css("display", "inline-block");
|
||||
$("#navigation.page-side.col-xs-12.col-sm-3.col-lg-2.hidden-xs").css("width", "");
|
||||
} else if ((win.width() <= 768) && $("#navigation").hasClass("col-sidebar-left")) {
|
||||
$("main").toggleClass("col-sm-9 col-sm-push-3 col-lg-10 col-lg-push-2 col-lg-12");
|
||||
$("#navigation").toggleClass("col-sidebar-left");
|
||||
$(".toggle-sidebar").toggleClass("glyphicon-chevron-right glyphicon-chevron-left");
|
||||
$(".brand-logo").css("display", "none");
|
||||
$(".brand-icon").css("display", "inline-block");
|
||||
$("#navigation.page-side.col-xs-12.col-sm-3.col-lg-2.hidden-xs").css("width", "");
|
||||
} else if (((win.width() <= 768) && $("#navigation").not("col-sidebar-left"))
|
||||
|| ((win.width() >= 768) && $("#navigation").hasClass("col-sidebar-left"))) {
|
||||
$(".brand-logo").css("display", "none");
|
||||
$(".brand-icon").css("display", "inline-block"); }
|
||||
else if ((win.width() >= 768) && $("#navigation").not("col-sidebar-left")){
|
||||
$("#navigation").addClass("in");
|
||||
$(".brand-icon").css("display", "none");
|
||||
$(".brand-logo").css("display", "inline-block");
|
||||
}
|
||||
});
|
||||
// only show toggle button when style is loaded
|
||||
$(".toggle-sidebar").show();
|
||||
}
|
||||
});
|
||||
@ -62,6 +62,7 @@ if($need_alert_display == true) {
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
</div>
|
||||
<button class="toggle-sidebar glyphicon glyphicon-chevron-left" style="display:none"></button>
|
||||
<div class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li id="menu_messages"><?= get_menu_messages() ?></li>
|
||||
|
||||
@ -116,6 +116,9 @@ $pagetitle .= html_safe(sprintf(' | %s.%s', $config['system']['hostname'], $conf
|
||||
<!-- opnsense non legacy helper functions -->
|
||||
<script src="/ui/js/opnsense.js"></script>
|
||||
|
||||
<!-- opnsense non legacy theme support functions -->
|
||||
<script src="/ui/js/opnsense_theme.js"></script>
|
||||
|
||||
<!-- Bootstrap type ahead -->
|
||||
<script src="/ui/js/bootstrap3-typeahead.min.js"></script>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user