merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -51,6 +51,14 @@
<p class="q"><label for="change_password_date">{$lang->change_password_date}</label></p>
<p class="a"><input type="text" id="change_password_date" name="change_password_date" value="{$config->change_password_date}" style="width:30px" /><span class="desc">{$lang->unit_day}({$lang->about_change_password_date})</span></p>
</li>
<li>
<p class="q"><label for="max_error_count">{$lang->login_trial_limit1}</label></p>
<p class="a"><input type="text" id="max_error_count" name="max_error_count" value="{$config->max_error_count}" style="width:30px" /><span class="desc">{$lang->about_login_trial_limit1}</span></p>
</li>
<li>
<p class="q"><label for="max_error_count_time">{$lang->login_trial_limit2}</label></p>
<input type="text" id="max_error_count_time" name="max_error_count_time" value="{$config->max_error_count_time}" style="width:30px" /><span class="desc">{$lang->unit_sec}({$lang->about_login_trial_limit2})</span></p>
</li>
<li>
<p class="q"><label for="agreement">{$lang->agreement}</label></p>
<p class="a">{$editor}</p>