diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index b68ecae7..fe560fb3 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -32,7 +32,7 @@ class Index extends Backend */ public function index() { - $cookieArr = ['adminskin' => "/^skin\-([a-z\-]+)\$/i", 'multiplenav' => "/^(0|1)\$/", 'multipletab' => "/^(0|1)\$/", 'show_submenu' => "/^(0|1)\$/"]; + $cookieArr = ['adminskin' => "/^skin\-([a-z\-]+)\$/i", 'simplenav' => "/^(0|1)\$/", 'multiplenav' => "/^(0|1)\$/", 'multipletab' => "/^(0|1)\$/", 'show_submenu' => "/^(0|1)\$/"]; foreach ($cookieArr as $key => $regex) { $cookieValue = $this->request->cookie($key); if (!is_null($cookieValue) && preg_match($regex, $cookieValue)) { diff --git a/application/admin/lang/zh-cn/index.php b/application/admin/lang/zh-cn/index.php index dcb72058..fccb5d85 100644 --- a/application/admin/lang/zh-cn/index.php +++ b/application/admin/lang/zh-cn/index.php @@ -16,6 +16,8 @@ return [ 'Toggle between slide over content and push content effects' => '切换右侧操作栏覆盖或独占', 'Toggle Right Sidebar Skin' => '切换右侧操作栏背景', 'Toggle between dark and light skins for the right sidebar' => '将右侧操作栏背景亮色或深色切换', + 'Simple nav' => '简洁导航模式', + 'Simple nav tips' => '启用后顶部导航将不再显示,同时每次点击菜单都会刷新右侧内容', 'Multiple nav' => '多级菜单导航', 'Toggle the top menu state (multiple or single)' => '切换顶部菜单为多级菜单导航模式', 'Multiple tab' => '多选项卡', @@ -25,7 +27,6 @@ return [ 'Disable top menu badge' => '禁用顶部彩色小角标', 'Disable top menu badge without left menu' => '左边菜单栏的彩色小角标不受影响', 'Skins' => '皮肤', - 'Username must be 3 to 30 characters' => '用户名只能由3-30位数字、字母、下划线组合', 'Password must be 6 to 30 characters' => '密码长度必须在6-30位之间,不能包含空格', 'You\'ve logged in, do not login again' => '你已经登录,无需重复登录', 'Username or password can not be empty' => '用户名密码不能为空', diff --git a/application/admin/view/common/control.html b/application/admin/view/common/control.html index 69bc449b..89ef67b4 100644 --- a/application/admin/view/common/control.html +++ b/application/admin/view/common/control.html @@ -30,6 +30,7 @@

{:__('Layout Options')}

+

{:__("Simple nav tips")}

{:__("Toggle the top menu state (multiple or single)")}

{:__("Always show multiple tab when multiple nav is set")}

{:__("Toggle the left sidebar's state (open or collapse)")}

diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index 5344058b..4ee81395 100755 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -18,7 +18,9 @@