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

UI cleaning.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12287 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-11-22 10:10:20 +00:00
parent d2bffa188b
commit 695693f66f
16 changed files with 47 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/tpl/common_layout.html
View file

@ -9,8 +9,8 @@
<html lang="{$lang_type}"> <html lang="{$lang_type}">
<head> <head>
<!-- META --> <!-- META -->
<meta charset="utf-8" /> <meta charset="utf-8">
<meta name="Generator" content="XpressEngine" /> <meta name="Generator" content="XpressEngine">
<!-- TITLE --> <!-- TITLE -->
<title>{Context::getBrowserTitle()}</title> <title>{Context::getBrowserTitle()}</title>
<!-- CSS --> <!-- CSS -->

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

@ -25,7 +25,7 @@
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label" for="adminTitle">{$lang->admin_title}</label> <label class="x_control-label" for="adminTitle">{$lang->admin_title}</label>
<div class="x_controls"> <div class="x_controls">
<input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" /> <input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" placeholder="XE Admin" />
</div> </div>
</div> </div>
<div class="x_clearfix btnArea"> <div class="x_clearfix btnArea">

8
modules/admin/tpl/config_ftp.html
View file

@ -1,12 +1,12 @@
<load target="./js/config.js" usecdn="true" /> <load target="./js/config.js" usecdn="true" />
<load target="../install/lang/lang.xml" usecdn="true" /> <load target="../install/lang/lang.xml" usecdn="true" />
<load target="../../session/tpl/js/session.js" usecdn="true" /> <load target="../../session/tpl/js/session.js" usecdn="true" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="x_page-header"> <div class="x_page-header">
<h1>{$lang->menu_gnb_sub['adminConfigurationFtp']}</h1> <h1>{$lang->menu_gnb_sub['adminConfigurationFtp']}</h1>
</div> </div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<p class="x_help-block">{$lang->detail_about_ftp_info}</p> <p class="x_help-block">{$lang->detail_about_ftp_info}</p>
<form action="./" id="ftp_form" method="post" enctype="multipart/form-data" class="x_form-horizontal" ruleset="installFtpInfo"> <form action="./" id="ftp_form" method="post" enctype="multipart/form-data" class="x_form-horizontal" ruleset="installFtpInfo">
<input type="hidden" name="module" value="install" /> <input type="hidden" name="module" value="install" />
@ -50,7 +50,7 @@
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label" for="ftp_port">{$lang->ftp_port}</label> <label class="x_control-label" for="ftp_port">{$lang->ftp_port}</label>
<div class="x_controls"> <div class="x_controls">
<input type="text" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port ? $ftp_info->ftp_port : '21'}" /> Default : 21 <input type="number" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port ? $ftp_info->ftp_port : '21'}" style="width:50px" /> Default : 21
</div> </div>
</div> </div>
<div class="x_control-group"> <div class="x_control-group">

8
modules/admin/tpl/config_general.html
View file

@ -48,7 +48,7 @@
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label" for="time_zone">{$lang->timezone}</label> <label class="x_control-label" for="time_zone">{$lang->timezone}</label>
<div class="x_controls"> <div class="x_controls">
<select name="time_zone" id="time_zone"> <select name="time_zone" id="time_zone" style="width:auto">
<option value="{$key}" selected="selected"|cond="$time_zone==$key" loop="$time_zone_list=>$key,$val">{$val}</option> <option value="{$key}" selected="selected"|cond="$time_zone==$key" loop="$time_zone_list=>$key,$val">{$val}</option>
</select> </select>
</div> </div>
@ -118,7 +118,7 @@
</section> </section>
<section class="section collapse"> <section class="section collapse">
<h1>{$lang->subtitle_advanced}</h1> <h1>{$lang->subtitle_advanced}</h1>
<form action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal" style="display:none"> <form action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal">
<input type="hidden" name="module" value="install" /> <input type="hidden" name="module" value="install" />
<input type="hidden" name="act" value="procInstallAdminSaveTimeZone" /> <input type="hidden" name="act" value="procInstallAdminSaveTimeZone" />
<div class="x_control-group"> <div class="x_control-group">
@ -151,8 +151,8 @@
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label">{$lang->server_ports}</label> <label class="x_control-label">{$lang->server_ports}</label>
<div class="x_controls"> <div class="x_controls">
<label for="http_port" class="x_inline">HTTP: <input type="text" name="http_port" id="http_port" size="5" value="{$http_port}" style="width:40px" /></label> <label for="http_port" class="x_inline">HTTP: <input type="number" name="http_port" id="http_port" size="5" value="{$http_port}" style="width:50px" /></label>
<label for="https_port" class="x_inline">HTTPS: <input type="text" name="https_port" id="https_port" size="5" value="{$https_port}" style="width:40px" /></label> <label for="https_port" class="x_inline">HTTPS: <input type="number" name="https_port" id="https_port" size="5" value="{$https_port}" style="width:50px" /></label>
</div> </div>
</div> </div>
<div class="x_control-group" cond="__XE_CDN_VERSION__!='%__XE_CDN_VERSION__%'"> <div class="x_control-group" cond="__XE_CDN_VERSION__!='%__XE_CDN_VERSION__%'">

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

@ -66,6 +66,7 @@ body>.x,
.x .x_btn-group>.x_btn:first-child{border-bottom-left-radius:2px;border-top-left-radius:2px} .x .x_btn-group>.x_btn:first-child{border-bottom-left-radius:2px;border-top-left-radius:2px}
.x input[type="radio"], .x input[type="radio"],
.x input[type="checkbox"]{margin:0} .x input[type="checkbox"]{margin:0}
.x input[type="file"]{height:auto}
.x td select, .x td select,
.x td textarea, .x td textarea,
.x td input{margin-bottom:0} .x td input{margin-bottom:0}
@ -83,7 +84,7 @@ body>.x,
.x .x_inline{display:inline-block;*display:inline;*zoom:1} .x .x_inline{display:inline-block;*display:inline;*zoom:1}
.x label.checked, .x label.checked,
.x input:checked+label, .x input:checked+label,
.x .x_form-horizontal .x_control-label{font-weight:bold} .x .x_form-horizontal .x_control-label{font-weight:bold;word-break:keep-all}
.x .x_form-horizontal .x_controls>label{padding-top:5px} .x .x_form-horizontal .x_controls>label{padding-top:5px}
.x input[type="radio"]+label, .x input[type="radio"]+label,
.x input[type="checkbox"]+label{font-weight:normal} .x input[type="checkbox"]+label{font-weight:normal}
@ -96,7 +97,7 @@ body>.x,
.x.x_modal, .x.x_modal,
.x_modal-backdrop{display:none} .x_modal-backdrop{display:none}
.x.x_modal{padding:0;width:90%;margin:-250px 0 0 -45%;max-width:none;border-radius:6px;box-shadow:none} .x.x_modal{padding:0;width:90%;margin:-250px 0 0 -45%;max-width:none;border-radius:6px;box-shadow:none}
.x_modal>form{margin:0} .x.x_modal>form{margin:0}
.x .x_control-group{padding-top:8px;margin-bottom:10px;border-top:1px dotted #ddd;clear:both} .x .x_control-group{padding-top:8px;margin-bottom:10px;border-top:1px dotted #ddd;clear:both}
.x .x_control-group:before{content:"";display:block;clear:both} .x .x_control-group:before{content:"";display:block;clear:both}
.x .x_control-group:first-child, .x .x_control-group:first-child,

4
modules/file/tpl/adminConfig.html
View file

@ -34,14 +34,14 @@
<div class="x_control-group"> <div class="x_control-group">
<label for="filesize" class="x_control-label">{$lang->allowed_filesize}</label> <label for="filesize" class="x_control-label">{$lang->allowed_filesize}</label>
<div class="x_controls"> <div class="x_controls">
<input id="filesize" type="text" name="allowed_filesize" value="{$config->allowed_filesize}" style="width:40px" /> MB / {ini_get('upload_max_filesize')} <input id="filesize" type="number" name="allowed_filesize" value="{$config->allowed_filesize}" style="width:40px" /> MB/{ini_get('upload_max_filesize')}
<p class="x_help-inline">{$lang->about_allowed_filesize}</p> <p class="x_help-inline">{$lang->about_allowed_filesize}</p>
</div> </div>
</div> </div>
<div class="x_control-group"> <div class="x_control-group">
<label for="attachSize" class="x_control-label">{$lang->allowed_attach_size}</label> <label for="attachSize" class="x_control-label">{$lang->allowed_attach_size}</label>
<div class="x_controls"> <div class="x_controls">
<input id="attachSize" type="text" name="allowed_attach_size" value="{$config->allowed_attach_size}" style="width:40px" /> MB <input id="attachSize" type="number" name="allowed_attach_size" value="{$config->allowed_attach_size}" style="width:40px" /> MB
<p class="x_help-inline">{$lang->about_allowed_attach_size}</p> <p class="x_help-inline">{$lang->about_allowed_attach_size}</p>
</div> </div>
</div> </div>

2
modules/integration_search/tpl/skin_info.html
View file

@ -89,7 +89,7 @@
{@$group = $val->group} {@$group = $val->group}
</section> </section>
<section class="section"> <section class="section">
<h1>{$group}</h1> <h2>{$group}</h2>
</block> </block>
<div class="x_control-group"> <div class="x_control-group">

2
modules/layout/lang/lang.xml
View file

@ -993,7 +993,7 @@
</item> </item>
<item name="installed_layout"> <item name="installed_layout">
<value xml:lang="ko"><![CDATA[설치된 레이아웃]]></value> <value xml:lang="ko"><![CDATA[설치된 레이아웃]]></value>
<value xml:lang="en"><![CDATA[Layouts]]></value> <value xml:lang="en"><![CDATA[Installed Layouts]]></value>
<value xml:lang="jp"><![CDATA[インストールされているレイアウト]]></value> <value xml:lang="jp"><![CDATA[インストールされているレイアウト]]></value>
<value xml:lang="zh-TW"><![CDATA[已安裝版面]]></value> <value xml:lang="zh-TW"><![CDATA[已安裝版面]]></value>
</item> </item>

8
modules/layout/tpl/header.html
View file

@ -1,9 +1,13 @@
<style> <style>
#faceoff_migration_info img { border: 1px solid #ccc; padding: 5px; } #faceoff_migration_info img {border:1px solid #ccc;padding:5px}
</style> </style>
<div class="x_page-header"> <div class="x_page-header">
<h1>{$lang->installed_layout}</h1> <h1>
{$lang->installed_layout}
<span cond="$layout_info" style="font-size:14px">&gt; {$layout_info->title} v{$layout_info->version}({$layout_info->layout})</span>
<span cond="$selected_layout" style="font-size:14px">&gt; {$selected_layout->title} v{$selected_layout->version}({$selected_layout->layout})</span>
</h1>
</div> </div>
<div cond="$layout == 'faceoff'" class="x_alert x_alert-block"> <div cond="$layout == 'faceoff'" class="x_alert x_alert-block">

1
modules/layout/tpl/installed_layout_list.html
View file

@ -1,6 +1,5 @@
<include target="header.html" /> <include target="header.html" />
<include target="sub_tab.html" /> <include target="sub_tab.html" />
<table class="x_table x_table-striped x_table-hover dsTg"> <table class="x_table x_table-striped x_table-hover dsTg">
<caption> <caption>
<div class="x_pull-right x_btn-group"> <div class="x_pull-right x_btn-group">

1
modules/layout/tpl/layout_all_instance_list.html
View file

@ -4,7 +4,6 @@
xe.lang.confirm_delete = '{$lang->confirm_delete}'; xe.lang.confirm_delete = '{$lang->confirm_delete}';
</script> </script>
<include target="sub_tab.html" /> <include target="sub_tab.html" />
<table class="x_table x_table-striped x_table-hover"> <table class="x_table x_table-striped x_table-hover">
<thead> <thead>
<tr> <tr>

37
modules/layout/tpl/layout_info_view.html
View file

@ -9,13 +9,7 @@
<div></div> <div></div>
</form> </form>
<div id="layout_config" class="x_form-horizontal"> <section id="layout_config" class="x_form-horizontal">
<div class="x_control-group">
<label class="x_control-label">{$lang->layout}</label>
<div class="x_controls">
{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})
</div>
</div>
<div cond="$selected_layout->path" class="x_control-group"> <div cond="$selected_layout->path" class="x_control-group">
<label class="x_control-label">{$lang->path}</label> <label class="x_control-label">{$lang->path}</label>
<div class="x_controls"> <div class="x_controls">
@ -56,12 +50,15 @@
</div> </div>
<block loop="$selected_layout->extra_var => $name, $var"> <block loop="$selected_layout->extra_var => $name, $var">
<block cond="!$not_first && !$var->group"><section class="section"></block> <block cond="!$not_first && !$var->group">
<section class="section">
<h1>{$lang->extra_vars}</h1>
</block>
<block cond="$group != $var->group"> <block cond="$group != $var->group">
<block cond="$not_first"></section></block> <block cond="$not_first"></section></block>
<section class="section"> <section>
<h1>{$var->group}</h1> <h2>{$var->group}</h2>
{@$group = $var->group} {@$group = $var->group}
</block> </block>
{@$not_first = true} {@$not_first = true}
<div class="x_control-group"> <div class="x_control-group">
@ -84,19 +81,19 @@
<button class="x_icon-remove" type="button" onclick="deleteImage('{$name}')" title="{$lang->cmd_delete}">{$lang->cmd_delete}</button> <button class="x_icon-remove" type="button" onclick="deleteImage('{$name}')" title="{$lang->cmd_delete}">{$lang->cmd_delete}</button>
</div> </div>
</div> </div>
<form action="./" enctype="multipart/form-data" method="post" target="hiddenIframe" class="imageUpload"> <form action="./" enctype="multipart/form-data" method="post" target="hiddenIframe" class="imageUpload" style="margin:0">
<input type="hidden" name="module" value="layout" /> <input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminConfigImageUpload" /> <input type="hidden" name="act" value="procLayoutAdminConfigImageUpload" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" /> <input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="name" value="{$name}" /> <input type="hidden" name="name" value="{$name}" />
<p> <p>
<input type="file" name="img" id="file_select_{$name}" value="" title="{$lang->uploaded_file}" /> <input type="file" name="img" id="file_select_{$name}" value="" title="{$lang->uploaded_file}" />
<input class="x_btn" type="submit" value="{$lang->cmd_submit}" /> <input class="x_btn" type="submit" value="{$lang->cmd_submit}" style="vertical-align:top" />
</p> </p>
</form> </form>
</block> </block>
<select cond="$var->type == 'select'" name="{$name}" id="{$name}"> <select cond="$var->type == 'select'" name="{$name}" id="{$name}" style="width:auto">
<option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$key == $var->value">{$val->val}</option> <option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$key == $var->value">{$val->val}</option>
</select> </select>
@ -123,11 +120,11 @@
<input type="text" class="color-indicator" name="{$name}" id="{$name}" value="{$var->value}" /> <input type="text" class="color-indicator" name="{$name}" id="{$name}" value="{$var->value}" />
<p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p> <p id="categoy_color_help" hidden style="margin:8px 0 0 0">{$lang->about_category_color}</p>
</block> </block>
<span class="x_help-block">{$var->description}</span> <p class="x_help-block">{$var->description}</p>
</div> </div>
</div> </div>
</block> </block>
</ul> </section>
<section class="section"> <section class="section">
<h1 cond="$selected_layout->menu">{$lang->menu}</h1> <h1 cond="$selected_layout->menu">{$lang->menu}</h1>

