From 6e54c31df658795ec830fc93a26cd6e3d910e2ef Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Fri, 20 Apr 2018 10:29:45 +0800
Subject: [PATCH] 修正函数方法参数
---
application/modules/Admin/views/layout/adminLayout.phtml | 239 +++--------------------------------------------------------
1 files changed, 12 insertions(+), 227 deletions(-)
diff --git a/application/modules/Admin/views/layout/adminLayout.phtml b/application/modules/Admin/views/layout/adminLayout.phtml
index f37fb10..c0098cc 100644
--- a/application/modules/Admin/views/layout/adminLayout.phtml
+++ b/application/modules/Admin/views/layout/adminLayout.phtml
@@ -32,6 +32,7 @@
<script src="/themes/AdminLTE/plugins/jQuery/jquery-3.1.1.min.js"></script>
<script src="/themes/AdminLTE/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="/themes/AdminLTE/plugins/datatables/dataTables.bootstrap.min.js"></script>
+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
@@ -46,9 +47,9 @@
<!-- Logo -->
<a href="index2.html" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels -->
- <span class="logo-mini"><b>A</b>LT</span>
+ <span class="logo-mini">���������</span>
<!-- logo for regular state and mobile devices -->
- <span class="logo-lg"><b>Admin</b>LTE</span>
+ <span class="logo-lg">���������������������������</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top">
@@ -59,240 +60,26 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
- <!-- Messages: style can be found in dropdown.less-->
- <li class="dropdown messages-menu">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <i class="fa fa-envelope-o"></i>
- <span class="label label-success">4</span>
- </a>
- <ul class="dropdown-menu">
- <li class="header">You have 4 messages</li>
- <li>
- <!-- inner menu: contains the actual data -->
- <ul class="menu">
- <li><!-- start message -->
- <a href="#">
- <div class="pull-left">
- <img src="/themes/AdminLTE/dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
- </div>
- <h4>
- Support Team
- <small><i class="fa fa-clock-o"></i> 5 mins</small>
- </h4>
- <p>Why not buy a new awesome theme?</p>
- </a>
- </li>
- <!-- end message -->
- <li>
- <a href="#">
- <div class="pull-left">
- <img src="/themes/AdminLTE/dist/img/user3-128x128.jpg" class="img-circle" alt="User Image">
- </div>
- <h4>
- AdminLTE Design Team
- <small><i class="fa fa-clock-o"></i> 2 hours</small>
- </h4>
- <p>Why not buy a new awesome theme?</p>
- </a>
- </li>
- <li>
- <a href="#">
- <div class="pull-left">
- <img src="/themes/AdminLTE/dist/img/user4-128x128.jpg" class="img-circle" alt="User Image">
- </div>
- <h4>
- Developers
- <small><i class="fa fa-clock-o"></i> Today</small>
- </h4>
- <p>Why not buy a new awesome theme?</p>
- </a>
- </li>
- <li>
- <a href="#">
- <div class="pull-left">
- <img src="/themes/AdminLTE/dist/img/user3-128x128.jpg" class="img-circle" alt="User Image">
- </div>
- <h4>
- Sales Department
- <small><i class="fa fa-clock-o"></i> Yesterday</small>
- </h4>
- <p>Why not buy a new awesome theme?</p>
- </a>
- </li>
- <li>
- <a href="#">
- <div class="pull-left">
- <img src="/themes/AdminLTE/dist/img/user4-128x128.jpg" class="img-circle" alt="User Image">
- </div>
- <h4>
- Reviewers
- <small><i class="fa fa-clock-o"></i> 2 days</small>
- </h4>
- <p>Why not buy a new awesome theme?</p>
- </a>
- </li>
- </ul>
- </li>
- <li class="footer"><a href="#">See All Messages</a></li>
- </ul>
- </li>
- <!-- Notifications: style can be found in dropdown.less -->
- <li class="dropdown notifications-menu">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <i class="fa fa-bell-o"></i>
- <span class="label label-warning">10</span>
- </a>
- <ul class="dropdown-menu">
- <li class="header">You have 10 notifications</li>
- <li>
- <!-- inner menu: contains the actual data -->
- <ul class="menu">
- <li>
- <a href="#">
- <i class="fa fa-users text-aqua"></i> 5 new members joined today
- </a>
- </li>
- <li>
- <a href="#">
- <i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the
- page and may cause design problems
- </a>
- </li>
- <li>
- <a href="#">
- <i class="fa fa-users text-red"></i> 5 new members joined
- </a>
- </li>
- <li>
- <a href="#">
- <i class="fa fa-shopping-cart text-green"></i> 25 sales made
- </a>
- </li>
- <li>
- <a href="#">
- <i class="fa fa-user text-red"></i> You changed your username
- </a>
- </li>
- </ul>
- </li>
- <li class="footer"><a href="#">View all</a></li>
- </ul>
- </li>
- <!-- Tasks: style can be found in dropdown.less -->
- <li class="dropdown tasks-menu">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <i class="fa fa-flag-o"></i>
- <span class="label label-danger">9</span>
- </a>
- <ul class="dropdown-menu">
- <li class="header">You have 9 tasks</li>
- <li>
- <!-- inner menu: contains the actual data -->
- <ul class="menu">
- <li><!-- Task item -->
- <a href="#">
- <h3>
- Design some buttons
- <small class="pull-right">20%</small>
- </h3>
- <div class="progress xs">
- <div class="progress-bar progress-bar-aqua" style="width: 20%" role="progressbar"
- aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
- <span class="sr-only">20% Complete</span>
- </div>
- </div>
- </a>
- </li>
- <!-- end task item -->
- <li><!-- Task item -->
- <a href="#">
- <h3>
- Create a nice theme
- <small class="pull-right">40%</small>
- </h3>
- <div class="progress xs">
- <div class="progress-bar progress-bar-green" style="width: 40%" role="progressbar"
- aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
- <span class="sr-only">40% Complete</span>
- </div>
- </div>
- </a>
- </li>
- <!-- end task item -->
- <li><!-- Task item -->
- <a href="#">
- <h3>
- Some task I need to do
- <small class="pull-right">60%</small>
- </h3>
- <div class="progress xs">
- <div class="progress-bar progress-bar-red" style="width: 60%" role="progressbar"
- aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
- <span class="sr-only">60% Complete</span>
- </div>
- </div>
- </a>
- </li>
- <!-- end task item -->
- <li><!-- Task item -->
- <a href="#">
- <h3>
- Make beautiful transitions
- <small class="pull-right">80%</small>
- </h3>
- <div class="progress xs">
- <div class="progress-bar progress-bar-yellow" style="width: 80%" role="progressbar"
- aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
- <span class="sr-only">80% Complete</span>
- </div>
- </div>
- </a>
- </li>
- <!-- end task item -->
- </ul>
- </li>
- <li class="footer">
- <a href="#">View all tasks</a>
- </li>
- </ul>
- </li>
+
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <img src="/themes/AdminLTE/dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
+ <img src="/themes/AdminLTE/dist/img/avatar.jpg" class="user-image" alt="User Image">
<?php $session = Yaf_Session::getInstance();?>
<span class="hidden-xs"><?php echo $session['user']['nickname']?></span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
- <img src="/themes/AdminLTE/dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
+ <img src="/themes/AdminLTE/dist/img/avatar.jpg" class="img-circle" alt="User Image">
<p>
<?php echo $session['user']['nickname']?> - <?php echo $session['user']['role_name']?>
- <small>Member since Nov. 2012</small>
</p>
</li>
<!-- Menu Body -->
- <li class="user-body">
- <div class="row">
- <div class="col-xs-4 text-center">
- <a href="#">Followers</a>
- </div>
- <div class="col-xs-4 text-center">
- <a href="#">Sales</a>
- </div>
- <div class="col-xs-4 text-center">
- <a href="#">Friends</a>
- </div>
- </div>
- <!-- /.row -->
- </li>
<!-- Menu Footer-->
<li class="user-footer">
- <div class="pull-left">
- <a href="#" class="btn btn-default btn-flat">Profile</a>
- </div>
<div class="pull-right">
<a href="/public/user/logout" class="btn btn-default btn-flat">������������</a>
</div>
@@ -300,9 +87,6 @@
</ul>
</li>
<!-- Control Sidebar Toggle Button -->
- <li>
- <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
- </li>
</ul>
</div>
</nav>
@@ -336,7 +120,7 @@
<?php $s_html = '';?>
<?php if(isset($second_modules[$pid])):?>
<?php foreach ($second_modules[$pid] as $s_module):?>
- <?php if(isset($is_active_class) && in_array($s_module['_id'], $current_role_auth)):?>
+
<?php if($route['module'] == $s_module['module'] && $route['controller'] == $s_module['controller'] && $route['action'] == $s_module['action']):?>
<?php $is_active_class = 'active';?>
<?php $s_html .= "
@@ -345,9 +129,10 @@
<?php $s_html .= "
<li ><a href='/{$s_module['module']}/{$s_module['controller']}/{$s_module['action']}'><i class='fa fa-circle-o'></i> {$s_module['name']}</a></li>";
?>
- <?php endif;?>
+
<?php endif;?>
<?php endforeach;?>
+ <?php endif;?>
<li class="<?php echo $is_active_class; ?> treeview">
<a href="#">
<i class="fa fa-th"></i> <span><?php echo $f_module['name']?></span>
@@ -361,7 +146,7 @@
</li>
<?php if(!empty($is_active_class)):?>
<?php unset($is_active_class);?>
- <?php endif;?>
+
<?php endif;?>
<?php endif;?>
<?php endforeach;?>
@@ -380,9 +165,9 @@
<!-- /.content-wrapper -->
<footer class="main-footer">
<div class="pull-right hidden-xs">
- <b>Version</b> 2.4.0
+ <b>Version</b> 1.0.0
</div>
- <strong>Copyright © 2014-2016 <a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights
+ <strong>Copyright © 2016-2017 <a href="#">���������</a>.</strong> All rights
reserved.
</footer>
--
Gitblit v1.8.0