diff --git a/sai/page/default_page.php b/sai/page/default_page.php index a18b917..620385a 100644 --- a/sai/page/default_page.php +++ b/sai/page/default_page.php @@ -39,9 +39,7 @@ class default_page extends \SYSTEM\PAGE\Page { private static function js(){ $result = ''. - ''. ''. - ''. ''. ''. ''. diff --git a/sai/page/js/libs/bootstrap.min.js b/sai/page/js/libs/_bootstrap.min.js similarity index 100% rename from sai/page/js/libs/bootstrap.min.js rename to sai/page/js/libs/_bootstrap.min.js diff --git a/sai/page/js/sai.js b/sai/page/js/sai.js index b271931..7f481d1 100644 --- a/sai/page/js/sai.js +++ b/sai/page/js/sai.js @@ -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 diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl index 316c2ad..9fbb9f2 100644 --- a/sai/page/tpl/sai.tpl +++ b/sai/page/tpl/sai.tpl @@ -12,8 +12,7 @@