diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php
index 4e7d056..a6c666a 100644
--- a/sai/modules/saimod_sys_login/saimod_sys_login.php
+++ b/sai/modules/saimod_sys_login/saimod_sys_login.php
@@ -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 '
';}
+ public static function html_li_menu(){return '';}
public static function right_public(){return true;}
public static function right_right(){return true;}
diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
index e310a4c..c9d1c97 100644
--- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php
+++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
@@ -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(){
diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
index 7c51538..9f88174 100644
--- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
+++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl
@@ -3,23 +3,23 @@
${sai_start_welcome}
${sai_start_welcome_description}
-
-
+
+
${basic_name}: ${project_name}
${basic_URL}: ${project_url}
${basic_progress}: ${project}%
-
+
-
+
Git
Current Project Version: ${git_project}
Current SYSTEM Version: ${git_system}
-
+
diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css
index 49e4acd..fade40d 100644
--- a/sai/page/css/sai.css
+++ b/sai/page/css/sai.css
@@ -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;
}
\ No newline at end of file
diff --git a/sai/page/js/libs/jquery.min.js b/sai/page/js/libs/_jquery.min.js
similarity index 100%
rename from sai/page/js/libs/jquery.min.js
rename to sai/page/js/libs/_jquery.min.js
diff --git a/sai/page/js/sai.js b/sai/page/js/sai.js
index 4a48678..a14c79e 100644
--- a/sai/page/js/sai.js
+++ b/sai/page/js/sai.js
@@ -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
}
\ No newline at end of file
diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl
index ff68550..dc2025f 100644
--- a/sai/page/tpl/sai.tpl
+++ b/sai/page/tpl/sai.tpl
@@ -9,19 +9,23 @@
${js}
-
-
-
-
-
-
- SAI
- ${menu_start}
- ${menu_sys}
-
-
-
-
+