From 043bb380f2f418c29b833e6f761fbaae13dfd845 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Sun, 16 Apr 2017 23:00:29 +0800
Subject: [PATCH] 修复后台菜单显示的BUG 修复前台Layout的样式引用错误 添加后台首页的统计
---
application/admin/view/index/index.html | 11 +++++++++++
application/admin/view/index/login.html | 1 +
application/index/view/demo/index.html | 31 ++-----------------------------
application/index/view/layout/bootstrap.html | 6 +++---
application/index/view/layout/user.html | 13 ++++++-------
public/assets/js/adminlte.js | 4 +++-
6 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index 756c7f6..193efb9 100644
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -2,6 +2,17 @@
<html lang="en">
<head>
{include file="common/meta" /}
+
+ <script>
+ //此处为FastAdmin的统计代码,正式使用请移除
+ var _hmt = _hmt || [];
+ (function () {
+ var hm = document.createElement("script");
+ hm.src = "https://hm.baidu.com/hm.js?58347d769d009bcf6074e9a0ab7ba05e";
+ var s = document.getElementsByTagName("script")[0];
+ s.parentNode.insertBefore(hm, s);
+ })();
+ </script>
</head>
<body class="hold-transition skin-green sidebar-mini fixed" id="tabs">
<div class="wrapper">
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html
index 5ee6615..a2745e8 100644
--- a/application/admin/view/index/login.html
+++ b/application/admin/view/index/login.html
@@ -50,6 +50,7 @@
</style>
<script>
+ //此处为FastAdmin的统计代码,正式使用请移除
var _hmt = _hmt || [];
(function () {
var hm = document.createElement("script");
diff --git a/application/index/view/demo/index.html b/application/index/view/demo/index.html
index 788eb4a..d6fd440 100644
--- a/application/index/view/demo/index.html
+++ b/application/index/view/demo/index.html
@@ -1,34 +1,7 @@
<div class="container">
<div class="row">
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <img data-src="holder.js/100%x200" alt="100%x200" style="height: 200px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQyIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDI0MiAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MjAwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YjY5YzQgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMnB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliNjljNCI+PHJlY3Qgd2lkdGg9IjI0MiIgaGVpZ2h0PSIyMDAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI4OS44NTkzNzUiIHk9IjEwNS4xIj4yNDJ4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
- <div class="caption">
- <h3>Thumbnail label</h3>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
- </div>
- </div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <img data-src="holder.js/100%x200" alt="100%x200" style="height: 200px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQyIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDI0MiAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MjAwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YjY5YzQgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMnB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliNjljNCI+PHJlY3Qgd2lkdGg9IjI0MiIgaGVpZ2h0PSIyMDAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI4OS44NTkzNzUiIHk9IjEwNS4xIj4yNDJ4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
- <div class="caption">
- <h3>Thumbnail label</h3>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
- </div>
- </div>
- </div>
- <div class="col-sm-6 col-md-4">
- <div class="thumbnail">
- <img data-src="holder.js/100%x200" alt="100%x200" style="height: 200px; width: 100%; display: block;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjQyIiBoZWlnaHQ9IjIwMCIgdmlld0JveD0iMCAwIDI0MiAyMDAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MjAwCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTUxZDg5YjY5YzQgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxMnB0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNTFkODliNjljNCI+PHJlY3Qgd2lkdGg9IjI0MiIgaGVpZ2h0PSIyMDAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI4OS44NTkzNzUiIHk9IjEwNS4xIj4yNDJ4MjAwPC90ZXh0PjwvZz48L2c+PC9zdmc+" data-holder-rendered="true">
- <div class="caption">
- <h3>Thumbnail label</h3>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
- <p><a href="#" class="btn btn-primary" role="button">Button</a> <a href="#" class="btn btn-default" role="button">Button</a></p>
- </div>
- </div>
+ <div class="col-sm-12">
+ Demo
</div>
</div>
</div>
\ No newline at end of file
diff --git a/application/index/view/layout/bootstrap.html b/application/index/view/layout/bootstrap.html
index 8ed7078..76da81f 100644
--- a/application/index/view/layout/bootstrap.html
+++ b/application/index/view/layout/bootstrap.html
@@ -11,8 +11,8 @@
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
- <script src="assets/js/html5shiv.js"></script>
- <script src="assets/js/respond.min.js"></script>
+ <script src="__CDN__/assets/js/html5shiv.js"></script>
+ <script src="__CDN__/assets/js/respond.min.js"></script>
<![endif]-->
<script type="text/javascript">
var require = {
@@ -40,7 +40,7 @@
<div class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header pull-left">
- <a href="/" class="navbar-brand">FastAdmin</a>
+ <a href="{:url('/')}" class="navbar-brand">FastAdmin</a>
</div>
<ul class="nav navbar-nav pull-right">
<li class="dropdown">
diff --git a/application/index/view/layout/user.html b/application/index/view/layout/user.html
index 91f13cc..92731d4 100644
--- a/application/index/view/layout/user.html
+++ b/application/index/view/layout/user.html
@@ -3,17 +3,16 @@
<title>会员注册</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link href="/assets/css/bootstrap.min.css" rel="stylesheet" />
- <link href="/assets/css/fastadmin.min.css" rel="stylesheet" />
- <link href="/assets/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
- <link href="/assets/css/tips.min.css" rel="stylesheet" />
+ <link href="__CDN__/assets/css/bootstrap.min.css" rel="stylesheet" />
+ <link href="__CDN__/assets/css/fastadmin.min.css" rel="stylesheet" />
+ <link href="__CDN__/assets/libs/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
- <link rel="shortcut icon" href="/assets/img/favicon.ico" />
+ <link rel="shortcut icon" href="__CDN__/assets/img/favicon.ico" />
<!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
<!--[if lt IE 9]>
- <script src="/assets/js/html5shiv.js"></script>
- <script src="/assets/js/respond.min.js"></script>
+ <script src="__CDN__/assets/js/html5shiv.js"></script>
+ <script src="__CDN__/assets/js/respond.min.js"></script>
<![endif]-->
</head>
<body>
diff --git a/public/assets/js/adminlte.js b/public/assets/js/adminlte.js
index 76eeda8..94e1f53 100644
--- a/public/assets/js/adminlte.js
+++ b/public/assets/js/adminlte.js
@@ -430,7 +430,9 @@ function _init() {
if (!$this.parent().hasClass("active")) {
$this.parent().addClass("active");
}
- $this.parent().siblings().find("ul.menu-open").slideUp();
+ if ($(".show-submenu", menu).size() == 0) {
+ $this.parent().siblings().find("ul.menu-open").slideUp();
+ }
}
//if this isn't a link, prevent the page from being redirected
if (checkElement.is('.treeview-menu')) {
--
libgit2 0.24.0