Module selector > Tree UI renewal.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12465 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-12-26 07:09:00 +00:00
parent 5954d863fb
commit b8af606fdf
6 changed files with 82 additions and 39 deletions

View file

@ -104,7 +104,6 @@ body>.x,
.x_modal>.x_close{position:absolute;top:10px;right:5px;font-size:21px;color:#fff}
.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-header>h3:before{content:"";display:inline-block;width:14px;height:14px;background-position:-240px -120px;margin:0 6px 0 0;vertical-align:middle;opacity:.6;filter:alpha(opacity=60)}
.x_modal .x_modal-body{background:#fff;min-height:50px}
.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}
@ -181,13 +180,19 @@ body>.x,
.x input.switch{width:42px;height:16px;opacity:0;filter:alpha(opacity=0);position:relative;z-index:2}
.x input.switch+i{position:relative !important;z-index:1;left:auto !important;top:auto !important;right:auto !important;bottom:auto !important;margin:0 0 0 -42px !important;opacity:1 !important;filter:alpha(opacity=100) !important;padding:0;vertical-align:middle;display:inline-block;width:42px;height:16px;background-image:url(../../../../modules/admin/tpl/img/toggleSwitch.png) !important;background-repeat:no-repeat}
.x input[checked].switch+i{background-position:0 -16px !important}
.x_modal._common {width:600px;margin-left:-300px}
.x_modal._common._small{width:400px;margin-left:-200px}
.x_modal._common._nobody .x_modal-body,
.x_modal._common._type_alert ._cancel{display:none}
.x_modal._common._nobody .x_modal-footer{border-top:0}
/* Image Sprite */
.x a[target="_blank"]:after,
.x>.body>.gnb>ul>li>a>i,
.x .dashboard>div>section>h2:before{background-image:url(../../../../common/img/glyphicons-halflings.png);background-repeat:no-repeat}
.x>.body>.gnb>ul>li.open>a>i,
.x>.body>.gnb>ul>li.active>a>i,
.x_modal .x_modal-header>h3:before{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat}
.x_modal-body .tree .jstree-hovered>i,
.x_modal-body .tree .jstree-clicked>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat}
@media all and (max-width:800px){
.x>.body>.gnb>ul>li:first-child>a>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat}
}
@ -458,15 +463,40 @@ html[lang="mn"] .x .g11n.active>[disabled],
.x #mobiconPreview span{position:absolute;width:32px;text-align:center;top:52px;left:10px;color:#fff;font-size:9px}
/* Layer */
.x .layer{position:absolute;display:none;font-weight:normal}
/* Tree: Works with ./modules/menu/tpl/css/themes/default/style.css */
.tree{margin:3px 0 5px 0;min-width:200px;background-color:transparent !important}
.tree ul{margin:0;padding:0;list-style:none}
.tree li{padding:0;white-space:nowrap;position:relative;border-radius:3px;vertical-align:top}
.tree li>ul{margin:0}
.tree a{text-decoration:none}
.tree>ul{padding:1px}
.tree .jstree-rename-input{margin-left:-16px;z-index:2}
/* Root */
.tree>ul>li{margin-top:30px;position:relative}
.tree>ul>li:before{content:"";display:block;border-top:1px dotted #ccc;position:relative;top:-15px}
.tree>ul>li:first-child{margin-top:0}
.tree>ul>li:first-child:before{content:normal}
.tree>ul>li>a{font-weight:bold;text-shadow:0 1px 0 #fff;vertical-align:middle}
.tree>ul>li>a:hover,
.tree>ul>li>a:focus,
.tree>ul>li>a.jstree-clicked,
.tree>ul>li>a.jstree-hovered{text-shadow:none}
.tree>ul>li>ul{margin:0 0 0 18px}
.tree>ul>li>ul>li{margin-left:0}
/* li>a */
.tree 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}
.tree li>a>i{opacity:.5;filter:alpha(opacity=50)}
.tree .jstree-hovered>i,
.tree .jstree-clicked>i{opacity:1;filter:alpha(opacity=100)}
/* Plugin style override */
.tree a>.jstree-icon{display:none}
.tree .jstree-open>.jstree-icon,
.tree .jstree-closed>.jstree-icon{background-color:#fff}
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
/* ---------- Deprecated UI supports - Please do not use this CSS styles below. It will be removed as soon as possible. ---------- */
/* Favorite On | Off */
.x .fvOff,
.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(../img/iconFavorite.gif) no-repeat;border:0}
.x .fvOn{background-position:0 -16px}
/* Section & Heading */
.x .h2,
.x .h3,
@ -598,8 +628,3 @@ html[lang="mn"] .x .g11n.active>[disabled],
.modalClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px}
.modalBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden}
.x_modal._common {width:600px;margin-left:-300px}
.x_modal._common._small{width:400px;margin-left:-200px}
.x_modal._common._nobody .x_modal-body,
.x_modal._common._type_alert ._cancel{display:none}
.x_modal._common._nobody .x_modal-footer{border-top:0}

