Modal window layer markup fixed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12631 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2013-01-31 02:35:05 +00:00
parent 889ae03a4e
commit 4034d17455
25 changed files with 51 additions and 109 deletions

View file

@ -70,10 +70,10 @@
</form>
</section>
<!--// Modal -->
<div class="x_modal" id="editMenu">
<section class="x_modal" id="editMenu">
<form id="editForm" action="./" class="x_form-horizontal" style="margin:0">
<div class="x_modal-header">
<h3>{$lang->admin_menu_add}</h3>
<h1>{$lang->admin_menu_add}</h1>
</div>
<div class="x_modal-body">
<input type="hidden" name="module" value="menu" />
@ -95,7 +95,7 @@
</span>
</div>
</form>
</div>
</section>
<style>
.adminMap ul{background:#eee;list-style:none;margin:0;position:relative;border-radius:5px}
.adminMap li{position:relative}

View file

@ -901,23 +901,7 @@ jQuery(function($){
return this;
}
//$('.module_search').xeModuleSearchHtml();
});
/*
// Menu Selector
jQuery(function($){
var tmpCount = 0;
_xeModuleSearch = function(){
var t = this;
var $t = $(this);
var is_multiple = $t.data('multiple');
if(!is_multiple) is_multiple = '';
var id = '__module_searcher_' + tmpCount;
tmpCount++;
}
});
*/
jQuery(function($){
@ -959,33 +943,15 @@ jQuery(function($){
});
jQuery(function($){
/*
<fieldset class="x_modal" id="msgBox" style="display:none">
<div class="x_modal-header">
<h3 class="_title"></h3>
</div>
<div class="x_modal-body">
<p class="_text"></p>
</div>
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left _cancel">{$lang->cmd_cancel}</button>
<span class="x_btn-group x_pull-right">
<button type="button" class="x_btn x_btn-inverse _ok">{$lang->cmd_confirm}</button>
</span>
</div>
<button type="button" class="x_close _cancel">&times;</button>
</fieldset>
*/
$.xeMsgBox = {
htOptions : {}
};
//xe.cmd_cancel = "{$lang->cmd_cancel}";
//xe.cmd_confirm = "{$lang->cmd_confirm}";
var $msgBox = $.xeMsgBox.$msgBox = $("<div>").addClass("x_modal _common x").css('display', 'none').css('z-index', 9999);
var $msgBox = $.xeMsgBox.$msgBox = $("<section />").addClass("x_modal _common x").hide().css('z-index', 9999);
$msgBox.html('<button type="button" class="x_close _cancel">&times;</button>\
<div class="x_modal-header">\
<h3 class="_title"></h3>\
<h1 class="_title"></h1>\
</div>\
<div class="x_modal-body">\
<div class="_text"></div>\
@ -1123,7 +1089,7 @@ jQuery(function($){
this.showMsgBox(htOptions);
}
var $foggyLayer = $.xeMsgBox.$foggyLayer = $("<div>");
var $foggyLayer = $.xeMsgBox.$foggyLayer = $("<div />");
$foggyLayer.css({
position: 'absolute',
top:0,
@ -1163,7 +1129,7 @@ jQuery(function($){
jQuery(function($){
$.xeFoggy = {};
var $foggyLayer = $.xeFoggy.$foggyLayer = $("<div>");
var $foggyLayer = $.xeFoggy.$foggyLayer = $("<div />");
$foggyLayer.css({
position: 'absolute',
top:0,
@ -2095,12 +2061,6 @@ jQuery(function($){
// disable sitemap labels and shortcuts.
$container.find('._nodeType_1, ._nodeType_3').parent('li').addClass('x_disabled');
/*
if(sSelectedModule){
$container.find('._menu_url_'+sSelectedModule).click();
}
*/
}
function isSelectable($node){
@ -2230,11 +2190,6 @@ jQuery(function($){
if(aSubNode && aSubNode.length>0){
sSubTree = createTreeMarkup(aSubNode, sNodeSrl, sMenuTree, sMenuTreeNode);
}
/*
if(sMenuType === "shortcut"){
sText = sText + " ${s}";
}
*/
var sTextWithIcons = sText;
if(sIsStartModule){
sTextWithIcons += " ${h}";
@ -2274,14 +2229,6 @@ jQuery(function($){
$.exec_json('admin.getSiteAllList', {domain:""}, onSiteAllListCompleted);
}
// <a class="x_btn moduleTrigger tgAnchor xe-content-toggler xe-module-search" href="#__module_searcher_0">찾기</a>
/*
$t
.not('.xe-module-search')
.addClass('xe-module-search')
.parent()
.find('.moduleTrigger')
*/
function xeMenuSearch(ev){
var $btn = $(ev.target);
$.xeMenuSelectorVar.bMultiSelect = ""+$btn.data('multiple') == "true";

File diff suppressed because one or more lines are too long

View file

@ -134,7 +134,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="search_target" value="{$search_target}" />
<input type="hidden" name="search_keyword" value="{$search_keyword}" />
<div class="x_modal-header">
<h3>{$lang->comment_manager}: <span class="_sub"></span></h3>
<h1>{$lang->comment_manager}: <span class="_sub"></span></h1>
</div>
<div class="x_modal-body">
<table id="commentManageListTable" class="x_table x_table-striped x_table-hover">

View file

@ -32,7 +32,7 @@
});
</script>
<div class="x_modal x" id="__category_info" hidden>
<section class="x_modal x" id="__category_info" hidden>
<form ruleset="insertCategory" id="fo_category" action="./" method="post" class="x_form x_form-horizontal" style="margin:0">
<input type="hidden" name="module" value="document" />
<input type="hidden" name="act" value="procDocumentInsertCategory" />
@ -41,9 +41,8 @@
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="parent_srl" value="{$category_info->parent_srl}" />
<input type="hidden" name="category_srl" value="{$category_info->category_srl}" />
<div class="x_modal-header">
<h3>{$lang->category}</h3>
<h1>{$lang->category}</h1>
</div>
<div class="x_modal-body">
<div id="__parent_category_info" class="x_control-group">
@ -92,4 +91,4 @@
<button type="submit" class="x_btn x_btn-primary x_pull-right">{$lang->cmd_save}</button>
</div>
</form>
</div>
</section>

View file

@ -4,7 +4,7 @@
<input type="hidden" name="module" value="document" />
<input type="hidden" name="type" value="" />
<div class="x_modal-header">
<h3>{$lang->cmd_manage_document}</h3>
<h1>{$lang->cmd_manage_document}</h1>
</div>
<div class="x_modal-body x_form-horizontal" style="max-height:none">
<!--@if(count($document_list)==0)-->

View file

@ -111,7 +111,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="module_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" />
<div class="x_modal-header">
<h3>{$lang->document_manager}: <span class="_sub"></span></h3>
<h1>{$lang->document_manager}: <span class="_sub"></span></h1>
</div>
<div class="x_modal-body">
<section class="moveList">

View file

@ -126,7 +126,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="module_srl" value="" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'is_secret', $is_secret, 'search_target', $search_target, 'search_keyword', $search_keyword)}" cond="!empty($search_target) && !empty($search_keyword)" />
<div class="x_modal-header">
<h3>{$lang->document_manager}: <span class="_sub"></span></h3>
<h1>{$lang->document_manager}: <span class="_sub"></span></h1>
</div>
<div class="x_modal-body">
<section class="moveList">

View file

@ -157,7 +157,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="act" value="procFileAdminDeleteChecked" />
<input type="hidden" name="page" value="{$page}" />
<div class="x_modal-header">
<h3>{$lang->file_manager}: {$lang->delete}</h3>
<h1>{$lang->file_manager}: {$lang->delete}</h1>
</div>
<div class="x_modal-body">
<table width="100%" id="fileManageListTable" class="x_table x_table-striped x_table-hover">

View file

@ -84,8 +84,8 @@
<input type="hidden" name="unit_count" value="100" />
<input type="hidden" name="user_id" value="" />
<div class="x_modal-header">
<h3 id="preProgressMsg">{$lang->preprocessing}</h3>
<h3 id="progressMsg" style="display:none;">{$lang->import_step_desc[99]}</h3>
<h1 id="preProgressMsg">{$lang->preprocessing}</h1>
<h1 id="progressMsg" hidden>{$lang->import_step_desc[99]}</h1>
</div>
<div class="x_modal-body">
<div class="x_progress x_progress-striped x_active">

View file

@ -4,7 +4,7 @@ var addLang = '{$lang->cmd_insert}';
<form action="./" method="post" id="__layout_copy">
<div class="x_modal-header">
<h3>{$lang->cmd_layout_copy}</h3>
<h1>{$lang->cmd_layout_copy}</h1>
</div>
<div class="x_modal-body x_form-horizontal">
<input type="hidden" name="layout" value="{$layout->layout}" />

View file

@ -15,9 +15,9 @@
<p>{$lang->faceoff_migration[0]}</p>
<p><a href="#faceoff_migration_info" class="modalAnchor">{$lang->faceoff_migration[1]}</a></p>
</div>
<div cond="$layout == 'faceoff'" id="faceoff_migration_info" class="x_modal">
<section cond="$layout == 'faceoff'" id="faceoff_migration_info" class="x_modal">
<div class="x_modal-header">
<h3>{$lang->faceoff_migration[1]}<h3>
<h1>{$lang->faceoff_migration[1]}</h1>
</div>
<div class="x_modal-body">
<ol>
@ -50,7 +50,7 @@
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#faceoff_migration_info">{$lang->cmd_close}</button>
</div>
</div>
</section>
<div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>

View file

@ -46,18 +46,16 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}';
</div>
</div>
<div id="insertLayout" class="x_modal">
<section id="insertLayout" class="x_modal">
<form ruleset="insertLayout" action="./" class="x_form-horizontal">
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminInsert" />
<input type="hidden" name="layout" value="{$layout_info->layout}" />
<input type="hidden" name="_layout_type" value="{$type}" />
<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispLayoutAdminInstanceList')}" />
<div class="x_modal-header">
<h3>{$lang->cmd_insert}</h3>
<h1>{$lang->cmd_insert}</h1>
</div>
<div class="x_modal-body">
<div class="x_control-group">
<label class="x_control-label">{$lang->layout}</label>
@ -97,7 +95,6 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}';
</div>
</div>
</div>
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#insertLayout">{$lang->cmd_close}</button>
<span class="x_btn-group x_pull-right">
@ -105,4 +102,4 @@ xe.lang.confirm_delete = '{$lang->confirm_delete}';
</span>
</div>
</form>
</div>
</section>

View file

@ -86,9 +86,9 @@
</div>
</form>
<div class="x_modal" id="imageMark">
<section class="x_modal" id="imageMark">
<div class="x_modal-header">
<h3>{$lang->group_image_mark} {$lang->cmd_setup}</h3>
<h1>{$lang->group_image_mark} {$lang->cmd_setup}</h1>
</div>
<div class="x_modal-body">
<block cond="$fileBoxList">
@ -101,4 +101,4 @@
<button type="button" class="x_btn x_pull-left" data-hide="#exModal-1">Close</button>
<p class="x_pull-right">{$lang->add_group_image_mark}: <a href="{getUrl('', 'module','admin', 'act', 'dispModuleAdminFileBox')}" target="_blank">{$lang->link_file_box}</a></p>
</div>
</div>
</section>

View file

@ -1,6 +1,6 @@
<input type="hidden" name="member_join_form_srl" value="{$formInfo->member_join_form_srl}" />
<div class="x_modal-header">
<h3>{$lang->cmd_input_extend_form}</h3>
<h1>{$lang->cmd_input_extend_form}</h1>
</div>
<div class="x_modal-body">
<div class="x_control-group">

View file

@ -127,13 +127,13 @@
<button class="x_btn x_btn-inverse" type="submit">{$lang->cmd_search}</button>
<a class="x_btn" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'page', $page)}">{$lang->cmd_cancel}</a>
</form>
<div class="x_modal" id="listManager">
<section class="x_modal" id="listManager">
<form action="./" ruleset="updateSeletecdMemberInfo" method="post">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberAdminSelectedMemberManage" />
<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" />
<div class="x_modal-header">
<h3>{$lang->cmd_selected_user_manage}: <span class="_sub"></span></h3>
<h1>{$lang->cmd_selected_user_manage}: <span class="_sub"></span></h1>
</div>
<div class="x_modal-body">
<table class="x_table x_table-striped x_table-hover">
@ -164,7 +164,7 @@
</span>
</div>
</form>
</div>
</section>
<script>
jQuery(function($){
// Modal anchor activation

View file

@ -1,5 +1,5 @@
<!--%load_js_plugin("filebox")-->
<div class="x_modal" id="modalFilebox" cond="$use_filebox">
<section class="x_modal" id="modalFilebox" cond="$use_filebox">
<div class="x_modal-header">
<h1>File Box</h1>
</div>
@ -45,7 +45,7 @@
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left" data-hide="#modalFileBox">{$lang->cmd_close}</button>
</div>
</div>
</section>
<script>
xe.lang.cmd_delete = '{$lang->cmd_delete}';
</script>

View file

@ -1,8 +1,7 @@
<load target="js/manage_selected_module.js" usecdn="true" />
<div id="manageSelectedModule" class="x_modal x">
<section id="manageSelectedModule" class="x_modal x">
<div class="x_modal-header">
<h3>{$lang->do_selected}</h3>
<h1>{$lang->do_selected}</h1>
</div>
<div class="x_modal-body">
<table class="x_table x_table-striped x_table-hover" style="margin-bottom:20px">
@ -37,4 +36,4 @@
<div class="x_modal-footer">
<button type="button" class="x_btn x_pull-left">{$lang->cmd_close}</button>
</div>
</div>
</section>

View file

@ -7,7 +7,7 @@
<input type="hidden" name="act" value="procModuleAdminModuleGrantSetup" />
<input type="hidden" name="module_srls" value="{$module_srls}" />
<div class="x_modal-header">
<h3>{$lang->bundle_grant_setup}</h3>
<h1>{$lang->bundle_grant_setup}</h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>

View file

@ -1,6 +1,6 @@
<load target="./js/module_admin.js" usecdn="true" />
<div class="x_modal-header">
<h3>{$lang->module_selector}</h3>
<h1>{$lang->module_selector}</h1>
</div>
<form action="./" method="post" class="x_modal-body x_form-horizontal" style="max-height:none">
<input type="hidden" name="module" value="module" />

View file

@ -4,7 +4,7 @@
<input type="hidden" name="act" value="procModuleAdminModuleSetup" />
<input type="hidden" name="module_srls" value="{$module_srls}" />
<div class="x_modal-header">
<h3>{$lang->bundle_setup}</h3>
<h1>{$lang->bundle_setup}</h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>

View file

@ -4,9 +4,9 @@
unset($lang_supported[$lang_type]);
$lang_supported = array_merge($a, $lang_supported);
}
<div class="x_modal"|cond="!$use_in_page" id="g11n" style="display:none"|cond="!$use_in_page">
<div class="x_modal"|cond="!$use_in_page" id="g11n" hidden|cond="!$use_in_page">
<div class="x_modal-header" cond="!$use_in_page">
<h3>{$lang->cmd_multilingual}</h3>
<h1>{$lang->cmd_multilingual}</h1>
</div>
<div class="x_modal-body"|cond="!$use_in_page">
<div class="x_tabbable">

View file

@ -99,7 +99,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<input type="hidden" name="act" value="procTrackbackAdminDeleteChecked" />
<input type="hidden" name="page" value="{$page}" />
<div class="x_modal-header">
<h3>{$lang->trackback_manager}: {$lang->delete}</h3>
<h1>{$lang->trackback_manager}: {$lang->delete}</h1>
</div>
<div class="x_modal-body">
<table id="trackbackManageListTable" class="x_table x_table-striped x_table-hover">

View file

@ -106,7 +106,7 @@ var no_text_comment = '{$lang->no_text_comment}';
<input type="hidden" name="is_all" value="false" />
<input type="hidden" name="origin_module" value="{$origin_module}" />
<div class="x_modal-header">
<h3>{$lang->document_manager}: <span class="_sub"></span></h3>
<h1>{$lang->document_manager}: <span class="_sub"></span></h1>
</div>
<div class="x_modal-body">
<table id="trashManageListTable" class="x_table x_table-striped x_table-hover">

View file

@ -1,4 +1,4 @@
<div id="tmpPageSizeLayer" class="x_modal x wgs">
<section id="tmpPageSizeLayer" class="x_modal x wgs">
<button type="button" class="x_close" data-hide=".wgs">&times;</button>
<form action="index.php">
<div class="x_modal-header">
@ -113,11 +113,11 @@
<input class="x_btn x_btn-inverse" type="submit" value="{$lang->cmd_save}" />
</div>
</form>
<style scoped>
.wgs{margin:0;width:700px}
.wgs select{margin:0;width:auto}
.wgs input{margin:0 !important;width:50px}
</style>
</div>
<style scoped>
.wgs{margin:0;width:700px}
.wgs select{margin:0;width:auto}
.wgs input{margin:0!important;width:50px}
</style>
</section>
<!--%load_js_plugin("ui.colorpicker")-->