7
modules/layout/tpl/layout_instance_list.html
View file

@ -1,11 +1,8 @@
<include target="header.html" /> <include target="header.html" />
<load target="js/adminList.js" usecdn="true" /> <load target="js/adminList.js" usecdn="true" />
<script> <script>
xe.lang.confirm_delete = '{$lang->confirm_delete}'; xe.lang.confirm_delete = '{$lang->confirm_delete}';
</script> </script>
<h2>{$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})</h2>
<div cond="$layout_info->layout != 'faceoff'" class="x_clearfix"> <div cond="$layout_info->layout != 'faceoff'" class="x_clearfix">
<div class="x_btn-group x_pull-right"> <div class="x_btn-group x_pull-right">
<a href="#insertLayout" class="x_btn modalAnchor">{$lang->cmd_insert}&hellip;</a> <a href="#insertLayout" class="x_btn modalAnchor">{$lang->cmd_insert}&hellip;</a>
@ -97,7 +94,7 @@
<label class="x_control-label">{$lang->title}</label> <label class="x_control-label">{$lang->title}</label>
<div class="x_controls"> <div class="x_controls">
<input type="text" name="title" value="" /> <input type="text" name="title" value="" />
<span class="x_help-block">{$lang->about_title}</span> <p class="x_help-inline">{$lang->about_title}</p>
</div> </div>
</div> </div>
</div> </div>