File diff suppressed because one or more lines are too long

View file

@ -987,18 +987,16 @@ jQuery(function($){
//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);
$msgBox.html('<button type="button" class="x_close _cancel">×</button>\
$msgBox.html('<button type="button" class="x_close _cancel">&times;</button>\
<div class="x_modal-header">\
<h3 class="_title"></h3>\
</div>\
<div class="x_modal-body">\
<p class="_text"></p>\
<div class="_text"></div>\
</div>\
<div class="x_modal-footer">\
<button type="button" class="x_btn x_pull-left _cancel">'+xe.cmd_cancel+'</button>\
<span class="x_btn-group x_pull-right">\
<button type="submit" class="x_btn x_btn-inverse _ok">'+xe.cmd_confirm+'</button>\
</span>\
<button type="submit" class="x_btn x_btn-inverse x_pull-right _ok">'+xe.cmd_confirm+'</button>\
</div>');
//console.log($msgBox.html());
@ -1080,6 +1078,7 @@ jQuery(function($){
$.xeMsgBox.showMsgBox = function(htOptions){
// sTitle, sText, fnOnOK, fnOnCancel, bSmall, bAlert, fnOnShow, fnOnHide, bDanger
$('head>link[rel="stylesheet"]:last').after('<link rel="stylesheet" href="./modules/menu/tpl/css/themes/default/style.css" />');
htOptions = $.xeMsgBox.htOptions = htOptions || {};
var sTitle = htOptions.sTitle || "";
@ -2243,7 +2242,7 @@ jQuery(function($){
$.xeMsgBox.confirmDialog({
sTitle : 'TITLE',
sText : '<div style="width:368px;height:300px;border:1px solid;overflow:scroll"><div class="tree"></div></div>',
sText : '<select style="width:100%"><option>...</option></select><div class="tree"></div>',
bSmall: true,

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,35 @@
@charset "utf-8";
/* Image Sprite */
.mapi .jstree-hovered>i,
.mapi .jstree-clicked>i,
.col .nav li>a:hover>i,
.col .nav li>a:focus>i,
.col .nav li.active>a>i,
.theme label>a:hover,
.theme label>a:focus,
.theme ul ul>li>a:hover>i,
.theme ul ul>li>a:focus>i,
#properties li>*:hover>i,
#properties li>*:active>i,
#properties li>*:focus>i,
#properties li.active>*>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat}
/* Opacity 100% */
.col>.x_close:hover,
.col>.x_close:focus,
.mapi .jstree-hovered>i,
.mapi .jstree-clicked>i,
.col .nav li>a:hover>i,
.col .nav li>a:focus>i,
.col .nav li.active>a>i,
.download .done>i,
.download .update>i,
.download .x_icon-download-alt,
#properties li>*:hover>i,
#properties li>*:active>i,
#properties li>*:focus>i,
#properties li.active>*>i,
#add_menu .desc>a:hover,
#add_menu .desc>a:focus{opacity:1;filter:alpha(opacity=100)}
/* Site */
body>.x{max-width:none !important}
.x>.body{padding-bottom:10px !important}
@ -15,8 +46,6 @@ body>.x{max-width:none !important}
.col>*>h1>a:hover,
.col>*>h1>a:focus{color:#06C}
.col>.x_close{position:absolute;top:0;right:0;width:30px;height:30px;color:#666;font-size:17px;opacity:.75;filter:alpha(opacity=75)}
.col>.x_close:hover,
.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 -6px;border-radius:5px;background:#fff;border:1px solid #999;border-right:0;border-bottom:0}
@ -29,7 +58,7 @@ body>.x{max-width:none !important}
.col.map li._isCut a{color:#aaa}
.mapi{margin:3px 0 5px 0;min-width:200px;background-color:transparent !important}
.mapi ul{margin:0;padding:0;list-style:none}
.mapi li{padding:0 80px 0 0;white-space:nowrap;position:relative;line-height:30px;border-radius:3px;vertical-align:top}
.mapi li{padding:0;white-space:nowrap;position:relative;border-radius:3px;vertical-align:top}
.mapi li>ul{margin:0}
.mapi a{text-decoration:none}
.mapi>ul{padding:1px}
@ -49,8 +78,6 @@ body>.x{max-width:none !important}
/* 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}
.mapi li>a>i{opacity:.5;filter:alpha(opacity=50)}
.mapi .jstree-hovered>i,
.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,
@ -74,9 +101,6 @@ body>.x{max-width:none !important}
.col .nav li>button:hover>.themeName,
.col .nav li>button:focus>.themeName{color:#ddd}
.col .nav li>a>i{position:absolute;top:50%;right:5px;margin:-7px 0 0 0;opacity:.5;filter:alpha(opacity=50)}
.col .nav li>a:hover>i,
.col .nav li>a:focus>i,
.col .nav li.active>a>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)}
/* Menu Type */
.col .typePage{display:none}
.col .multilingual>label,
@ -113,7 +137,7 @@ body>.x{max-width:none !important}
.download .item>img{position:absolute;top:15px;left:0;width:80px;height:80px;padding:4px;border:1px solid #ddd;border-radius:3px}
.download h2{margin:10px 0;line-height:normal !important}
.download h2>a{font-size:14px;color:#000}
.download .x_icon-download-alt{width:24px;height:24px;background-color:#94A55C;position:absolute;top:15px;right:0;border-radius:3px;margin:0;border:0;background-position:-90px -19px;opacity:1;filter:alpha(opacity=100)}
.download .x_icon-download-alt{width:24px;height:24px;background-color:#94A55C;position:absolute;top:15px;right:0;border-radius:3px;margin:0;border:0;background-position:-90px -19px}
.download .x_icon-download-alt:hover,
.download .x_icon-download-alt:focus{background-color:#333}
.download p>i{font-style:normal;color:#ccc}
@ -125,8 +149,6 @@ body>.x{max-width:none !important}
.download .item.installed.up_to_date ._already_up_to_date{display:block}
.download .done,
.download .update{position:absolute;top:15px;right:0;border:0;background-color:transparent;border-radius:3px;color:#fff;overflow:visible;height:24px}
.download .done>i,
.download .update>i{opacity:1;filter:alpha(opacity=100)}
.download .done{background:#666}
.download .done:hover,
.download .done:focus{background:#333}
@ -155,7 +177,7 @@ body>.x{max-width:none !important}
.theme label{margin:0;padding:8px 0;position:relative;border-bottom:1px solid #ddd}
.theme label>a{position:absolute;top:4px;right:0;width:24px;height:24px;border-radius:3px;background-position:-427px 5px;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s}
.theme label>a:hover,
.theme label>a:focus{background-color:#000;background-image:url(../../../../common/img/glyphicons-halflings-white.png)}
.theme label>a:focus{background-color:#000}
.theme h2{font-size:14px;border-bottom:1px solid #ddd;margin:0;padding:15px 0 8px 0}
.theme ul button{background-color:transparent;border:0;padding:0;margin:0;overflow:visible}
.theme ul{margin:0;padding:0;list-style:none}
@ -172,8 +194,6 @@ body>.x{max-width:none !important}
.theme ul ul>li>*{display:block;height:21px;line-height:21px;text-align:left;position:relative;text-decoration:none;padding:0 34px 0 5px;border-radius:3px;color:#000;-webkit-transition:.3s;-moz-transition:.3s;-o-transition:.3s;white-space:nowrap}
.theme ul ul>li>*:hover,
.theme ul ul>li>*:focus{background:#666;color:#fff}
.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}
.theme .x_btn-group{margin:0 !important;padding:0;position:absolute;left:4px;right:4px;bottom:4px}
/* Add Sitemap */
@ -202,10 +222,6 @@ body>.x{max-width:none !important}
#properties li>button:focus,
#properties li.active>a{background-color:#666;color:#fff}
#properties li>*>i{position:absolute;top:50%;right:5px;margin:-7px 0 0 0;opacity:.5;filter:alpha(opacity=50)}
#properties li>*:hover>i,
#properties li>*:active>i,
#properties li>*:focus>i,
#properties li.active>*>i{background-image:url(../../../../common/img/glyphicons-halflings-white.png);opacity:1;filter:alpha(opacity=100)}
#properties.prop-shortcut li.homepage,
#properties.prop-shortcut li.design,
#properties.prop-shortcut li.details{display:none}
@ -221,8 +237,6 @@ body>.x{max-width:none !important}
#add_menu .desc{width:220px;min-height:50px;border-bottom:1px solid #ddd;color:#666;margin:0;padding:5px 0}
#add_menu .desc>a{overflow:hidden;font-size:0;text-indent:20px;display:inline-block;width:14px;height:14px;opacity:.5;filter:alpha(opacity=50);vertical-align:middle}
#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:4px;right:4px;bottom:4px}
/* Default */
#default .menuType{border:1px solid #ddd;border-left:0;border-right:0}

View file

@ -50,6 +50,11 @@
</tr>
</tbody>
</table>
<style scoped>
.fvOff,
.fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:transparent url(./modules/admin/tpl/img/iconFavorite.gif) no-repeat;border:0}
.fvOn{background-position:0 -16px}
</style>
<script>
jQuery(function($){
$('.dsTg>tbody>tr[data-type1]').prependTo('tbody');