Merge pull request #232 from kijin/pr/cleanup-ip-allow-deny

관리자 허용 IP 및 사이트 잠금 예외 IP 처리 개선
This commit is contained in:
Kijin Sung 2016-02-09 11:41:06 +09:00
commit 987b78eb1a
33 changed files with 353 additions and 117 deletions

View file

@ -176,7 +176,10 @@ button.grey:hover, a.button.grey:hover {
.x #content ul li {
line-height: 160%;
}
.x #content label input[type=checkbox] {
.x #content label.x_inline {
display: inline-block; margin-right: 12px;
}
.x #content label input[type=checkbox], .x #content label input[type=radio] {
position: relative;
top: 2px;
}
@ -207,6 +210,9 @@ button.grey:hover, a.button.grey:hover {
line-height: 17px; padding: 3px 5px;
width: 260px; box-sizing: border-box;
}
.x .x_control-group .x_controls input[type=checkbox], .x .x_control-group .x_controls input[type=radio] {
padding: 0; width: auto;
}
.x .x_control-group .x_controls select {
line-height: 17px; padding: 3px 7px 3px 3px;
width: 260px; box-sizing: border-box;

View file

@ -50,13 +50,19 @@
<div class="x_control-group">
<label class="x_control-label">{$lang->use_ssl}</label>
<div class="x_controls">
<select name="use_ssl">
<!--@foreach($lang->ssl_options as $key => $val)-->
<option value="{$key}" selected="selected"|cond="$use_ssl==$key" />{$val}</option>
<label for="ssl_{$key}" class="x_inline"><input type="radio" name="use_ssl" id="ssl_{$key}" value="{$key}" checked="checked"|cond="$use_ssl==$key" /> {$val}</label>
<!--@endforeach-->
</select>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->use_sitelock}</label>
<div class="x_controls">
<label for="sitelock_n" class="x_inline"><input type="radio" name="use_sitelock" id="sitelock_n" value="N" checked="checked" /> {$lang->sitelock_options['none']}</label>
<label for="sitelock_y" class="x_inline"><input type="radio" name="use_sitelock" id="sitelock_y" value="Y" /> {$lang->sitelock_options['lock']}</label>
</div>
</div>
<p class="install_help">{$lang->about_sitelock_after_install($sitelock_ip_range)}</p>
</div>
<div id="buttons">
<div class="align-left">