From 78d3d84af06f149de58aabaeac3af49fd74100a4 Mon Sep 17 00:00:00 2001
From: kaiend <kaiend@126.com>
Date: Tue, 30 Jan 2018 13:03:52 +0800
Subject: [PATCH] 'a'

---
 application/index/lang/zh-cn.php        |  2 +-
 application/index/view/common/meta.html |  2 +-
 application/index/view/index/index.html | 60 ++++++++++++-------------
 public/index.php                        |  5 +++
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/application/index/lang/zh-cn.php b/application/index/lang/zh-cn.php
index 2dc29336..c6a9982f 100644
--- a/application/index/lang/zh-cn.php
+++ b/application/index/lang/zh-cn.php
@@ -86,7 +86,7 @@ return [
     'Module'                                                 => '模块化开发',
     'Extension'                                              => '自由可扩展',
     'Auth'                                                   => '权限管理',
-    'The fastest framework based on ThinkPHP5 and Bootstrap' => '基于ThinkPHP5和Bootstrap的极速后台开发框架',
+    //'The fastest framework based on ThinkPHP5 and Bootstrap' => 'app后台',
     'Features'                                               => '功能特性',
     'Home'                                                   => '首页',
     'Store'                                                  => '插件市场',
diff --git a/application/index/view/common/meta.html b/application/index/view/common/meta.html
index d75406ff..371d8e8a 100644
--- a/application/index/view/common/meta.html
+++ b/application/index/view/common/meta.html
@@ -1,5 +1,5 @@
 <meta charset="utf-8">
-<title>{$title|default=''} – {:__('The fastest framework based on ThinkPHP5 and Bootstrap')}</title>
+<!--<title>{$title|default=''} – {:__('The fastest framework based on ThinkPHP5 and Bootstrap')}</title>-->
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
 <meta name="renderer" content="webkit">
 
diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html
index a75f8527..e9ab8da9 100644
--- a/application/index/view/index/index.html
+++ b/application/index/view/index/index.html
@@ -9,7 +9,7 @@
         <meta name="description" content="">
         <meta name="author" content="">
 
-        <title>FastAdmin - {:__('The fastest framework based on ThinkPHP5 and Bootstrap')}</title>
+        <title>趣侣行</title>
 
         <!-- Bootstrap Core CSS -->
         <link href="//cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
@@ -37,18 +37,18 @@
                     <a class="navbar-brand page-scroll" href="#page-top"><img src="__CDN__/assets/img/logo.png" style="width:200px;" alt=""></a>
                 </div>
 
-                <div class="collapse navbar-collapse" id="navbar-collapse-menu">
+<!--                <div class="collapse navbar-collapse" id="navbar-collapse-menu">
                     <ul class="nav navbar-nav navbar-right">
-                        <li><a href="http://www.fastadmin.net" target="_blank">{:__('Home')}</a></li>
-                        <li><a href="http://www.fastadmin.net/store.html" target="_blank">{:__('Store')}</a></li>
-                        <li><a href="http://www.fastadmin.net/service.html" target="_blank">{:__('Services')}</a></li>
-                        <li><a href="http://www.fastadmin.net/download.html" target="_blank">{:__('Download')}</a></li>
-                        <li><a href="http://www.fastadmin.net/demo.html" target="_blank">{:__('Demo')}</a></li>
-                        <li><a href="http://www.fastadmin.net/donate.html" target="_blank">{:__('Donation')}</a></li>
-                        <li><a href="http://forum.fastadmin.net" target="_blank">{:__('Forum')}</a></li>
-                        <li><a href="http://doc.fastadmin.net" target="_blank">{:__('Docs')}</a></li>
+                        <li><a href="http://www.fastadmin.net">首页</a></li>
+                        <li><a href="http://www.fastadmin.net/store.html" title="FastAdmin插件市场">插件市场</a></li>
+                        <li><a href="http://www.fastadmin.net/service.html" title="FastAdmin增值服务">服务</a></li>
+                        <li><a href="http://www.fastadmin.net/download.html" title="FastAdmin下载">下载</a></li>
+                        <li><a href="http://www.fastadmin.net/demo.html" title="FastAdmin演示">演示</a></li>
+                        <li><a href="http://forum.fastadmin.net" title="FastAdmin交流社区">社区</a></li>
+                        <li><a href="http://doc.fastadmin.net" title="FastAdmin官方文档">文档</a></li>
+                        <li><a href="http://html.fastadmin.net" title="FastAdmin的HTML版">HTML版</a></li>
                     </ul>
-                </div>
+                </div>-->
                 <!-- /.navbar-collapse -->
             </div>
             <!-- /.container-fluid -->
@@ -60,9 +60,9 @@
                     <div class="col-sm-12">
                         <div class="header-content">
                             <div class="header-content-inner">
-                                <h1>FastAdmin</h1>
-                                <h3>{:__('The fastest framework based on ThinkPHP5 and Bootstrap')}</h3>
-                                <a href="{:url('admin/index/login')}" class="btn btn-outline btn-xl page-scroll">{:__('Go to Dashboard')}</a>
+                                <!--<h1>FastAdmin</h1>-->
+                                <h3>趣侣行</h3>
+                                <a href="{:url('admin/index/login')}" class="btn btn-outline btn-xl page-scroll">登录后台</a>
                             </div>
                         </div>
                     </div>
@@ -70,12 +70,12 @@
             </div>
         </header>
 
-        <section id="features" class="features">
+<!--        <section id="features" class="features">
             <div class="container">
                 <div class="row">
                     <div class="col-lg-12 text-center">
                         <div class="section-heading">
-                            <h2>{:__('Features')}</h2>
+                            <h2>功能特性</h2>
                         </div>
                     </div>
                 </div>
@@ -86,42 +86,42 @@
                                 <div class="col-md-4">
                                     <div class="feature-item">
                                         <i class="icon-user text-primary"></i>
-                                        <h3>{:__('Auth')}</h3>
+                                        <h3>权限管理</h3>
                                         <p class="text-muted">基于完善的Auth权限控制管理、无限父子级权限分组、可自由分配子级权限、一个管理员可同时属于多个组别</p>
                                     </div>
                                 </div>
                                 <div class="col-md-4">
                                     <div class="feature-item">
                                         <i class="icon-screen-smartphone text-primary"></i>
-                                        <h3>{:__('Responsive')}</h3>
+                                        <h3>响应式开发</h3>
                                         <p class="text-muted">基于Bootstrap和AdminLTE进行二次开发,手机、平板、PC均自动适配,无需要担心兼容性问题</p>
                                     </div>
                                 </div>
                                 <div class="col-md-4">
                                     <div class="feature-item">
                                         <i class="icon-present text-primary"></i>
-                                        <h3>{:__('Languages')}</h3>
+                                        <h3>多语言</h3>
                                         <p class="text-muted">不仅仅后台开发支持多语言,同时视图部分和JS部分仍然共享同一个语言包,语法相同且自动加载</p>
                                     </div>
                                 </div>
                                 <div class="col-md-4">
                                     <div class="feature-item">
                                         <i class="icon-layers text-primary"></i>
-                                        <h3>{:__('Module')}</h3>
+                                        <h3>模块化开发</h3>
                                         <p class="text-muted">控制器、模型、视图、JS一一对应,使用RequireJS进行JS模块化管理,采用Bower进行前端包组件管理</p>
                                     </div>
                                 </div>
                                 <div class="col-md-4">
                                     <div class="feature-item">
                                         <i class="icon-docs text-primary"></i>
-                                        <h3>{:__('CRUD')}</h3>
+                                        <h3>CRUD</h3>
                                         <p class="text-muted">控制台进行一键生成控制器、模型、视图和JS文件,同时可一键生成后台权限节点和菜单栏</p>
                                     </div>
                                 </div>
                                 <div class="col-md-4">
                                     <div class="feature-item">
                                         <i class="icon-puzzle text-primary"></i>
-                                        <h3>{:__('Extension')}</h3>
+                                        <h3>自由可扩展</h3>
                                         <p class="text-muted">FastAdmin提供强大的扩展中心，可直接在线安装和卸载插件，同时支持命令行一键操作</p>
                                     </div>
                                 </div>
@@ -136,26 +136,26 @@
             <div class="cta-content">
                 <div class="container">
                     <h2>不要犹豫<br>开始行动</h2>
-                    <a href="http://doc.fastadmin.net/docs/contributing.html" class="btn btn-outline btn-xl page-scroll">{:__('Contribution')}</a>
+                    <a href="http://doc.fastadmin.net/docs/contributing.html" class="btn btn-outline btn-xl page-scroll">为FastAdmin贡献代码!</a>
                 </div>
             </div>
             <div class="overlay"></div>
-        </section>
+        </section>-->
 
         <footer>
             <div class="container">
-                <p>&copy; 2017 FastAdmin. All Rights Reserved.</p>
-                <ul class="list-inline">
+                <p>&copy; 2017 趣侣行.</p>
+                <!--<ul class="list-inline">
                     <li>
-                        <a href="https://gitee.com/karson/fastadmin">{:__('Gitee')}</a>
+                        <a href="https://gitee.com/karsonzhang/fastadmin">码云</a>
                     </li>
                     <li>
-                        <a href="https://github.com/karsonzhang/fastadmin">{:__('Github')}</a>
+                        <a href="https://github.com/karsonzhang/fastadmin">Github</a>
                     </li>
                     <li>
-                        <a href="http://shang.qq.com/wpa/qunwpa?idkey=46c326e570d0f97cfae1f8257ae82322192ec8841c79b2136446df0b3b62028c">{:__('QQ group')}</a>
+                        <a href="http://shang.qq.com/wpa/qunwpa?idkey=46c326e570d0f97cfae1f8257ae82322192ec8841c79b2136446df0b3b62028c">QQ群</a>
                     </li>
-                </ul>
+                </ul>-->
             </div>
         </footer>
 
diff --git a/public/index.php b/public/index.php
index 004784df..98175e8b 100755
--- a/public/index.php
+++ b/public/index.php
@@ -11,8 +11,11 @@
 // +----------------------------------------------------------------------
 // [ 应用入口文件 ]
 // 定义应用目录
+//define('APP_PATH', __DIR__ . '/../application/');
 define('APP_PATH', __DIR__ . '/../application/');
 
+
+
 // 判断是否安装FastAdmin
 if (!is_file(APP_PATH . 'admin/command/Install/install.lock'))
 {
@@ -22,3 +25,5 @@ if (!is_file(APP_PATH . 'admin/command/Install/install.lock'))
 
 // 加载框架引导文件
 require __DIR__ . '/../thinkphp/start.php';
+
+