diff --git a/dist/js/app.js b/dist/js/app.js
index b81527ab0..f1c4acfc2 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -181,10 +181,14 @@ $.AdminLTE.layout = {
var sidebar_height = $(".main-sidebar, .left-side").height();
//Set the min-height of the content and sidebar based on the
//the height of the document.
- if (window_height >= sidebar_height) {
- $(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', window_height - neg);
+ if ($("body").hasClass("fixed")) {
+ $(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight());
} else {
- $(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', sidebar_height);
+ if (window_height >= sidebar_height) {
+ $(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', window_height - neg);
+ } else {
+ $(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', sidebar_height);
+ }
}
},
fixSidebar: function () {
@@ -194,7 +198,7 @@ $.AdminLTE.layout = {
$(".sidebar").slimScroll({destroy: true}).height("auto");
}
return;
- } else if(typeof $.fn.slimScroll == 'undefined' && console) {
+ } else if (typeof $.fn.slimScroll == 'undefined' && console) {
console.error("Error: the fixed layout requires the slimscroll plugin!");
}
//Enable slimscroll for fixed layout
diff --git a/dist/js/app.min.js b/dist/js/app.min.js
index 05a2f46e2..9609218b6 100644
--- a/dist/js/app.min.js
+++ b/dist/js/app.min.js
@@ -10,4 +10,4 @@
* @version 2.0
* @license MIT <http://opensource.org/licenses/MIT>
*/
-if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE=new Object,$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa fa-minus",open:"fa fa-plus",remove:"fa fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"}},$(function(){var a=$.AdminLTE.options;$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:"200px",alwaysVisible:!1,size:"3px"}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu(a.sidebarToggleSelector),a.enableBSToppltip&&$(a.BSTooltipSelector).tooltip(),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").click(function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".main-sidebar, .left-side").height();b>=c?$(".content-wrapper, .main-sidebar, .left-side, .right-side").css("min-height",b-a):$(".content-wrapper, .main-sidebar, .left-side, .right-side").css("min-height",c)},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&console&&console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu=function(a){$(a).click(function(a){a.preventDefault(),$("body").toggleClass("sidebar-collapse"),$("body").toggleClass("sidebar-open")})},$.AdminLTE.tree=function(a){$("li a",$(a)).click(function(a){var b=$(this),c=b.next();if(c.is(".treeview-menu")&&c.is(":visible"))c.slideUp("normal",function(){c.removeClass("menu-open")}),c.parent("li").removeClass("active");else if(c.is(".treeview-menu")&&!c.is(":visible")){var d=b.parents("ul").first(),e=d.find("ul:visible").slideUp("normal");e.removeClass("menu-open");var f=b.parent("li");c.slideDown("normal",function(){c.addClass("menu-open"),d.find("li.active").removeClass("active"),f.addClass("active")})}c.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.boxWidget={activate:function(){var a=$.AdminLTE.options,b=this;$(a.boxWidgetOptions.boxWidgetSelectors.collapse).click(function(a){a.preventDefault(),b.collapse($(this))}),$(a.boxWidgetOptions.boxWidgetSelectors.remove).click(function(a){a.preventDefault(),b.remove($(this))})},collapse:function(a){var b=a.parents(".box").first(),c=b.find(".box-body, .box-footer");b.hasClass("collapsed-box")?(a.children(".fa-plus").removeClass("fa-plus").addClass("fa-minus"),c.slideDown(300,function(){b.removeClass("collapsed-box")})):(a.children(".fa-minus").removeClass("fa-minus").addClass("fa-plus"),c.slideUp(300,function(){b.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp()},options:$.AdminLTE.options.boxWidgetOptions},function(a){a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(){},onLoadDone:function(){}},b),f=a('<div class="overlay"></div><div class="loading-img"></div>');return this.each(function(){if(""===e.source)return void(console&&console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.click(function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){a.fn.todolist=function(b){var c=a.extend({onCheck:function(){},onUncheck:function(){}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)})})}}(jQuery);
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("AdminLTE requires jQuery");$.AdminLTE=new Object,$.AdminLTE.options={navbarMenuSlimscroll:!0,navbarMenuSlimscrollWidth:"3px",navbarMenuHeight:"200px",sidebarToggleSelector:"[data-toggle='offcanvas']",sidebarPushMenu:!0,sidebarSlimScroll:!0,enableBoxRefresh:!0,enableBSToppltip:!0,BSTooltipSelector:"[data-toggle='tooltip']",enableBoxWidget:!0,boxWidgetOptions:{boxWidgetIcons:{collapse:"fa fa-minus",open:"fa fa-plus",remove:"fa fa-times"},boxWidgetSelectors:{remove:'[data-widget="remove"]',collapse:'[data-widget="collapse"]'}},colors:{lightBlue:"#3c8dbc",red:"#f56954",green:"#00a65a",aqua:"#00c0ef",yellow:"#f39c12",blue:"#0073b7",navy:"#001F3F",teal:"#39CCCC",olive:"#3D9970",lime:"#01FF70",orange:"#FF851B",fuchsia:"#F012BE",purple:"#8E24AA",maroon:"#D81B60",black:"#222222",gray:"#d2d6de"}},$(function(){var a=$.AdminLTE.options;$.AdminLTE.layout.activate(),$.AdminLTE.tree(".sidebar"),a.navbarMenuSlimscroll&&"undefined"!=typeof $.fn.slimscroll&&$(".navbar .menu").slimscroll({height:"200px",alwaysVisible:!1,size:"3px"}).css("width","100%"),a.sidebarPushMenu&&$.AdminLTE.pushMenu(a.sidebarToggleSelector),a.enableBSToppltip&&$(a.BSTooltipSelector).tooltip(),a.enableBoxWidget&&$.AdminLTE.boxWidget.activate(),$('.btn-group[data-toggle="btn-toggle"]').each(function(){var a=$(this);$(this).find(".btn").click(function(b){a.find(".btn.active").removeClass("active"),$(this).addClass("active"),b.preventDefault()})})}),$.AdminLTE.layout={activate:function(){var a=this;a.fix(),a.fixSidebar(),$(window,".wrapper").resize(function(){a.fix(),a.fixSidebar()})},fix:function(){var a=$(".main-header").outerHeight()+$(".main-footer").outerHeight(),b=$(window).height(),c=$(".main-sidebar, .left-side").height();$("body").hasClass("fixed")?$(".content-wrapper, .right-side").css("min-height",b-$(".main-footer").outerHeight()):b>=c?$(".content-wrapper, .main-sidebar, .left-side, .right-side").css("min-height",b-a):$(".content-wrapper, .main-sidebar, .left-side, .right-side").css("min-height",c)},fixSidebar:function(){return $("body").hasClass("fixed")?("undefined"==typeof $.fn.slimScroll&&console&&console.error("Error: the fixed layout requires the slimscroll plugin!"),void($.AdminLTE.options.sidebarSlimScroll&&"undefined"!=typeof $.fn.slimScroll&&($(".sidebar").slimScroll({destroy:!0}).height("auto"),$(".sidebar").slimscroll({height:$(window).height()-$(".main-header").height()+"px",color:"rgba(0,0,0,0.2)",size:"3px"})))):void("undefined"!=typeof $.fn.slimScroll&&$(".sidebar").slimScroll({destroy:!0}).height("auto"))}},$.AdminLTE.pushMenu=function(a){$(a).click(function(a){a.preventDefault(),$("body").toggleClass("sidebar-collapse"),$("body").toggleClass("sidebar-open")})},$.AdminLTE.tree=function(a){$("li a",$(a)).click(function(a){var b=$(this),c=b.next();if(c.is(".treeview-menu")&&c.is(":visible"))c.slideUp("normal",function(){c.removeClass("menu-open")}),c.parent("li").removeClass("active");else if(c.is(".treeview-menu")&&!c.is(":visible")){var d=b.parents("ul").first(),e=d.find("ul:visible").slideUp("normal");e.removeClass("menu-open");var f=b.parent("li");c.slideDown("normal",function(){c.addClass("menu-open"),d.find("li.active").removeClass("active"),f.addClass("active")})}c.is(".treeview-menu")&&a.preventDefault()})},$.AdminLTE.boxWidget={activate:function(){var a=$.AdminLTE.options,b=this;$(a.boxWidgetOptions.boxWidgetSelectors.collapse).click(function(a){a.preventDefault(),b.collapse($(this))}),$(a.boxWidgetOptions.boxWidgetSelectors.remove).click(function(a){a.preventDefault(),b.remove($(this))})},collapse:function(a){var b=a.parents(".box").first(),c=b.find(".box-body, .box-footer");b.hasClass("collapsed-box")?(a.children(".fa-plus").removeClass("fa-plus").addClass("fa-minus"),c.slideDown(300,function(){b.removeClass("collapsed-box")})):(a.children(".fa-minus").removeClass("fa-minus").addClass("fa-plus"),c.slideUp(300,function(){b.addClass("collapsed-box")}))},remove:function(a){var b=a.parents(".box").first();b.slideUp()},options:$.AdminLTE.options.boxWidgetOptions},function(a){a.fn.boxRefresh=function(b){function c(a){a.append(f),e.onLoadStart.call(a)}function d(a){a.find(f).remove(),e.onLoadDone.call(a)}var e=a.extend({trigger:".refresh-btn",source:"",onLoadStart:function(){},onLoadDone:function(){}},b),f=a('<div class="overlay"></div><div class="loading-img"></div>');return this.each(function(){if(""===e.source)return void(console&&console.log("Please specify a source first - boxRefresh()"));var b=a(this),f=b.find(e.trigger).first();f.click(function(a){a.preventDefault(),c(b),b.find(".box-body").load(e.source,function(){d(b)})})})}}(jQuery),function(a){a.fn.todolist=function(b){var c=a.extend({onCheck:function(){},onUncheck:function(){}},b);return this.each(function(){"undefined"!=typeof a.fn.iCheck?(a("input",this).on("ifChecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)}),a("input",this).on("ifUnchecked",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onUncheck.call(b)})):a("input",this).on("change",function(){var b=a(this).parents("li").first();b.toggleClass("done"),c.onCheck.call(b)})})}}(jQuery);
\ No newline at end of file
diff --git a/pages/layout/boxed.html b/pages/layout/boxed.html
index 15e661121..0552617f2 100644
--- a/pages/layout/boxed.html
+++ b/pages/layout/boxed.html
@@ -278,19 +278,19 @@
<small class="label pull-right bg-yellow">12</small>
</a>
</li>
- <li class="treeview active">
+ <li class="treeview">
<a href="#">
<i class="fa fa-folder"></i> <span>Examples</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
- <li><a href="invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
- <li><a href="login.html"><i class="fa fa-circle-o"></i> Login</a></li>
- <li><a href="register.html"><i class="fa fa-circle-o"></i> Register</a></li>
- <li><a href="lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
- <li><a href="404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
- <li><a href="500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
- <li><a href="blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
+ <li><a href="../examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
+ <li><a href="../examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
+ <li><a href="../examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
+ <li><a href="../examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
+ <li><a href="../examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
+ <li><a href="../examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
+ <li><a href="../examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
</ul>
</li>
<li class="treeview">
@@ -333,8 +333,8 @@
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
- Blank page
- <small>it all starts here</small>
+ Boxed Layout
+ <small>Blank example to the boxed layout</small>
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
diff --git a/pages/layout/fixed.html b/pages/layout/fixed.html
index a947b2cdc..6ded8a8fe 100644
--- a/pages/layout/fixed.html
+++ b/pages/layout/fixed.html
@@ -278,19 +278,19 @@
<small class="label pull-right bg-yellow">12</small>
</a>
</li>
- <li class="treeview active">
+ <li class="treeview">
<a href="#">
<i class="fa fa-folder"></i> <span>Examples</span>
<i class="fa fa-angle-left pull-right"></i>
</a>
<ul class="treeview-menu">
- <li><a href="invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
- <li><a href="login.html"><i class="fa fa-circle-o"></i> Login</a></li>
- <li><a href="register.html"><i class="fa fa-circle-o"></i> Register</a></li>
- <li><a href="lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
- <li><a href="404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
- <li><a href="500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
- <li><a href="blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
+ <li><a href="../examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
+ <li><a href="../examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
+ <li><a href="../examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
+ <li><a href="../examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
+ <li><a href="../examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
+ <li><a href="../examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
+ <li><a href="../examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
</ul>
</li>
<li class="treeview">
@@ -333,8 +333,8 @@
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
- Blank page
- <small>it all starts here</small>
+ Fixed Layout
+ <small>Blank example to the fixed layout</small>
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>