Admin Bar UI enhancement. Welcome page content update.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12189 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-11-12 12:37:04 +00:00
parent 7dcd60a762
commit 45dcea0706
17 changed files with 275 additions and 234 deletions

View file

@ -49,17 +49,13 @@ body>.message{margin:1em}
.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1}
.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}
/* Admin Bar */
#adminBar{position:fixed;_position:absolute;left:0;top:0;background:#000;width:100%;opacity:0;filter:alpha(opacity=0);z-index:100;color:#fff;font:12px/32px Arial,Helvetica,sans-serif;height:0;padding:16px 0 0 0;overflow:hidden}
body{-webkit-transition:padding-top .2s}
.adminBar{padding-top:32px}
.adminBar>#adminBar{padding:0;height:auto;opacity:.5;filter:alpha(opacity=50)}
#adminBar>h1{margin:0 10px 0 0;padding:8px 0 0 10px;float:left;font-size:12px;line-height:1}
#adminBar{position:absolute;left:0;top:0;background:#000;width:100%;opacity:.5;filter:alpha(opacity=50);z-index:100;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden}
#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1}
#adminBar img{vertical-align:top}
#adminBar>ul{margin:0;padding:0;list-style:none}
#adminBar li{display:inline}
#adminBar li:before{content:".";vertical-align:top;margin:0 4px 0 0}
#adminBar li:first-child:before,
#adminBar>.abCxt li:first-child+li:before{content:normal}
#adminBar>.abGrl{float:left}
#adminBar>.abCxt{float:right;padding:0 10px 0 0}
#adminBar a{color:#fff}
#adminBar>p{margin:0}
#adminBar>.admin{float:left}
#adminBar>.link{float:right;padding:0 10px 0 0}
#adminBar a{color:#fff;text-decoration:none}
#adminBar a:hover,
#adminBar a:active,
#adminBar a:focus{text-decoration:underline}

View file

@ -1 +1 @@
@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:13px}body{word-wrap:break-word}a img{border:0}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0;line-height:1.25}#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px}#popup_menu_area a:hover,#popup_menu_area a:active,#popup_menu_area a:focus{background:#666;color:#fff}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}body>.message{margin:1em}.message p{margin:1em 0!important}.message.info{border-color:#bce8f1;background-color:#d9edf7;color:#3a87ad}.message.error{border-color:#eed3d7;background-color:#f2dede;color:#b94a48}.message.update{border-color:#d6e9c6;background-color:#dff0d8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}#adminBar{position:fixed;_position:absolute;left:0;top:0;background:#000;width:100%;opacity:0;filter:alpha(opacity=0);z-index:100;color:#fff;font:12px/32px Arial,Helvetica,sans-serif;height:0;padding:16px 0 0 0;overflow:hidden}body{-webkit-transition:padding-top .2s}.adminBar{padding-top:32px}.adminBar>#adminBar{padding:0;height:auto;opacity:.5;filter:alpha(opacity=50)}#adminBar>h1{margin:0 10px 0 0;padding:8px 0 0 10px;float:left;font-size:12px;line-height:1}#adminBar img{vertical-align:top}#adminBar>ul{margin:0;padding:0;list-style:none}#adminBar li{display:inline}#adminBar li:before{content:".";vertical-align:top;margin:0 4px 0 0}#adminBar li:first-child:before,#adminBar>.abCxt li:first-child+li:before{content:normal}#adminBar>.abGrl{float:left}#adminBar>.abCxt{float:right;padding:0 10px 0 0}#adminBar a{color:#fff}
@charset "utf-8";body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:13px}body{word-wrap:break-word}a img{border:0}.xe_content img{max-width:100%;height:auto}@media \0screen{.xe_content img{max-width:none}}.btnArea{margin:1em 0;text-align:right;zoom:1;clear:both}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;height:24px;line-height:22px;margin:0;font-weight:bold!important;color:#fff;text-decoration:none!important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a,.btn *[type=button]{border-color:#ccc;color:#333!important;background:#eee -webkit-gradient(linear,0% 0,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff,endColorStr=#dddddd)}.btn *[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000))!important;background:#333 -moz-linear-gradient(top,#777,#000)!important;background-color:#333!important;color:#ffc!important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777,endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}input[type=submit].text,input[type=button].text,button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a!important;background:0;text-decoration:underline;cursor:pointer}#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:3px;margin:10px 0;padding:10px;font-size:12px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135,strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0;line-height:1.25}#popup_menu_area a{display:block;text-decoration:none;color:#333;border-radius:2px;padding:1px 3px}#popup_menu_area a:hover,#popup_menu_area a:active,#popup_menu_area a:focus{background:#666;color:#fff}.message{position:relative;border:1px solid #ddd;background-color:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:4px;line-height:1.4;font-size:13px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}body>.message{margin:1em}.message p{margin:1em 0!important}.message.info{border-color:#bce8f1;background-color:#d9edf7;color:#3a87ad}.message.error{border-color:#eed3d7;background-color:#f2dede;color:#b94a48}.message.update{border-color:#d6e9c6;background-color:#dff0d8;color:#468847}.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100;border:1px solid #eae9dc;background:#fffdef url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-weight:bold}.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:0;width:100%;height:100%;opacity:.5;z-index:2;filter:alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}#adminBar{position:absolute;left:0;top:0;background:#000;width:100%;opacity:.5;filter:alpha(opacity=50);z-index:100;color:#fff;font:12px/28px Arial,Helvetica,sans-serif;padding:0;overflow:hidden}#adminBar>h1{margin:0 10px 0 0;padding:6px 0 0 10px;float:left;font-size:12px;line-height:1}#adminBar img{vertical-align:top}#adminBar>p{margin:0}#adminBar>.admin{float:left}#adminBar>.link{float:right;padding:0 10px 0 0}#adminBar a{color:#fff;text-decoration:none}#adminBar a:hover,#adminBar a:active,#adminBar a:focus{text-decoration:underline}

View file

@ -672,17 +672,4 @@ function xStopPropagation(evt)
xDeprecate('xStopPropagation');
if (evt && evt.stopPropagation) evt.stopPropagation();
else if (window.event) window.event.cancelBubble = true;
}
// Admin Bar
jQuery(function($){
$('#adminBar')
.mouseover(function(){
$('body').addClass('adminBar');
})
.mouseleave(function(){
setTimeout(function(){
$('body').removeClass('adminBar');
}, 3000);
});
});
}

2
common/js/x.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -52,7 +52,7 @@ xe.cmd_find = "{$lang->cmd_find}";
//]]>
</script>
</head>
<body{Context::getBodyClass()}>
<body{Context::getBodyClass()} style="margin-top:28px!important"|cond="$logged_info->is_admin=='Y' && !$isAdminKind && Context::get('current_module_info')->module_type == 'view'">
{@$isAdminKind = strpos(strtolower(Context::get('act')),'admin')!==false?true:false}
<include target="../../modules/admin/tpl/admin_bar.html" cond="$logged_info->is_admin=='Y' && !$isAdminKind && Context::get('current_module_info')->module_type == 'view'" />
{Context::getBodyHeader()}