Site edit UI cleaning.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12318 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-11-28 06:44:48 +00:00
parent 6c968803a3
commit 5932630e58
5 changed files with 47 additions and 46 deletions

View file

@ -99,8 +99,8 @@ body>.x,
.x_modal{padding:0;width:90%;margin:-250px 0 0 -45%;max-width:none;border-radius:6px;background-color:#333;background-image:-webkit-linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);background-image:-moz-linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);background-image:-o-linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);background-image:linear-gradient(top, #666, #333 28px, #000 28px, #333 56px);}
.x_modal>form{margin:0 !important}
.x_modal>.x_close{position:absolute;top:10px;right:5px;font-size:21px;color:#fff}
.x_modal .x_modal-header{padding:17px 15px;border-bottom:1px solid #aaa}
.x_modal .x_modal-header>h3{color:#fff;text-shadow:0 -1px 0 #000}
.x_modal .x_modal-header{padding:15px;border-bottom:1px solid #aaa}
.x_modal .x_modal-header>h3{color:#fff;text-shadow:0 -1px 0 #000;font-size:16px}
.x_modal .x_modal-body{background:#fff}
.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}
@ -134,6 +134,7 @@ body>.x,
.x .x_well>*:last-child{margin-bottom:0}
.x legend{font-size:14px;font-weight:bold;line-height:24px}
.x label{font-weight:inherit}
.x label:only-child{margin-bottom:0}
.x p:last-child{margin-bottom:0}
.x form{margin:0 0 10px 0}
.x form .x_btn-primary[type="submit"]:only-of-type{min-width:160px}

File diff suppressed because one or more lines are too long

View file

@ -8,9 +8,9 @@ body>.x{max-width:none !important}
#site .btnBoth,
#site .x_btn-group{text-align:right;margin:10px 0}
#site .btnBoth:after{content:"";display:block;clear:both}
.col{display:inline-block;*display:inline;*zoom:1;vertical-align:top;position:relative;background:#ddd;white-space:normal;height:100%;min-width:220px;padding:10px;margin:0 4px 0 0;border:4px solid #ddd;border-radius:5px;box-shadow:1px 1px 1px #999}
.col{display:inline-block;*display:inline;*zoom:1;vertical-align:top;position:relative;background-color:#ddd;white-space:normal;height:100%;min-width:220px;padding:10px;margin:0 4px 0 0;border-radius:5px;box-shadow:1px 1px 1px #999;background-image:-webkit-linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);background-image:-moz-linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);background-image:-o-linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);background-image:linear-gradient(top, #eee, #ddd 18px, #ccc 18px, #ddd 33px);}
.col>h1,
.col>*>h1{line-height:32px;font-size:14px;margin:-10px -10px 0 -10px;color:#000;padding:0 8px;text-shadow:0 1px 0 #fff;max-width:270px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
.col>*>h1{line-height:32px !important;font-size:16px !important;margin:-10px -10px 0 -10px;color:#000 !important;padding:0 8px;text-shadow:0 1px 0 #fff;max-width:270px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
.col>*>h1>a{color:#000;text-decoration:none}
.col>*>h1>a[target="_blank"]:after{vertical-align:middle;opacity:.75;filter:alpha(opacity=75)}
.col>*>h1>a:hover,
@ -20,7 +20,7 @@ body>.x{max-width:none !important}
.col>.x_close:focus{opacity:1;filter:alpha(opacity=100)}
.col input[type="checkbox"],
.col input[type="radio"]{margin:0}
.col .cnt{overflow-x:hidden;overflow-y:auto;padding:10px;margin:0 -10px;border-radius:5px;background:#fff;border:1px solid #999;border-right:0;border-bottom:0}
.col .cnt{overflow-x:hidden;overflow-y:auto;padding:10px;margin:0 -6px;border-radius:5px;background:#fff;border:1px solid #999;border-right:0;border-bottom:0}
.col .cnt>ul{margin:0;padding:0;list-style:none}
.col .cnt label{font-weight:normal}
.col .cnt label:only-child{cursor:pointer}
@ -45,7 +45,7 @@ body>.x{max-width:none !important}
.mapi>ul>li>a:focus,
.mapi>ul>li>a.jstree-clicked,
.mapi>ul>li>a.jstree-hovered{text-shadow:none}
.mapi>ul>li>ul{margin:3px 0 0 18px;padding:7px 0}
.mapi>ul>li>ul{margin:0 0 0 18px}
.mapi>ul>li>ul>li{margin-left:0}
/* li>a */
.mapi li>a{border:0 !important;padding:0 8px !important;margin:0 0 1px 0;border-radius:3px;position:relative;z-index:2;height:23px;line-height:23px;max-width:160px;overflow:hidden;text-overflow:ellipsis;-webkit-transition:.2s;-moz-transition:.2s;-o-transition:.2s;transition:.2s}
@ -54,6 +54,8 @@ body>.x{max-width:none !important}
.mapi .jstree-clicked>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
/* Plugin style override */
.mapi a>.jstree-icon{display:none}
.mapi .jstree-open>.jstree-icon,
.mapi .jstree-closed>.jstree-icon{background-color:#fff}
/* Nav */
.col .nav li{border-top:1px solid #ddd;position:relative;white-space:nowrap}
.col .nav li:first-child{border-top:0}
@ -121,7 +123,7 @@ body>.x{max-width:none !important}
.download .item.installed.up_to_date ._need_to_update{display:none}
.download .item.installed ._already_up_to_date{display:none}
.download .item.installed.up_to_date ._already_up_to_date{display:block}
.download ._pagination{position:absolute;bottom:3px;left:0;width:100%}
.download ._pagination{position:absolute;bottom:4px;left:4px;right:4px}
.download ._pagination>.x_pagination,
.download ._pagination>.search{margin:0}
.download ._pagination>.x_pagination{text-shadow:0 1px 0 #fff}
@ -130,7 +132,6 @@ body>.x{max-width:none !important}
.download ._pagination>.x_pagination a:hover,
.download ._pagination>.x_pagination a:focus{font-weight:bold}
.download ._pagination>.x_pagination .x_active>a{color:#000}
/* Theme(layout|skin) */
.theme img{width:110px;border:1px solid #ddd}
.theme label{margin:0;padding:8px 0;position:relative;border-bottom:1px solid #ddd}
@ -156,6 +157,12 @@ body>.x{max-width:none !important}
.theme ul ul>li>a:hover>i,
.theme ul ul>li>a:focus>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png)}
.theme ul ul>li>button{width:100%;padding-right:0}
/* Add Sitemap */
#add_sitemap [for="sitemapName"]{font-weight:bold}
#add_sitemap .btnBoth{position:absolute;margin:0;bottom:4px;left:4px;right:4px}
/* Sitemap General */
#sitemap_general [for="sitemapName2"]{font-weight:bold}
#sitemap_general .btnBoth{position:absolute;margin:0;bottom:4px;left:4px;right:4px}
/* Properties */
#properties ul{margin:0;padding:0 0 8px 0}
#properties li{position:relative;white-space:nowrap}
@ -195,16 +202,17 @@ body>.x{max-width:none !important}
#add_menu .desc>a:after{content:normal}
#add_menu .desc>a:hover,
#add_menu .desc>a:focus{opacity:1;filter:alpha(opacity=100)}
#add_menu .x_btn-group{position:absolute;margin:0;left:0;bottom:0;width:100%}
#add_menu .x_btn-group{position:absolute;margin:0;left:4px;right:4px;bottom:4px}
/* Default */
#default .menuType{border:1px solid #ddd;border-left:0;border-right:0}
#default [for="lang_menuName"],
#default [for="lang_pageTitle"],
#default [for="mid2"]{font-weight:bold}
#default .btnBoth{position:absolute;width:100%;left:0;bottom:0;margin:0}
#default .btnBoth{position:absolute;left:4px;right:4px;bottom:4px;margin:0}
/* Auth */
#auth li>label:first-child{font-weight:bold;line-height:30px;margin:0}
#auth select{height:26px;margin:0 0 5px 0;padding:0;width:100%}
#auth .x_btn-group{position:absolute;width:100%;left:0;bottom:0;margin:0}
#auth .x_btn-group{position:absolute;left:4px;right:4px;bottom:4px;margin:0}
/* Image Button */
#imgbtn form{padding:8px 0 0 0;margin:0}
#imgbtn figure{margin:0}
@ -233,6 +241,7 @@ body>.x{max-width:none !important}
#design .x_icon-zoom-in{position:absolute;right:4px;bottom:4px;width:24px;height:24px;background-color:#fff;opacity:.75;filter:alpha(opacity:75);background-position:-331px 5px}
#design .x_icon-zoom-in:after{content:normal}
#design .mask{position:absolute;width:100%;height:100%;top:0;left:0}
#design .btnBoth{position:absolute;bottom:4px;left:4px;right:4px;margin:0}
#design._mobile_view_disabled #mobile .shadow,
#design._mobile_view_disabled._mobileMode .nav,
#design._mobileMode .langDesktop,

View file

@ -276,7 +276,7 @@
'.jstree-rtl li { margin-left:0; margin-right:18px; } ' +
'.jstree > ul > li { margin-left:0px; } ' +
'.jstree-rtl > ul > li { margin-right:0px; } ' +
'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; vertical-align:top; background-color:#fff !important } ' +
'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; vertical-align:top; } ' +
'.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } ' +
'.jstree a:focus { outline: none; } ' +
'.jstree a > ins { height:16px; width:16px; } ' +

View file

@ -53,19 +53,17 @@
</li>
</script>
</section>
<button type="button" class="x_btn x_btn-link _addSiteMap1" data-admin-show="#add_sitemap" style="position:absolute;right:5px;bottom:4px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->add_new_sitemap}</button>
<button type="button" class="x_btn x_btn-link _addSiteMap1" data-admin-show="#add_sitemap" style="position:absolute;right:5px;bottom:7px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->add_new_sitemap}</button>
</div>
</div>
<div class="col" id="add_sitemap" style="display:none">
<section>
<h1>{$lang->add_new_sitemap}</h1>
<div class="cnt">
<ul class="nav _itemList">
<ul class="_itemList">
<li>
<div class="multilingual x_input-append">
<label for="sitemapName">{$lang->sitemap_name}</label>
<input id="sitemapName" class="_sitemapName" type="text" required style="width:179px">
</div>
<label for="sitemapName">{$lang->sitemap_name}</label>
<input id="sitemapName" class="_sitemapName" type="text" required>
</li>
</ul>
<div class="btnBoth">
@ -95,12 +93,10 @@
<section>
<h1>{$lang->edit_sitemap}</h1>
<div class="cnt">
<ul class="nav _itemList">
<ul class="_itemList">
<li>
<div class="multilingual x_input-append">
<label for="sitemapName2">{$lang->sitemap_name}</label>
<input id="sitemapName2" class="_sitemapName" type="text" required style="width:179px">
</div>
<label for="sitemapName2">{$lang->sitemap_name}</label>
<input id="sitemapName2" class="_sitemapName" type="text" required>
</li>
</ul>
<div class="btnBoth">
@ -143,7 +139,7 @@
<li><a href="#add_menu" data-admin-show="#add_menu" data-param='{ "moduleName" : "${ModuleName}", "moduleTitle": "${ModuleTitle}" }'>${ModuleTitle} <i class="x_icon-circle-arrow-right"></i></a></li>
</script>
</ul>
<a href="#download" class="x_btn x_btn-link" data-admin-show="#download" style="position:absolute;right:5px;bottom:4px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_menu_types}</a>
<a href="#download" class="x_btn x_btn-link" data-admin-show="#download" style="position:absolute;right:5px;bottom:7px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_menu_types}</a>
</div>
</section>
<button type="button" class="x_close" data-admin-hide="#add">&times;</button>
@ -161,7 +157,7 @@
</div>
</li>
<li class="typePage">
<label for="mid1">{$lang->menu_id} <a href="#help_menuId" class="x_icon-question-sign" data-admin-toggle="#mid1_help">?</a></label>
<label for="mid1">{$lang->menu_id} <a href="#help_menuId" class="x_icon-question-sign" data-admin-toggle="#mid1_help">{$lang->help}</a></label>
<div id="mid1_help" class="x_alert x_alert-info" style="display:none;width:169px">
<button type="button" class="x_close" data-admin-hide="#mid1_help">×</button>
<p>{$lang->about_menu_id} {$lang->about_new_menu_id}</p>
@ -225,7 +221,7 @@
</li>
<!--li class="menuType">
<div style="line-height:30px">
<strong>{$lang->menu_type}</strong>: <span class="module_type"></span> <a href="#menuTypeHelpInDefault" class="x_icon-question-sign" data-admin-toggle="#menuTypeHelpInDefault">?</a>
<strong>{$lang->menu_type}</strong>: <span class="module_type"></span> <a href="#menuTypeHelpInDefault" class="x_icon-question-sign" data-admin-toggle="#menuTypeHelpInDefault">{$lang->help}</a>
</div>
<div id="menuTypeHelpInDefault" class="x_alert x_alert-info" style="display:none;width:169px">
<button type="button" class="x_close" data-admin-hide="#menuTypeHelpInDefault">×</button>
@ -234,14 +230,14 @@
</li-->
<li class="typePage" style="border-top:1px solid #DDD">
<label for="mid2">{$lang->browser_title} <a href="#help_menuId" class="x_icon-question-sign" data-admin-toggle="#mid2_help">?</a></label>
<div id="mid2_help" class="x_alert x_alert-info" style="display:none;width:169px">
<button type="button" class="x_close" data-admin-hide="#mid2_help">×</button>
<label for="lang_pageTitle">{$lang->browser_title} <a href="#help_menuName" class="x_icon-question-sign" data-admin-toggle="#help_menuName">{$lang->help}</a></label>
<div id="help_menuName" class="x_alert x_alert-info" style="display:none;width:169px">
<button type="button" class="x_close" data-admin-hide="#help_menuName">×</button>
<p>{$lang->about_browser_title}</p>
</div>
<input id="menuName" class="_menuName lang_code" type="text">
<input id="pageTitle" class="_menuName lang_code" type="text">
<label for="mid2">{$lang->menu_id} <a href="#help_menuId" class="x_icon-question-sign" data-admin-toggle="#mid2_help">?</a></label>
<label for="mid2">{$lang->menu_id} <a href="#help_menuId" class="x_icon-question-sign" data-admin-toggle="#mid2_help">{$lang->help}</a></label>
<div id="mid2_help" class="x_alert x_alert-info" style="display:none;width:169px">
<button type="button" class="x_close" data-admin-hide="#mid2_help">×</button>
<p>{$lang->about_menu_id}</p>
@ -269,11 +265,8 @@
</div>
</div>
</li>
<li style="border-top:1px solid #DDD">
<div id="menuTypeHelpInDefault" style="width:210px">
<p>{$lang->about_menu_type_in_default}</p>
</div>
<li>
<p id="menuTypeHelpInDefault" style="width:220px">{$lang->about_menu_type_in_default}</p>
</li>
</ul>
<div class="btnBoth">
@ -288,9 +281,7 @@
<fieldset>
<h1>{$lang->menu_img_btn}</h1>
<div class="cnt">
<div style="border-bottom:1px solid #DDD; width:210px">
<p>{$lang->about_imgbtn}</p>
</div>
<p style="border-bottom:1px solid #ddd;width:220px;padding-bottom:10px">{$lang->about_imgbtn}</p>
<form action="?module=menu&act=procMenuAdminButtonUpload" class="_btn_normal" target="submitTarget" method="post" enctype="multipart/form-data">
<input name="menu_item_srl" type="hidden" value=""/>
<input name="xe_js_callback" type="hidden" value="top.onBtnImgUploaded"/>
@ -395,7 +386,7 @@
<li><a href="#skin" data-admin-show="#skin" data-param='{ "moduleType" : "${ModuleType}"}'>${ModuleTypeTitle} [<span class="themeName _skinName">${SkinName}</span>] <i class="x_icon-circle-arrow-right"></i></a></li>
</script>
</ul>
<div class="btnBoth" style="position:absolute;bottom:0;left:0;margin:0;width:100%">
<div class="btnBoth">
<button type="reset" class="x_btn x_pull-left _btn_cancel">{$lang->cmd_cancel}</button>
<button type="button" class="x_btn x_btn-primary x_pull-right _btn_save">
<span class="langDesktop">{$lang->desktop_settings}</span>
@ -441,7 +432,7 @@
</ul>
<i class="mask"></i>
</div>
<a href="#downloadLayout" data-admin-show="#downloadLayout" class="x_btn x_btn-link" style="position:absolute;right:5px;bottom:4px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_layouts}</a>
<a href="#downloadLayout" data-admin-show="#downloadLayout" class="x_btn x_btn-link" style="position:absolute;right:5px;bottom:7px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_layouts}</a>
</div>
</form>
<button type="button" class="x_close" data-admin-hide="#layout">&times;</button>
@ -537,7 +528,7 @@
</li>
</script>
</ul>
<a href="#downloadSkin" data-admin-show="#downloadSkin" class="x_btn x_btn-link" style="position:absolute;right:5px;bottom:4px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_skins}</a>
<a href="#downloadSkin" data-admin-show="#downloadSkin" class="x_btn x_btn-link" style="position:absolute;right:5px;bottom:7px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_skins}</a>
</div>
</div>
</form>
@ -642,7 +633,7 @@
<button type="button" class="x_btn x_btn-inverse _ok">{$lang->cmd_confirm}</button>
</span>
</div>
<button type="button" class="x_close _cancel" style="position:absolute;top:0;right:0">&times;</button>
<button type="button" class="x_close _cancel">&times;</button>
</fieldset>
<iframe name="submitTarget" src="about:_blank" style="position:absolute; top:-10000px; left:-10000px; width:1025px;height:769px"></iframe>
@ -3808,8 +3799,8 @@ console.log(11, htDesign.htLayoutSrl.P);
// Set #site height fix
$(window).resize(function(){
var wHeigh = $(window).height();
$('#site').height(wHeigh - 155).find('>.col').height(wHeigh - 205).find('.cnt').height(wHeigh - 275);
$('#properties, #propertiesRoot, #imgbtn, #layoutSetup, #layoutMarkupSetup, #skinSetup').find('.cnt').height(wHeigh - 262);
$('#site').height(wHeigh - 155).find('>.col').height(wHeigh - 205).find('.cnt').height(wHeigh - 272);
$('#properties, #propertiesRoot, #imgbtn, #layoutSetup, #layoutMarkupSetup, #skinSetup').find('.cnt').height(wHeigh - 242);
}).resize();
var sPackageSrl = getParameterByName('continue_install_package');