From bf8b7ae75bcc4ffcd89731b9ed10877dac3ce87d Mon Sep 17 00:00:00 2001
From: wwccss <chunsheng@cnezsoft.com>
Date: Wed, 17 Jul 2013 16:12:00 +0800
Subject: [PATCH]  * finish task#1495.

---
 module/user/config.php     |  4 ++--
 module/user/lang/en.php    |  2 ++
 module/user/lang/zh-cn.php |  2 ++
 www/js/my.full.js          | 11 +++++++++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/module/user/config.php b/module/user/config.php
index 144c09adcc..dcb7d7dbdf 100644
--- a/module/user/config.php
+++ b/module/user/config.php
@@ -3,8 +3,8 @@ $config->user = new stdclass();
 $config->user->create = new stdclass();
 $config->user->edit   = new stdclass();
 
-$config->user->create->requiredFields = 'account,realname,password,password1,password2,role';
-$config->user->edit->requiredFields   = 'account,realname,role';
+$config->user->create->requiredFields = 'account,realname,password,password1,password2';
+$config->user->edit->requiredFields   = 'account,realname';
 $config->user->failTimes   = 6;
 $config->user->lockMinutes = 10;
 $config->user->batchCreate = 10;
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index f0cda4cdbf..9e084ec6a6 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -124,6 +124,8 @@ $lang->user->loginWithDemoUser    = 'Login with demo user:';
 $lang->user->placeholder = new stdclass();
 $lang->user->placeholder->account   = 'Letters/underline/numbers, three above';
 $lang->user->placeholder->password1 = 'Six above';
+$lang->user->placeholder->role      = '';
+$lang->user->placeholder->group     = '';
 $lang->user->placeholder->join      = 'The date the employee joined the company';
 $lang->user->placeholder->commiter  = 'The account in version control systems';
 
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index 5ce0594d97..9356ec0495 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -124,6 +124,8 @@ $lang->user->loginWithDemoUser    = '使用demo账号登录：';
 $lang->user->placeholder = new stdclass();
 $lang->user->placeholder->account   = '英文、数字和下划线的组合，三位以上';
 $lang->user->placeholder->password1 = '六位以上';
+$lang->user->placeholder->role      = '角色影响内容和用户列表的顺序。';
+$lang->user->placeholder->group     = '分组决定用户的权限列表。';
 $lang->user->placeholder->join      = '入职日期';
 $lang->user->placeholder->commiter  = '版本控制系统(subversion)中的帐号';
 
diff --git a/www/js/my.full.js b/www/js/my.full.js
index cafebf6b1d..ea756ad55c 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -249,7 +249,7 @@ function setHelpLink()
 }
 
 /**
- * Set paceholder 
+ * Set paceholder. 
  * 
  * @access public
  * @return void
@@ -260,7 +260,14 @@ function setPlaceholder()
     {
         for(var key in holders)
         {
-            $("#"+key).attr('placeholder', holders[key]);
+            if($('#' + key).prop('tagName') == 'INPUT')
+            {
+                $("#" + key).attr('placeholder', holders[key]);
+            }
+            else
+            {
+                $("#" + key).parent().append(holders[key]);
+            }
         }
     }
 }