From 4833a99d8aa233a207a1ffef7cbe2130ba3d2f89 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Thu, 5 Jun 2014 09:49:04 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/scripts/user/adminlist.phtml  | 73 ++++++++++---------
 application/module/Users/Users.php            | 17 +++--
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/application/admin/views/scripts/user/adminlist.phtml b/application/admin/views/scripts/user/adminlist.phtml
index 3606ba74..da80328b 100755
--- a/application/admin/views/scripts/user/adminlist.phtml
+++ b/application/admin/views/scripts/user/adminlist.phtml
@@ -2,46 +2,47 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin/">后台首页</a>');
 	$this->breadcrumb('<a href="/admin/user">用户管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div id="leftPanel">
-<?= $this->partial('user/left.phtml'); ?>
-</div>
+<div class="row-fluid">
+    <div class="span3">
+    <?= $this->partial('user/left.phtml'); ?>
+    </div>
 
-<div id="rightPanel">
-<div class="title">管理员列表</div>
-<div class=""><a href="/admin/user/adminlist/ac/sync">同步管理员到geonetwork</a></div>
-<table>
-<thead>
-<tr>
-<td width='150'>用户名</td>
-<td width='250'>电子邮箱</td>
-<td width='100'>用户类型</td>
-<td width='150'>真实姓名</td>
-<td width='150'>电话</td>
-<td width='150'>操作</td>
-</tr>
-</thead>
-<?php if (count($this->paginator)): ?>
-<?php $autoindex=0;?>
-<?php foreach ($this->paginator as $item): ?>
-<?php $autoindex++;?>
-<tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
-<td><?= $item['username']?></td>
-<td><?= $item['email']; ?></td>
-<td><?= $item['usertype']; ?></td>
-<td><?= $item['realname']; ?></td>
-<td><?= $item['phone']; ?></td>
-<td>
-<a href='/admin/user/show/id/<?= $item['id'];?>'>查看详细</a>
-</td>
-</tr>
-<?php endforeach; ?>
-<?php endif; ?>
-</table>
-<div class="pagenavi"><?= $this->paginator; ?></div>
+	<div class="span9">
+    <div class="title">管理员列表</div>
+    <div class=""><a href="/admin/user/adminlist/ac/sync">同步管理员到geonetwork</a></div>
+    <table class="table">
+    <thead>
+    <tr>
+    <td width='150'>用户名</td>
+    <td width='250'>电子邮箱</td>
+    <td width='100'>用户类型</td>
+    <td width='150'>真实姓名</td>
+    <td width='150'>电话</td>
+    <td width='150'>操作</td>
+    </tr>
+    </thead>
+    <?php if (count($this->paginator)): ?>
+    <?php $autoindex=0;?>
+    <?php foreach ($this->paginator as $item): ?>
+    <?php $autoindex++;?>
+    <tr class="<?php if($autoindex%2 == 0) echo 'even'; else echo 'odd'; ?>">
+    <td><?= $item['username']?></td>
+    <td><?= $item['email']; ?></td>
+    <td><?= $item['usertype']; ?></td>
+    <td><?= $item['realname']; ?></td>
+    <td><?= $item['phone']; ?></td>
+    <td>
+    <a href='/admin/user/show/id/<?= $item['id'];?>'>查看详细</a>
+    </td>
+    </tr>
+    <?php endforeach; ?>
+    <?php endif; ?>
+    </table>
+    <div class="pagenavi"><?= $this->paginator; ?></div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/application/module/Users/Users.php b/application/module/Users/Users.php
index 0660bea2..64477df6 100644
--- a/application/module/Users/Users.php
+++ b/application/module/Users/Users.php
@@ -44,11 +44,11 @@ class Users extends \Zend_Controller_Plugin_Abstract
 		$this->usertype = array(
 			'普通会员' => 'member',
 			'系统管理员' => 'administrator',
-			'青海省气象科学研究所' => '',
-			'青海省环境监测中心站' => '',
-			'青海省水土保持局' => '',
-			'青海省林业调查规划院' => '',
-			'青海省水文水资源局' => ''
+			'青海省气象科学研究所' => 'meteorologic',
+			'青海省环境监测中心站' => 'environment',
+			'青海省水土保持局' => 'watersoil',
+			'青海省林业调查规划院' => 'forestry',
+			'青海省水文水资源局' => 'hydrology'
 		);
 	}
 	
@@ -59,7 +59,7 @@ class Users extends \Zend_Controller_Plugin_Abstract
 		return $this->usertype;
 	}
 	
-	//通过ID获取User信息	
+	//通过ID获取User信息
 	public function getUser($id)
 	{
 		$sql="select * from users where id=?";
@@ -69,6 +69,11 @@ class Users extends \Zend_Controller_Plugin_Abstract
 		return $rows;
 	}
 	
+	public function getUserInfo($id)
+	{
+		return $this->getUser($id);
+	}
+	
 	//通过email地址返回用户信息是否存在
 	public function userExists($email = NULL)
 	{