updated jquery, cleaned code, still collapsing issue
This commit is contained in:
Messerbill
parent
7158ddda3b
commit
d730c6cdd3
@ -38,7 +38,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
|
||||
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOGIN);
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/register.tpl'), $vars);}
|
||||
|
||||
public static function html_li_menu(){return '</ul><ul class="nav pull-right"><li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '${sai_menu_logout}' : '${sai_menu_login}').'</a></li>';}
|
||||
public static function html_li_menu(){return '<li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '${sai_menu_logout}' : '${sai_menu_login}').'</a></li>';}
|
||||
public static function right_public(){return true;}
|
||||
public static function right_right(){return true;}
|
||||
|
||||
|
||||
@ -13,10 +13,10 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
|
||||
public static function css(){
|
||||
return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/css/saistart_sys_sai.css'));}
|
||||
public static function js(){
|
||||
return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'),
|
||||
\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/js/saistart_sys_sai.js'),
|
||||
return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/js/saistart_sys_sai.js'),
|
||||
\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.md5.js'),
|
||||
\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js'));
|
||||
\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js'),
|
||||
\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'));
|
||||
}
|
||||
|
||||
protected static function html_content(){
|
||||
|
||||
@ -3,23 +3,23 @@
|
||||
<h3 class="muted">${sai_start_welcome}</h3>
|
||||
<h4 class="text-info">${sai_start_welcome_description}</h4>
|
||||
</div>
|
||||
<div class="clearfix">
|
||||
<div class="col-xs-3">
|
||||
<div class="clearfix row-same-height row-full-height">
|
||||
<div class="col-xs-3 col-xs-height col-full-height well">
|
||||
<h2 class="muted"><a href="#!config">${basic_project}</a></h2>
|
||||
<b>${basic_name}:</b> ${project_name}<br/>
|
||||
<b>${basic_URL}:</b> <a href="${project_url}" target="_blank">${project_url}</a><br/>
|
||||
<b>${basic_progress}:</b> ${project}%
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<div class="col-xs-3 col-xs-height col-full-height well">
|
||||
<h2 class="muted"><a href="#!log(stats)">${basic_analytics}</a></h2>
|
||||
${analytics}
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<div class="col-xs-3 col-xs-height col-full-height well">
|
||||
<h2 class="muted">Git</h2>
|
||||
<b>Current Project Version:</b> ${git_project}<br/>
|
||||
<b>Current SYSTEM Version:</b> ${git_system}
|
||||
</div>
|
||||
<div class="col-xs-3">
|
||||
<div class="col-xs-3 col-xs-height col-full-height well">
|
||||
<h2 class="muted"><a href="#!login">${basic_logout}</a></h2>
|
||||
<table class="table table-hover table-condensed">
|
||||
<tr>
|
||||
|
||||
@ -1,21 +1,3 @@
|
||||
#sai_logo {
|
||||
padding-left: 10px;
|
||||
float: left;
|
||||
padding-top: 8px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
#sai_brand{
|
||||
width: 170px;
|
||||
}
|
||||
|
||||
.sai_wrapper {
|
||||
margin-top: 50px;
|
||||
}
|
||||
|
||||
#sai_navbar{
|
||||
height:40px;
|
||||
}
|
||||
|
||||
#project_navbar{
|
||||
/* width:224px;*/
|
||||
/* position: fixed;*/
|
||||
@ -34,7 +16,6 @@
|
||||
color: #777;
|
||||
}
|
||||
|
||||
|
||||
.carousel-img{
|
||||
width: 1200px;
|
||||
height: 650px;
|
||||
@ -50,4 +31,73 @@
|
||||
.sai_p_modules:active {
|
||||
border-right: 3px solid #1C569C;
|
||||
border-left: 0;
|
||||
}
|
||||
|
||||
.well {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
/* columns of same height styles */
|
||||
|
||||
.row-full-height {
|
||||
height: 100%;
|
||||
}
|
||||
.col-full-height {
|
||||
height: 100%;
|
||||
}
|
||||
.row-same-height {
|
||||
display: table;
|
||||
width: 100%;
|
||||
/* fix overflow */
|
||||
table-layout: fixed;
|
||||
}
|
||||
.col-xs-height {
|
||||
display: table-cell;
|
||||
float: none !important;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.col-sm-height {
|
||||
display: table-cell;
|
||||
float: none !important;
|
||||
}
|
||||
}
|
||||
@media (min-width: 992px) {
|
||||
.col-md-height {
|
||||
display: table-cell;
|
||||
float: none !important;
|
||||
}
|
||||
}
|
||||
@media (min-width: 1200px) {
|
||||
.col-lg-height {
|
||||
display: table-cell;
|
||||
float: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* auto collapsing navbar */
|
||||
|
||||
#sys_autocollapse.collapsed .navbar-header {
|
||||
float: none;
|
||||
}
|
||||
#sys_autocollapse.collapsed .navbar-toggle {
|
||||
display: block;
|
||||
}
|
||||
#sys_autocollapse.collapsed .navbar-collapse {
|
||||
border-top: 1px solid transparent;
|
||||
box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
|
||||
}
|
||||
#sys_autocollapse.collapsed .navbar-collapse.collapse {
|
||||
display: none!important;
|
||||
}
|
||||
#sys_autocollapse.collapsed .navbar-nav {
|
||||
float: none!important;
|
||||
margin: 7.5px -15px;
|
||||
}
|
||||
#sys_autocollapse.collapsed .navbar-nav>li {
|
||||
float: none;
|
||||
}
|
||||
#sys_autocollapse.collapsed .navbar-nav>li>a {
|
||||
padding-top: 10px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
@ -10,7 +10,9 @@ $(document).ready(function() {
|
||||
|
||||
$('.brand').click(function(){
|
||||
location.reload();
|
||||
});
|
||||
});
|
||||
$(document).on('ready', autocollapse);
|
||||
$(window).on('resize', autocollapse);
|
||||
});
|
||||
|
||||
function sys_hashchange(state){
|
||||
@ -20,4 +22,11 @@ function sys_hashchange(state){
|
||||
$('#menu_'+state).parent().addClass('active');
|
||||
} else {
|
||||
$('#menu_start').parent().addClass('active');}
|
||||
}
|
||||
|
||||
function autocollapse() {
|
||||
var navbar = $('#sys_autocollapse');
|
||||
navbar.removeClass('collapsed'); // set standart view
|
||||
if(navbar.innerHeight() > 50) // check if we've got 2 lines
|
||||
navbar.addClass('collapsed'); // force collapse mode
|
||||
}
|
||||
@ -9,19 +9,23 @@
|
||||
${js}
|
||||
</head>
|
||||
<body>
|
||||
<div class="navbar navbar-default navbar-fixed-top">
|
||||
<div class="navbar-inner">
|
||||
<ul class="nav navbar-nav">
|
||||
<a id="sai_logo" class="brand-logo" href="#!start">
|
||||
<img src="./sai.php?call=files&cat=saistart_sys_sai&id=logo.png" height="24" width="24"/>
|
||||
</a>
|
||||
<a id="sai_brand" class="navbar-brand" >SAI</a>
|
||||
${menu_start}
|
||||
${menu_sys}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<nav id="sys_autocollapse" class="navbar navbar-default" role="navigation">
|
||||
<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>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a id="sai_brand" class="navbar-brand" href="#!start">SAI</a>
|
||||
</div>
|
||||
<div id="navbar-collapse-1" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
${menu_start}
|
||||
${menu_sys}
|
||||
</ul>
|
||||
</div><!-- /.navbar-collapse -->
|
||||
</nav>
|
||||
<div class="sai_wrapper">
|
||||
<div class="container-fluid">
|
||||
<div class="clearfix">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user