webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

navbar still buggy...in collapsed mode only works on a very small viewing-width

Browse Source
This commit is contained in:
Messerbill 2015-05-23 14:58:57 +02:00
parent a83c647ed1
commit 919f2ab07d
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sai/page/default_page.php
View File

@ -39,9 +39,7 @@ class default_page extends \SYSTEM\PAGE\Page {
private static function js(){
$result = '<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/jquery.min.js').'" type="text/javascript"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/jquery.matchHeight.js').'" type="text/javascript"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/bootstrap.min.js').'" type="text/javascript"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/collapse.js').'" type="text/javascript"></script>'.
'<script type="text/javascript" language="JavaScript" src="./sai.php?call=files&amp;cat=sys&amp;id=system.js"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/sai.js').'" type="text/javascript"></script>'.
'<script src="https://www.google.com/jsapi" type="text/javascript"></script>'.

0
sai/page/js/libs/bootstrap.min.js → sai/page/js/libs/_bootstrap.min.js vendored
View File

15
sai/page/js/sai.js
View File

@ -1,19 +1,9 @@
$(document).ready(function() {
new SYSTEM('./sai.php',42,'start',sys_hashchange);
$('#sai_navbar ul li a, #project_navbar ul li a').click(function () {
$('#sai_navbar li, #project_navbar li').each(function(){
$(this).removeClass('active');});
$(this).parent().addClass('active');
system.reload($(this).attr('href'));
});
new SYSTEM('./sai.php',42,'start',sys_hashchange);
$('.brand').click(function(){
location.reload();
});
$(".navbar-toggle").click(function(){
$('#navbar-collapse-1').collapse('toggle');
});
$(document).on('ready', autocollapse);
//autocollapse();
$(window).on('resize', autocollapse);
});
@ -27,6 +17,7 @@ function sys_hashchange(state){
}
function autocollapse() {
$('.navbar-collapse').collapse('show');
var navbar = $('#sys_autocollapse');
navbar.removeClass('collapsed'); // set standart view
if(navbar.innerHeight() > 50) // check if we've got 2 lines

5
sai/page/tpl/sai.tpl
View File

@ -12,8 +12,7 @@
<nav id="sys_autocollapse" class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navHeaderCollapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@ -21,7 +20,7 @@
<a id="sai_brand" class="navbar-brand" href="#!start">SAI</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div id="navbar-collapse-1" class="collapse navbar-collapse">
<div class="collapse navbar-collapse navHeaderCollapse">
<ul class="nav navbar-nav">
${menu_start}
${menu_sys}