diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 6c096acfc2..ee3ed24864 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -12,6 +12,7 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; $lang->misc->ping = 'Ping'; +$lang->misc->api = 'http://api.zentao.pm'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 12867b03a8..fb2f8facc7 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -12,6 +12,7 @@ $lang->misc = new stdclass(); $lang->misc->common = '杂项'; $lang->misc->ping = '防超时'; +$lang->misc->api = 'http://api.zentao.net'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; @@ -67,7 +68,7 @@ $lang->misc->noticeRepair = "
普通用户请联系管理员进行修复
  1. 文件内容为空。
  2. 如果之前文件存在,删除之后重新创建。
  3. -
"; + "; $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; diff --git a/module/misc/view/links.html.php b/module/misc/view/links.html.php index 088b1a5150..bf6def0661 100755 --- a/module/misc/view/links.html.php +++ b/module/misc/view/links.html.php @@ -2,7 +2,6 @@
misc->zentao->version); - $API = $this->app->getClientLang() == 'en' ? 'http://api.zentao.pm' : 'http://api.zentao.net'; ?> misc->zentao as $label => $groupItems):?> @@ -15,7 +14,7 @@
diff --git a/module/user/config.php b/module/user/config.php index b4211a351f..bd2bfb21c9 100644 --- a/module/user/config.php +++ b/module/user/config.php @@ -6,8 +6,8 @@ $config->user->edit = new stdclass(); $config->user->create->requiredFields = 'account,realname,password,password1,password2'; $config->user->edit->requiredFields = 'account,realname'; -$config->user->customBatchCreateFields = 'dept,email,gender,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; -$config->user->customBatchEditFields = 'dept,email,commiter,join,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchCreateFields = 'dept,email,gender,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; +$config->user->customBatchEditFields = 'dept,email,commiter,skype,qq,yahoo,gtalk,wangwang,mobile,phone,address,zipcode'; $config->user->custom = new stdclass(); $config->user->custom->batchCreateFields = 'dept,email,gender'; diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index 01bae78aa6..a2e2d8c86e 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -24,7 +24,7 @@
- +
@@ -69,12 +69,6 @@ - diff --git a/module/user/view/edit.html.php b/module/user/view/edit.html.php index 5b6a859e33..f1d93fe75b 100644 --- a/module/user/view/edit.html.php +++ b/module/user/view/edit.html.php @@ -39,10 +39,6 @@ - @@ -100,7 +96,7 @@ - + diff --git a/module/user/view/profile.html.php b/module/user/view/profile.html.php index 64e3f40f07..9d8f5aee0c 100644 --- a/module/user/view/profile.html.php +++ b/module/user/view/profile.html.php @@ -74,12 +74,6 @@ - @@ -95,11 +89,11 @@ - + - + @@ -107,11 +101,11 @@ - + - + @@ -119,11 +113,11 @@ - + - +
user->dept;?> user->commiter;?>
user->gender;?> user->genderList, 'm');?>
user->gender;?> user->genderList, $user->gender);?>
phone, "class='form-control' autocomplete='off'");?> user->address;?> address, "class='form-control' autocomplete='off'");?>
user->zipcode;?> zipcode, "class='form-control' autocomplete='off'");?>user->email;?> email;?>
user->visits;?> visits;?>
user->skype;?> skype) echo html::a("callto://$user->skype", $user->skype);?>
user->qq;?> qq) echo html::a("tencent://message/?uin=$user->qq", $user->qq);?>
user->yahoo;?> yahoo;?>
user->gtalk;?> gtalk;?>
user->wangwang;?> wangwang;?>
user->mobile;?> mobile;?>
user->phone;?> phone;?>
user->address;?> address;?>
user->zipcode;?> zipcode;?>