Home Explore Help
Sign In
githab
/
fastadmin
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修复后台菜单显示的BUG
修复前台Layout的样式引用错误
添加后台首页的统计

Karson 8 years ago
parent
72d94bbed1
commit
043bb380f2
6 changed files with 26 additions and 40 deletions
Unified View Show Diff Stats
  1. 11 0
      application/admin/view/index/index.html
  2. 1 0
      application/admin/view/index/login.html
  3. 2 29
      application/index/view/demo/index.html
  4. 3 3
      application/index/view/layout/bootstrap.html
  5. 6 7
      application/index/view/layout/user.html
  6. 3 1
      public/assets/js/adminlte.js

+ 11 - 0
application/admin/view/index/index.html
View File 

@@ -2,6 +2,17 @@
 
 <html lang="en">
 
 <html lang="en">
 
     <head>
 
     <head>
 
         {include file="common/meta" /}
 
         {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>
 
     </head>
 
     <body class="hold-transition skin-green sidebar-mini fixed" id="tabs">
 
     <body class="hold-transition skin-green sidebar-mini fixed" id="tabs">
 
         <div class="wrapper">
 
         <div class="wrapper">

+ 1 - 0
application/admin/view/index/login.html
View File 

@@ -50,6 +50,7 @@
 
 
 
         </style>
 
         </style>
 
         <script>
 
         <script>
 
+            //此处为FastAdmin的统计代码,正式使用请移除
 
             var _hmt = _hmt || [];
 
             var _hmt = _hmt || [];
 
             (function () {
 
             (function () {
 
                 var hm = document.createElement("script");
 
                 var hm = document.createElement("script");

File diff suppressed because it is too large
+ 2 - 29
application/index/view/demo/index.html


+ 3 - 3
application/index/view/layout/bootstrap.html
View File 

@@ -11,8 +11,8 @@
 
 
 
         <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 
         <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 
         <!--[if lt IE 9]>
 
         <!--[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]-->
 
         <![endif]-->
 
         <script type="text/javascript">
 
         <script type="text/javascript">
 
             var require = {
 
             var require = {
 
@@ -40,7 +40,7 @@
 
         <div class="navbar navbar-default navbar-fixed-top">
 
         <div class="navbar navbar-default navbar-fixed-top">
 
             <div class="container">
 
             <div class="container">
 
                 <div class="navbar-header pull-left">
 
                 <div class="navbar-header pull-left">
 
-                    <a href="/" class="navbar-brand">FastAdmin</a>
 
+                    <a href="{:url('/')}" class="navbar-brand">FastAdmin</a>
 
                 </div>
 
                 </div>
 
                 <ul class="nav navbar-nav pull-right">
 
                 <ul class="nav navbar-nav pull-right">
 
                     <li class="dropdown">
 
                     <li class="dropdown">

+ 6 - 7
application/index/view/layout/user.html
View File 

@@ -3,17 +3,16 @@
 
     <title>会员注册</title>
 
     <title>会员注册</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <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. -->
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements. All other JS at the end of file. -->
 
     <!--[if lt IE 9]>
 
     <!--[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]-->
 
     <![endif]-->
 
 </head>
 
 </head>
 
 <body>
 
 <body>

+ 3 - 1
public/assets/js/adminlte.js
View File 

@@ -430,7 +430,9 @@ function _init() {
 
                         if (!$this.parent().hasClass("active")) {
 
                         if (!$this.parent().hasClass("active")) {
 
                             $this.parent().addClass("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 this isn't a link, prevent the page from being redirected
 
                     if (checkElement.is('.treeview-menu')) {
 
                     if (checkElement.is('.treeview-menu')) {