From 09b4fce1dd72516b7b14d3b075e1fe627493632f Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 23 Oct 2017 11:44:41 +0800
Subject: [PATCH] =?UTF-8?q?zodiac=20=E9=A1=B5=E9=9D=A2=20=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/china_zodiac.php |  6 +-
 application/views/zodiac_edit.php        | 78 ------------------------
 2 files changed, 4 insertions(+), 80 deletions(-)
 delete mode 100644 application/views/zodiac_edit.php

diff --git a/application/controllers/china_zodiac.php b/application/controllers/china_zodiac.php
index 7aab36ee..a9bd6c86 100644
--- a/application/controllers/china_zodiac.php
+++ b/application/controllers/china_zodiac.php
@@ -14,9 +14,11 @@ class China_zodiac extends CI_Controller {
         # code...
     }
 
-    public function edit_zodiac($zodiac)
+    public function edit_zodiac()
     {
-        $this->load->view('zodiac_edit');
+        $data['nav_view'] = $this->load->view('bootstrap/zodiac/nav', array('nav_active' => 'rat'), true);
+        $this->load->view('bootstrap/header', $data);
+        $this->load->view('bootstrap/zodiac/index',$data);
     }
 
 }
diff --git a/application/views/zodiac_edit.php b/application/views/zodiac_edit.php
deleted file mode 100644
index bf1022d8..00000000
--- a/application/views/zodiac_edit.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<div class="row-fluid">
-  <div class="span2">
-
-<?php echo $nav_view; ?>
-
-  </div>
-  <div class="span10" style="padding-right:20px;">
-    <?php if(!empty($un_active_list)){ ?>
-    <legend>待审核作者</legend>
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th class="span1">用户ID</th>
-              <th class="span2">名字</th>
-              <th class="span2">中文名</th>
-              <th class="span1">性别</th>
-              <th class="span2">邮箱</th>
-              <th class="span2">注册时间</th>
-              <th class="span1">站点</th>
-              <th class="span1">操作</th>
-            </tr>
-          </thead>
-          <tbody>
-          <?php foreach($un_active_list as $a){ ?>
-            <tr class="info">
-              <td><?php echo $a->a_id; ?></td>
-              <td><?php echo $a->a_name; ?></td>
-              <td><?php echo $a->a_name_cn; ?></td>
-              <td><?php echo $a->a_gender; ?></td>
-              <td><a href="mailto:<?php echo $a->a_email; ?>"><?php echo $a->a_email; ?></a></td>
-              <td><?php echo date('m/d/Y',strtotime($a->a_datetime)); ?></td>
-                          <td><?php echo $a->a_sitecode; ?></td>
-              <td><a href="<?php echo site_url('author/edit_author/'.$a->a_id); ?>">查看</a></td>
-            </tr>
-          <?php } ?>
-
-          </tbody>
-        </table>
-    <?php } ?>
-    <legend>已审核作者</legend>
-        <table class="table table-striped">
-          <thead>
-            <tr>
-              <th class="span1">用户ID</th>
-              <th class="span2">名字</th>
-              <th class="span2">中文名</th>
-              <th class="span1">性别</th>
-              <th class="span2">邮箱</th>
-              <th class="span2">注册时间</th>
-              <th class="span1">站点</th>
-              <th class="span1">操作</th>
-            </tr>
-          </thead>
-          <tbody>
-          <?php foreach($author_list as $author){ ?>
-            <tr>
-              <td><?php echo $author->a_id; ?></td>
-              <td><?php echo $author->a_name; ?></td>
-              <td><?php echo $author->a_name_cn; ?></td>
-              <td><?php echo $author->a_gender; ?></td>
-              <td><a href="mailto:<?php echo $author->a_email; ?>"><?php echo $author->a_email; ?></a></td>
-              <td><?php echo date('m/d/Y',strtotime($author->a_datetime)); ?></td>
-              <td><?php echo $author->a_sitecode; ?></td>
-              <td><a href="<?php echo site_url('author/edit_author/'.$author->a_id); ?>">查看</a></td>
-            </tr>
-          <?php } ?>
-
-          </tbody>
-        </table>
-
-  </div>
-
-</div>
-
-
-
-
-