fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 17:22:20 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/multidomain

Browse source
This commit is contained in:
Kijin Sung 2017-03-01 21:50:51 +09:00
commit 210b6b4147
75 changed files with 2102 additions and 425 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/admin/tpl/config_advanced.html
View file

@ -14,11 +14,12 @@
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->use_ssl} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_general_ssl" target="_blank">{$lang->help}</a></label>
<label class="x_control-label">{lang('admin.use_ssl')} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_general_ssl" target="_blank">{$lang->help}</a></label>
<div class="x_controls">
<!--@foreach($lang->ssl_options as $key => $val)-->
<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-->
<div class="x_help-block">{lang('admin.about_use_ssl')}</div>
</div>
</div>
<div class="x_control-group">

4
modules/admin/tpl/css/admin.css
View file

@ -2388,6 +2388,10 @@ html[lang="mn"] .x .g11n.active>[disabled],
height: 1px;
overflow: hidden;
}
.server_env {
white-space: pre-wrap;
font-family: Consolas, Courier New, monospace;
}
/* language specific styles */
/* English admin_en.css */

2
modules/admin/tpl/server_env.html
View file

@ -4,5 +4,5 @@
</div>
<section class="section">
<textarea style="width:96%;height:400px;">{$str_info}</textarea>
<div class="server_env">{$str_info}</div>
</section>