20
modules/module/lang/lang.xml
View file

@ -869,26 +869,6 @@ URL для менеджера модулей <a href="./?module=admin&amp;act=di
<value xml:lang="tr"><![CDATA[İşaretlediğiniz taktirde, kategori özelliği etkinleştirilecektir.]]></value> <value xml:lang="tr"><![CDATA[İşaretlediğiniz taktirde, kategori özelliği etkinleştirilecektir.]]></value>
<value xml:lang="vi"><![CDATA[Nếu chon, chức năng thể loại sẽ hoạt động.]]></value> <value xml:lang="vi"><![CDATA[Nếu chon, chức năng thể loại sẽ hoạt động.]]></value>
</item> </item>
<item name="about_use_grant_setup">
<value xml:lang="ko"><![CDATA[선택하면 권한을 관리할 수 있습니다.]]></value>
<value xml:lang="en"><![CDATA[If checked, the content extra vars function will be enabled.]]></value>
</item>
<item name="about_use_addition_setup">
<value xml:lang="ko"><![CDATA[선택하면 추가 설정을 할 수 있습니다.]]></value>
<value xml:lang="en"><![CDATA[If checked, the content extra vars function will be enabled.]]></value>
</item>
<item name="about_use_extra_vars">
<value xml:lang="ko"><![CDATA[선택하면 콘텐츠 확장변수를 사용할 수 있습니다.]]></value>
<value xml:lang="en"><![CDATA[If checked, the content extra vars function will be enabled.]]></value>
</item>
<item name="about_use_skin_extra_vars">
<value xml:lang="ko"><![CDATA[선택하면 스킨 확장변수를 사용할 수 있습니다.]]></value>
<value xml:lang="en"><![CDATA[If checked, the skin extra vars function will be enabled.]]></value>
</item>
<item name="about_use_mobile_skin_extra_vars">
<value xml:lang="ko"><![CDATA[선택하면 모바일 스킨 확장변수를 사용할 수 있습니다.]]></value>
<value xml:lang="en"><![CDATA[If checked, the mobile skin extra vars function will be enabled.]]></value>
</item>
<item name="about_list_count"> <item name="about_list_count">
<value xml:lang="ko"><![CDATA[한 페이지에 표시될 글 수를 지정할 수 있습니다. (기본 20개)]]></value> <value xml:lang="ko"><![CDATA[한 페이지에 표시될 글 수를 지정할 수 있습니다. (기본 20개)]]></value>
<value xml:lang="en"><![CDATA[You can limit the number of article to show on one page. The default is 20.]]></value> <value xml:lang="en"><![CDATA[You can limit the number of article to show on one page. The default is 20.]]></value>

