Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix codebase due to dependencies update

Browse Source
This commit is contained in:
printempw 2018-02-23 11:30:36 +08:00
parent 9ec6477ef5
commit 2d43a05a54
7 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/helpers.php
View File

@ -165,14 +165,19 @@ if (! function_exists('bs_menu')) {
}
}
$content .= $active ? '<li class="active">' : '<li>';
$classes = [];
$active ? ($classes[] = 'active') : null;
isset($value['children']) ? ($classes[] = 'treeview') : null;
$content .= sprintf('<li class="%s">', implode(' ', $classes));
if (isset($value['children'])) {
$content .= '<a href="#"><i class="fa '.$value['icon'].'"></i> <span>'.trans($value['title']).'</span><span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a>';
$content .= sprintf('<a href="#"><i class="fa %s"></i> <span>%s</span><span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a>', $value['icon'], trans($value['title']));
// recurse
$content .= '<ul class="treeview-menu" style="display: none;">'.bs_menu_render($value['children']).'</ul>';
} else {
$content .= '<a href="'.url($value['link']).'"><i class="fa '.$value['icon'].'"></i> <span>'.trans($value['title']).'</span></a>';
$content .= sprintf('<a href="%s"><i class="fa %s"></i> <span>%s</span></a>', url($value['link']), $value['icon'], trans($value['title']));
}
$content .= '</li>';

13
gulpfile.js
View File

@ -24,10 +24,8 @@ var distPath = 'resources/assets/dist';
var vendorScripts = [
'jquery/dist/jquery.min.js',
'bootstrap/dist/js/bootstrap.min.js',
'admin-lte/dist/js/app.min.js',
'admin-lte/dist/js/adminlte.min.js',
'bootstrap-fileinput/js/fileinput.min.js',
'admin-lte/plugins/datatables/jquery.dataTables.min.js',
'admin-lte/plugins/datatables/dataTables.bootstrap.min.js',
'icheck/icheck.min.js',
'toastr/build/toastr.min.js',
'es6-promise/dist/es6-promise.auto.min.js',
@ -37,13 +35,15 @@ var vendorScripts = [
var vendorScriptsToBeMinified = [
'regenerator-runtime/runtime.js',
'datatables.net/js/jquery.dataTables.js',
'datatables.net-bs/js/dataTables.bootstrap.js',
'resources/assets/dist/js/common.js',
];
var vendorStyles = [
'bootstrap/dist/css/bootstrap.min.css',
'admin-lte/dist/css/AdminLTE.min.css',
'admin-lte/plugins/datatables/dataTables.bootstrap.css',
'datatables.net-bs/css/dataTables.bootstrap.css',
'bootstrap-fileinput/css/fileinput.min.css',
'font-awesome/css/font-awesome.min.css',
'icheck/skins/square/blue.css',
@ -56,12 +56,9 @@ var styleReplacements = [
['blue@2x.png', '"../images/blue@2x.png"'],
['../img/loading.gif', '"../images/loading.gif"'],
['../img/loading-sm.gif', '"../images/loading-sm.gif"'],
[/@import url\((.*)italic\);/g, ''],
];
var scriptReplacements = [
['$.AdminLTE.layout.activate(),', '']
];
var scriptReplacements = [];
var fonts = [
'font-awesome/fonts/**',

11
resources/assets/src/js/common/layout.js
View File

@ -11,11 +11,7 @@ $.defaultPaginatorConfig = {
wrapper: '<ul class="pagination pagination-sm no-margin"></ul>'
};
$(window).resize(activateLayout);
$(document).ready(() => {
activateLayout();
$('li.active > ul').show();
$('input').iCheck({
@ -28,10 +24,3 @@ $(document).ready(() => {
cancelButtonText: trans('general.cancel')
});
});
function activateLayout() {
if (location.pathname === '/' || location.pathname.includes('auth'))
return;
$.AdminLTE.layout.activate();
}

4
resources/assets/src/sass/index.scss
View File

@ -4,7 +4,7 @@ body {
font-size: 16px;
}
.layout-top-nav > .wrapper {
.layout-top-nav > .hp-wrapper {
background-color: #eaeaea;
// background image settings
background-size: cover;
@ -229,7 +229,7 @@ hr {
padding: 0;
}
.wrapper {
.hp-wrapper {
width: 100%;
}

2
resources/views/admin/master.tpl
View File

@ -32,7 +32,7 @@
<!-- Header Navbar -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<span class="sr-only">Toggle navigation</span>
</a>
<!-- Navbar Right Menu -->

8
resources/views/index.tpl
View File

@ -13,7 +13,7 @@
<body class="hold-transition {{ option('color_scheme') }} layout-top-nav">
<div class="wrapper" style="background-image: url('{{ $home_pic_url }}');">
<div class="hp-wrapper" style="background-image: url('{{ $home_pic_url }}');">
<!-- Navigation -->
<header class="main-header transparent">
<nav class="navbar navbar-fixed-top">
@ -133,14 +133,14 @@
var bottom = btn.offset().top + btn.height() + 80;
if (bottom > $(window).height()) {
$('.wrapper').height(bottom + 'px');
$('.hp-wrapper').height(bottom + 'px');
} else {
$('.wrapper').height($(window).height() + 'px');
$('.hp-wrapper').height($(window).height() + 'px');
}
}
function changeHeaderTransparency() {
if (document.body.scrollTop >= ($(window).height() * 2 / 3)) {
if ($(window).scrollTop() >= ($(window).height() * 2 / 3)) {
$('.main-header').removeClass('transparent');
} else {
$('.main-header').addClass('transparent');

4
resources/views/user/master.tpl
View File

@ -30,7 +30,7 @@
<!-- Header Navbar -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<span class="sr-only">Toggle navigation</span>
</a>
<!-- Navbar Right Menu -->
@ -61,7 +61,7 @@
</div>
<!-- Sidebar Menu -->
<ul class="sidebar-menu">
<ul class="sidebar-menu" data-widget="tree">
<li class="header">{{ trans('general.user-center') }}</li>
{!! bs_menu('user') !!}