From 0bb2b96f21ccb07012a0e44b68f77b9d4fab3fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Wed, 15 Feb 2017 16:19:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9F=BA=E7=A1=80=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Index.php | 1 + application/admin/view/index.index.html | 4 +- application/admin/view/index.main.html | 141 +++++++++--------- application/extra/view/admin.content.html | 13 ++ .../{admin.left.html => admin.main.left.html} | 0 .../{admin.top.html => admin.main.top.html} | 0 6 files changed, 84 insertions(+), 75 deletions(-) create mode 100644 application/extra/view/admin.content.html rename application/extra/view/{admin.left.html => admin.main.left.html} (100%) rename application/extra/view/{admin.top.html => admin.main.top.html} (100%) diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 059c81eda..e14617c02 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -58,6 +58,7 @@ class Index extends BasicAdmin { $version = Db::query('select version() as ver'); $version = array_pop($version); $this->assign('mysql_ver', $version['ver']); + $this->assign('title', '系统信息'); return view(); } diff --git a/application/admin/view/index.index.html b/application/admin/view/index.index.html index 5ef9b8e78..aed93d52a 100644 --- a/application/admin/view/index.index.html +++ b/application/admin/view/index.index.html @@ -1,9 +1,9 @@ {extend name="extra@admin/main" /} {block name='body'} -{include file="extra@admin/top"} +{include file="extra@admin/main.top"}
- <{include file="extra@admin/left"}> + <{include file="extra@admin/main.left"}>
{/block} \ No newline at end of file diff --git a/application/admin/view/index.main.html b/application/admin/view/index.main.html index a2dcd9454..a1d7a3729 100644 --- a/application/admin/view/index.main.html +++ b/application/admin/view/index.main.html @@ -1,75 +1,70 @@ -
- {if $title} -
-
{$title}
+{extend name='extra@admin/content' /} + +{block name="content"} +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
框架版本{$Think.const.THINK_VERSION}
系统类型{:php_uname('s')}
运行环境{:php_sapi_name()}
PHP版本{:phpversion()}
MySQL版本{$mysql_ver}
上传限制{:ini_get('upload_max_filesize')}
POST限制{:ini_get('post_max_size')}
- {/if} -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
框架版本{$Think.const.THINK_VERSION}
系统类型{:php_uname('s')}
运行环境{:php_sapi_name()}
PHP版本{:phpversion()}
MySQL版本{$mysql_ver}
上传限制{:ini_get('upload_max_filesize')}
POST限制{:ini_get('post_max_size')}
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
框架版本{$Think.const.THINK_VERSION}
系统类型{:php_uname('s')}
运行环境{:php_sapi_name()}
PHP版本{:phpversion()}
MySQL版本{$mysql_ver}
上传限制{:ini_get('upload_max_filesize')}
POST限制{:ini_get('post_max_size')}
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
框架版本{$Think.const.THINK_VERSION}
系统类型{:php_uname('s')}
运行环境{:php_sapi_name()}
PHP版本{:phpversion()}
MySQL版本{$mysql_ver}
上传限制{:ini_get('upload_max_filesize')}
POST限制{:ini_get('post_max_size')}
-
\ No newline at end of file +
+{/block} \ No newline at end of file diff --git a/application/extra/view/admin.content.html b/application/extra/view/admin.content.html new file mode 100644 index 000000000..1caabf094 --- /dev/null +++ b/application/extra/view/admin.content.html @@ -0,0 +1,13 @@ +{block name="contentTag"} +
+ {if isset($title)} +
+
{$title}
+
+ {/if} +
+ {block name="content"} + {/block} +
+
+{/block} \ No newline at end of file diff --git a/application/extra/view/admin.left.html b/application/extra/view/admin.main.left.html similarity index 100% rename from application/extra/view/admin.left.html rename to application/extra/view/admin.main.left.html diff --git a/application/extra/view/admin.top.html b/application/extra/view/admin.main.top.html similarity index 100% rename from application/extra/view/admin.top.html rename to application/extra/view/admin.main.top.html