8
modules/module/tpl/multilingual_v17.html
View file

@ -18,11 +18,9 @@
<form action="" class="x_tab-pane <!--@if(!$use_in_page)-->x_active<!--@end--> item" id="lang_create"> <form action="" class="x_tab-pane <!--@if(!$use_in_page)-->x_active<!--@end--> item" id="lang_create">
<fieldset class="editMode"> <fieldset class="editMode">
<textarea loop="$lang_supported => $code, $name" class="{$code}" rows="1" cols="12" title="{$name}" style="margin-right:5px"></textarea> <textarea loop="$lang_supported => $code, $name" class="{$code}" rows="1" cols="12" title="{$name}" style="margin-right:5px"></textarea>
<div class="x_clearfix"> <div class="x_clearfix btnArea">
<button type="reset" class="x_btn cancel">{$lang->cmd_cancel}</button> <button type="reset" class="x_btn cancel x_pull-left">{$lang->cmd_cancel}</button>
<span class="x_pull-right"> <button type="submit" class="x_btn x_btn-primary save-useit">{$lang->use_after_save}</button>
<button type="submit" class="x_btn x_btn-primary save-useit">{$lang->use_after_save}</button>
</span>
</div> </div>
</fieldset> </fieldset>
</form> </form>

2
modules/module/tpl/skin_config.html
View file

@ -87,7 +87,7 @@
{@$group = $val->group} {@$group = $val->group}
</section> </section>
<section class="section"> <section class="section">
<h1>{$group}</h1> <h2>{$group}</h2>
</block> </block>
<div class="x_control-group"> <div class="x_control-group">