mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 03:01:43 +09:00
Issue 2390. [Admin UI Refactoring] Content > Data Migration. Fixed.
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11746 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong
parent
13fb6ee7ad
commit
31d0a99a39
6 changed files with 46 additions and 46 deletions
|
|
@ -15,9 +15,9 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .x_page-header{padding-bottom:0;border-bottom:2px solid #ddd}
|
||||
.x .x_page-header>h1{margin-bottom:0}
|
||||
.x h1,.x h2,.x h3,.x h4,.x h5,.x h6{line-height:1.5;font-weight:600;color:#666}
|
||||
.x h1{font-size:26px}
|
||||
.x h2{font-size:22px}
|
||||
.x h3{font-size:18px}
|
||||
.x h1{font-size:24px}
|
||||
.x h2{font-size:20px}
|
||||
.x h3{font-size:16px}
|
||||
.x h4{font-size:14px}
|
||||
.x h5{font-size:12px}
|
||||
.x h6{font-size:12px}
|
||||
|
|
@ -90,7 +90,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x label,
|
||||
.x input,
|
||||
.x button{line-height:16px}
|
||||
.x select{width:auto;margin:0 4px 0 0;padding:0;height:26px;line-height:26px}
|
||||
.x select{width:auto;padding:0;height:26px;line-height:26px}
|
||||
.x select[multiple]{height:auto}
|
||||
.x .x_tab-content{overflow-x:hidden}
|
||||
/* Custom Styles */
|
||||
|
|
@ -99,6 +99,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .section>h1>.snToggle{position:absolute;bottom:0;right:0;width:32px;height:32px;opacity:.5;filter:alpha(opacity=50)}
|
||||
.x .section>h1>.snToggle.x_icon-chevron-up{background-position:-279px -112px}
|
||||
.x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px}
|
||||
.x .section>h2{position:relative;border-bottom:1px dotted #ddd}
|
||||
.x .center{text-align:center}
|
||||
.x .search{margin:20px 0}
|
||||
.x .search>input[type="search"]{height:16px;line-height:16px;width:120px}
|
||||
|
|
@ -107,6 +108,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .btnArea{padding:8px 0;margin:20px 0;border-top:1px solid #ccc}
|
||||
.x li.active>a,
|
||||
.x a.active{color:#000;font-weight:bold;text-decoration:none}
|
||||
.x .module_search+[readonly]{border-top-right-radius:0;border-bottom-right-radius:0}
|
||||
.x .module_search+[readonly]+a.x_btn{border-top-left-radius:0;border-bottom-left-radius:0;vertical-align:top;margin-left:-5px}
|
||||
/* Image Sprite */
|
||||
.x a[target="_blank"]:after,
|
||||
.x>.body>.gnb>ul>li>a>i,
|
||||
|
|
@ -330,10 +333,10 @@ html[lang="mn"] .x .g11n.active>[disabled],
|
|||
#g11n #lang_search .editMode .cancel,
|
||||
#g11n #lang_search .editMode .save{display:inline-block}
|
||||
/* Module Search */
|
||||
.x .moduleWindow{position:absolute;z-index:100;padding:15px 20px;margin:4px 0 0 0}
|
||||
.x .moduleWindow{position:absolute;z-index:100;padding:15px 20px}
|
||||
.x .moduleWindow ul{margin-bottom:0}
|
||||
.x .moduleWindow .siteList{margin-right:14px}
|
||||
.x .moduleWindow .siteList>input[type="search"]{width:100%;padding-top:6px;padding-bottom:6px;border-radius:3px 3px 0 0}
|
||||
.x .moduleWindow .siteList>input[type="search"]{width:100%;padding-top:6px;padding-bottom:6px;border-radius:3px 3px 0 0;margin-bottom:0}
|
||||
.x .moduleWindow .siteList>ul{margin:-1px -14px 0 0}
|
||||
.x .moduleWindow .siteList>ul>li{background:#fff}
|
||||
.x .moduleWindow .siteList>ul>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0}
|
||||
|
|
@ -467,7 +470,7 @@ html[lang="mn"] .x .g11n.active>[disabled],
|
|||
.x .prgrs *{vertical-align:middle}
|
||||
.x .prgrs .pBar{position:relative;display:inline-block;background:#e9e9e9;margin:0 5px 0 0}
|
||||
.x .prgrs .pAction{display:inline-block;vertical-align:top;background:#99a6b6}
|
||||
.x .prgrs .pNum{position:absolute;width:100%;left:0;top:0;text-align:center;text-shadow:1px 1px 0 #fff}
|
||||
.x .prgrs .pNum{width:100%;left:0;top:0;text-align:center;text-shadow:1px 1px 0 #fff}
|
||||
.x .prgrs.prgrsSmall{font-size:14px;line-height:14px}
|
||||
.x .prgrs.prgrsSmall .pBar,
|
||||
.x .prgrs.prgrsSmall .pAction,
|
||||
|
|
|
|||
17
modules/admin/tpl/css/admin.min.css
vendored
17
modules/admin/tpl/css/admin.min.css
vendored
|
|
@ -15,9 +15,9 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .x_page-header{padding-bottom:0;border-bottom:2px solid #ddd}
|
||||
.x .x_page-header>h1{margin-bottom:0}
|
||||
.x h1,.x h2,.x h3,.x h4,.x h5,.x h6{line-height:1.5;font-weight:600;color:#666}
|
||||
.x h1{font-size:26px}
|
||||
.x h2{font-size:22px}
|
||||
.x h3{font-size:18px}
|
||||
.x h1{font-size:24px}
|
||||
.x h2{font-size:20px}
|
||||
.x h3{font-size:16px}
|
||||
.x h4{font-size:14px}
|
||||
.x h5{font-size:12px}
|
||||
.x h6{font-size:12px}
|
||||
|
|
@ -90,7 +90,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x label,
|
||||
.x input,
|
||||
.x button{line-height:16px}
|
||||
.x select{width:auto;margin:0 4px 0 0;padding:0;height:26px;line-height:26px}
|
||||
.x select{width:auto;padding:0;height:26px;line-height:26px}
|
||||
.x select[multiple]{height:auto}
|
||||
.x .x_tab-content{overflow-x:hidden}
|
||||
/* Custom Styles */
|
||||
|
|
@ -99,6 +99,7 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .section>h1>.snToggle{position:absolute;bottom:0;right:0;width:32px;height:32px;opacity:.5;filter:alpha(opacity=50)}
|
||||
.x .section>h1>.snToggle.x_icon-chevron-up{background-position:-279px -112px}
|
||||
.x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px}
|
||||
.x .section>h2{position:relative;border-bottom:1px dotted #ddd}
|
||||
.x .center{text-align:center}
|
||||
.x .search{margin:20px 0}
|
||||
.x .search>input[type="search"]{height:16px;line-height:16px;width:120px}
|
||||
|
|
@ -107,6 +108,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p
|
|||
.x .btnArea{padding:8px 0;margin:20px 0;border-top:1px solid #ccc}
|
||||
.x li.active>a,
|
||||
.x a.active{color:#000;font-weight:bold;text-decoration:none}
|
||||
.x .module_search+[readonly]{border-top-right-radius:0;border-bottom-right-radius:0}
|
||||
.x .module_search+[readonly]+a.x_btn{border-top-left-radius:0;border-bottom-left-radius:0;vertical-align:top;margin-left:-5px}
|
||||
/* Image Sprite */
|
||||
.x a[target="_blank"]:after,
|
||||
.x>.body>.gnb>ul>li>a>i,
|
||||
|
|
@ -330,10 +333,10 @@ html[lang="mn"] .x .g11n.active>[disabled],
|
|||
#g11n #lang_search .editMode .cancel,
|
||||
#g11n #lang_search .editMode .save{display:inline-block}
|
||||
/* Module Search */
|
||||
.x .moduleWindow{position:absolute;z-index:100;padding:15px 20px;margin:4px 0 0 0}
|
||||
.x .moduleWindow{position:absolute;z-index:100;padding:15px 20px}
|
||||
.x .moduleWindow ul{margin-bottom:0}
|
||||
.x .moduleWindow .siteList{margin-right:14px}
|
||||
.x .moduleWindow .siteList>input[type="search"]{width:100%;padding-top:6px;padding-bottom:6px;border-radius:3px 3px 0 0}
|
||||
.x .moduleWindow .siteList>input[type="search"]{width:100%;padding-top:6px;padding-bottom:6px;border-radius:3px 3px 0 0;margin-bottom:0}
|
||||
.x .moduleWindow .siteList>ul{margin:-1px -14px 0 0}
|
||||
.x .moduleWindow .siteList>ul>li{background:#fff}
|
||||
.x .moduleWindow .siteList>ul>li:first-child>a{border-top-left-radius:0;border-top-right-radius:0}
|
||||
|
|
@ -467,7 +470,7 @@ html[lang="mn"] .x .g11n.active>[disabled],
|
|||
.x .prgrs *{vertical-align:middle}
|
||||
.x .prgrs .pBar{position:relative;display:inline-block;background:#e9e9e9;margin:0 5px 0 0}
|
||||
.x .prgrs .pAction{display:inline-block;vertical-align:top;background:#99a6b6}
|
||||
.x .prgrs .pNum{position:absolute;width:100%;left:0;top:0;text-align:center;text-shadow:1px 1px 0 #fff}
|
||||
.x .prgrs .pNum{width:100%;left:0;top:0;text-align:center;text-shadow:1px 1px 0 #fff}
|
||||
.x .prgrs.prgrsSmall{font-size:14px;line-height:14px}
|
||||
.x .prgrs.prgrsSmall .pBar,
|
||||
.x .prgrs.prgrsSmall .pAction,
|
||||
|
|
|
|||
|
|
@ -118,8 +118,9 @@ jQuery(function($){
|
|||
return false;
|
||||
});
|
||||
// Section Toggle
|
||||
$('.x .section>h1').append('<button type="button" class="snToggle x_icon-chevron-up">Toggle this section</button>');
|
||||
$('.x .section>h1>.snToggle').click(function(){
|
||||
var $section_heading = $('.x .section').find('>h1:first');
|
||||
$section_heading.append('<button type="button" class="snToggle x_icon-chevron-up">Toggle this section</button>');
|
||||
$section_heading.find('>.snToggle').click(function(){
|
||||
var $this = $(this);
|
||||
var $section = $this.closest('.section');
|
||||
if(!$section.hasClass('collapse')){
|
||||
|
|
|
|||
5
modules/admin/tpl/js/admin.min.js
vendored
5
modules/admin/tpl/js/admin.min.js
vendored
|
|
@ -118,8 +118,9 @@ jQuery(function($){
|
|||
return false;
|
||||
});
|
||||
// Section Toggle
|
||||
$('.x .section>h1').append('<button type="button" class="snToggle x_icon-chevron-up">Toggle this section</button>');
|
||||
$('.x .section>h1>.snToggle').click(function(){
|
||||
var $section_heading = $('.x .section').find('>h1:first');
|
||||
$section_heading.append('<button type="button" class="snToggle x_icon-chevron-up">Toggle this section</button>');
|
||||
$section_heading.find('>.snToggle').click(function(){
|
||||
var $this = $(this);
|
||||
var $section = $this.closest('.section');
|
||||
if(!$section.hasClass('collapse')){
|
||||
|
|
|
|||
|
|
@ -1,26 +1,24 @@
|
|||
<include target="./header.html" />
|
||||
<load target="js/importer_admin.js" usecdn="true" />
|
||||
|
||||
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
|
||||
<p>{$XE_VALIDATOR_MESSAGE}</p>
|
||||
</div>
|
||||
|
||||
<form class="section" action="./" method="get" onsubmit="return doPreProcessing(this, 'documentForm')" id="documentForm">
|
||||
<input type="hidden" name="act" value="" />
|
||||
<input type="hidden" name="type" value="module" />
|
||||
<input type="hidden" name="unit_count" value="10" />
|
||||
<h1>{$lang->type_module}</h1>
|
||||
<h2>{$lang->type_module}</h2>
|
||||
<div class="x_control-group x_input-append checkxml">
|
||||
<label>{$lang->xml_path}</label>
|
||||
<input type="text" name="xml_file" value="./" />
|
||||
<button type="button" class="x_btn">{$lang->cmd_check_path}</button>
|
||||
<span class="x_help-inline" style="font-size:13px"></span>
|
||||
</div>
|
||||
<div class="x_control-group x_input-append xml ttxml">
|
||||
<div class="x_control-group xml ttxml">
|
||||
<label>{$lang->data_destination}</label>
|
||||
<input type="text" name="target_module" class="module_search" />
|
||||
</div>
|
||||
<div class="x_control-group x_input-append ttxml">
|
||||
<div class="x_control-group ttxml">
|
||||
<label>{$lang->guestbook_destination}</label>
|
||||
<input type="text" name="guestbook_target_module" class="module_search" />
|
||||
</div>
|
||||
|
|
@ -36,11 +34,10 @@
|
|||
<button type="submit" class="x_btn x_btn-primary">{$lang->importer}</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<form class="section" action="./" method="get" onsubmit="return doPreProcessing(this, 'memberForm')" id="memberForm">
|
||||
<input type="hidden" name="type" value="member" />
|
||||
<input type="hidden" name="unit_count" value="100" />
|
||||
<h1>{$lang->type_member}</h1>
|
||||
<h2>{$lang->type_member}</h2>
|
||||
<div class="x_control-group x_input-append checkxml">
|
||||
<label>{$lang->xml_path}</label>
|
||||
<input type="text" name="xml_file" value="./" />
|
||||
|
|
@ -55,11 +52,10 @@
|
|||
<button type="submit" class="x_btn x_btn-primary">{$lang->importer}</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<form class="section" action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
|
||||
<input type="hidden" name="type" value="message" />
|
||||
<input type="hidden" name="unit_count" value="100" />
|
||||
<h1>{$lang->type_message}</h1>
|
||||
<h2>{$lang->type_message}</h2>
|
||||
<div class="x_control-group x_input-append checkxml">
|
||||
<label>{$lang->xml_path}</label>
|
||||
<input type="text" name="xml_file" value="./" />
|
||||
|
|
@ -71,8 +67,8 @@
|
|||
</div>
|
||||
</form>
|
||||
<a href="#process" class="modalAnchor"></a>
|
||||
<div class="x_modal" id="process" style="display:none;">
|
||||
<form action="./" method="get" onsubmit="return doImport()" id="fo_process" class="fg">
|
||||
<div class="x_modal" id="process">
|
||||
<form action="./" method="get" onsubmit="return doImport()" id="fo_process">
|
||||
<input type="hidden" name="type" value="" />
|
||||
<input type="hidden" name="total" value="" />
|
||||
<input type="hidden" name="cur" value="" />
|
||||
|
|
@ -81,21 +77,17 @@
|
|||
<input type="hidden" name="guestbook_target_module" value="" />
|
||||
<input type="hidden" name="unit_count" value="100" />
|
||||
<input type="hidden" name="user_id" value="" />
|
||||
<p style="text-align:center">
|
||||
<span class="prgrs prgrsMedium">
|
||||
<div class="x_modal-header">
|
||||
<h3 id="preProgressMsg">{$lang->preprocessing}</h3>
|
||||
<h3 id="progressMsg" style="display:none;">{$lang->import_step_desc[99]}</h3>
|
||||
</div>
|
||||
<div class="x_modal-body">
|
||||
<div class="x_progress x_progress-striped x_active">
|
||||
<div class="x_bar" id="progressBar" style="width: 0%"></div>
|
||||
</div>
|
||||
<strong id="progressPercent">0%</strong>
|
||||
(<span class="pNum"><span id="completeCount">0</span>/<span id="totalCount">0</span></span>)
|
||||
</div>
|
||||
</span>
|
||||
</p>
|
||||
<div class="x_modal-header">
|
||||
<h3 id="preProgressMsg">{$lang->preprocessing}</h3>
|
||||
<h3 id="progressMsg" style="display:none;">{$lang->import_step_desc[99]}</h3>
|
||||
</div>
|
||||
<div class="x_modal-body">
|
||||
<div class="x_progress x_progress-striped x_active">
|
||||
<div class="x_bar" id="progressBar" style="width: 0%"></div>
|
||||
</div>
|
||||
<strong id="progressPercent">0%</strong>
|
||||
(<span id="completeCount">0</span>/<span id="totalCount">0</span>)
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ $('.checkxml')
|
|||
})
|
||||
.end()
|
||||
.find('.x_help-inline').hide().end()
|
||||
.closest('form').find('>.ttxml').hide().end().end()
|
||||
.closest('form').find('>.ttxml')/*.hide()*/.end().end()
|
||||
.closest('form').find(':submit').attr('disabled','disabled');
|
||||
|
||||
// hide 'sync member' block
|
||||
|
|
@ -109,7 +109,7 @@ function doPreProcessing(form, formId) {
|
|||
|
||||
// show modal window
|
||||
$process = $('#process');
|
||||
if(!$process.find('.bg').length) $process.prepend('<span class="bg" />').appendTo('body');
|
||||
if(!$('body').children('.x_modal-backdrop').length) $('body').append('<div class="x_modal-backdrop" />');
|
||||
$('a[href="#process"].modalAnchor').trigger('open.mw');
|
||||
|
||||
exec_xml(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue