fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 2001 fixed. Modify the position of the "BookMark".

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11008 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-08-09 04:36:54 +00:00
parent f46d517c44
commit 942e525a77
7 changed files with 128 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/admin/tpl/_spHeader.html
View file

@ -16,7 +16,7 @@
</ul>
</div>
<div class="gnb">
<ul class="nav">
<ul class="nav-gnb">
<li loop="$gnbUrlList=>$key,$value" class="activeOn"|cond="$parentSrl==$key"><a href="{getFullUrl('')}{$value['href']}"><span>{$value['text']}</span></a>
<ul cond="count($value['list'])">
<li loop="$value['list']=>$key2,$value2"><a href="{getFullUrl('')}{$value2['href']}">{$value2['text']}</a></li>
@ -37,4 +37,4 @@
</select>
</div>
</div>
<div class="body"|cond="!is_array($favorite_list) || count($favorite_list) < 1" class="body shortcut"|cond="!is_array($favorite_list) || count($favorite_list) >= 1">
<div class="body">

169
modules/admin/tpl/css/admin.css
View file

@ -6,7 +6,7 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di
.x input,
.x textarea,
.x select,
.x button{font-size:12px;color:#333}
.x button{font-size:13px;color:#333}
.x button,
.x input[type=submit],
.x input[type=reset],
@ -15,11 +15,10 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di
.x p{line-height:1.5}
/* Section & Heading */
.x .section{margin:1em 0;padding:0;border:0}
.x .h1,
.x .h2,
.x .h3,
.x .h4{position:relative;border-style:solid;border-top:0;border-right:0;zoom:1;padding-left:8px}
.x .h1{border-width:4px;font-size:24px;border-color:#666;margin-top:0}
.x .h1{background:#444;border-radius:4px;color:#fff;margin:0;font-size:16px;padding:0 15px;line-height:36px}
.x .h2{border-width:3px;font-size:20px;border-color:#888}
.x .h3{border-width:2px;font-size:16px;border-color:#aaa}
.x .h4{border-width:1px;font-size:12px;border-color:#ccc}
@ -119,40 +118,40 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di
/* Global Navigation Bar */
.x .gnb{height:34px;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1}
.x .gnb:after{content:"";display:block;clear:both}
.x .gnb .nav{float:left;position:relative;display:inline-block;*display:inline;zoom:1;margin:0 0 0 20px;padding:1px;list-style:none}
.x .gnb .nav ul{_position:absolute;display:block;_display:inline;zoom:1;clear:both;margin:0;padding:0;border:0;overflow:hidden}
.x .gnb.active .nav{top:-5px;padding:5px 5px 5px 0;margin:0 0 -100% 20px;border:1px solid #aaa;background:#fff;box-shadow:0 0 10px #999;border-radius:5px}
.x .gnb.active .nav ul{top:0;_position:relative;box-shadow:none;display:block;_display:inline;clear:both;padding:0;margin:0;border:0}
.x .gnb .nav:after{content:"";display:block;clear:both}
.x .gnb .nav li{position:relative;display:inline-block;*display:inline;zoom:1;vertical-align:top;overflow:hidden;margin:0}
.x .gnb .nav li.activeOn{z-index:10}
.x .gnb .nav li.activeOn>a{border:1px solid #ccc}
.x .gnb .nav li li{display:block;_float:left;clear:both;overflow:hidden;border:0;margin:0}
.x .gnb .nav li li:first-child{border:0}
.x .gnb .nav li a{display:block;_float:left;font-weight:bold;color:#333;font-size:12px;height:14px;padding:9px 0;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1}
.x .gnb .nav li a span{padding:0 15px;border-left:1px solid #fff}
.x .gnb.active .nav li a span,
.x .gnb .nav li:first-child a span,
.x .gnb .nav li.activeOn+li a span{border:0;margin:0 0 0 1px}
.x .gnb .nav li a:hover,
.x .gnb .nav li a:active,
.x .gnb .nav li a:focus{background:#f4f4f4}
.x .gnb .nav li.activeOn>a{background:#fff;padding:8px 0}
.x .gnb .nav li li a{color:#555;background:#fff;padding:5px 15px !important;font-weight:normal !important;border:0 !important}
.x .gnb .nav li li a:hover,
.x .gnb .nav li li a:active,
.x .gnb .nav li li a:focus{border:0;background:#eee}
.x .gnb .nav-gnb{float:left;position:relative;display:inline-block;*display:inline;zoom:1;margin:0 0 0 20px;padding:1px;list-style:none}
.x .gnb .nav-gnb ul{_position:absolute;display:block;_display:inline;zoom:1;clear:both;margin:0;padding:0;border:0;overflow:hidden}
.x .gnb.active .nav-gnb{top:-5px;padding:5px 5px 5px 0;margin:0 0 -100% 20px;border:1px solid #aaa;background:#fff;box-shadow:0 0 10px #999;border-radius:5px}
.x .gnb.active .nav-gnb ul{top:0;_position:relative;box-shadow:none;display:block;_display:inline;clear:both;padding:0;margin:0;border:0}
.x .gnb .nav-gnb:after{content:"";display:block;clear:both}
.x .gnb .nav-gnb li{position:relative;display:inline-block;*display:inline;zoom:1;vertical-align:top;overflow:hidden;margin:0}
.x .gnb .nav-gnb li.activeOn{z-index:10}
.x .gnb .nav-gnb li.activeOn>a{border:1px solid #ccc}
.x .gnb .nav-gnb li li{display:block;_float:left;clear:both;overflow:hidden;border:0;margin:0}
.x .gnb .nav-gnb li li:first-child{border:0}
.x .gnb .nav-gnb li a{display:block;_float:left;font-weight:bold;color:#333;font-size:12px;height:14px;padding:9px 0;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1}
.x .gnb .nav-gnb li a span{padding:0 15px;border-left:1px solid #fff}
.x .gnb.active .nav-gnb li a span,
.x .gnb .nav-gnb li:first-child a span,
.x .gnb .nav-gnb li.activeOn+li a span{border:0;margin:0 0 0 1px}
.x .gnb .nav-gnb li a:hover,
.x .gnb .nav-gnb li a:active,
.x .gnb .nav-gnb li a:focus{background:#f4f4f4}
.x .gnb .nav-gnb li.activeOn>a{background:#fff;padding:8px 0}
.x .gnb .nav-gnb li li a{color:#555;background:#fff;padding:5px 15px !important;font-weight:normal !important;border:0 !important}
.x .gnb .nav-gnb li li a:hover,
.x .gnb .nav-gnb li li a:active,
.x .gnb .nav-gnb li li a:focus{border:0;background:#eee}
.x .gnb .mnv{width:100%;height:32px;display:none}
@media only all and (max-width:860px){
@media all and (max-width:860px){
.x .gnb{height:auto}
.x .gnb .nav,
.x .gnb .nav-gnb,
.x .sct{display:none}
.x .gnb .mnv{display:block}
}
/* Local Navigation */
.x .lnb{position:relative;float:left;width:210px;margin:0 0 1em -240px;line-height:normal;zoom:1;display:inline}
.x .lnb .h2{margin-top:0;border-left:0;padding-left:0}
.x .lnb ul{margin:0 !important;padding:0;list-style:none}
.x .lnb{position:relative;float:left;width:210px;margin:0 0 1em -230px;line-height:normal;zoom:1;display:inline}
.x .lnb .h2{position:relative;z-index:2;margin:0 0 -1px 0;padding:0 10px;border:1px solid #444;border-bottom:0;border-radius:4px 4px 0 0;background:#555;font-size:13px;color:#fff;line-height:36px}
.x .lnb ul{margin:0 !important;padding:0;list-style:none;position:relative;z-index:1}
.x .lnb li{position:relative;margin:0 0 -1px 0;vertical-align:top;zoom:1}
.x .lnb li a{display:block;position:relative;padding:8px 10px;text-decoration:none;color:#666;font-weight:bold;background:#fafafa;border:1px solid #eee;zoom:1}
.x .lnb li a .i{position:absolute;top:50%;left:100%;margin:-4px 0 0 -16px;width:8px;height:8px;color:#ccc;background:url(../img/iconNavVr.gif) no-repeat left top}
@ -168,14 +167,19 @@ header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{di
.x .lnb li.active li a{border:0}
.x .lnb li.active ul{display:block;border-top:1px solid #eee}
.x .lnb li.active li.active a span{color:#13b200;font-weight:bold;letter-spacing:-1px}
.x .lnb li:last-child a,
.x .lnb li.active:last-child{border-radius:0 0 4px 4px !important}
/* Shortcut */
.x .sct{float:right;width:120px;position:relative;right:-140px;margin:0 0 0 -120px}
.x .sct h2{font-size:20px;border-bottom:3px solid #888;margin-top:0}
.x .sct ul{margin:0;padding:0;list-style:none}
.x .sct li{position:relative;margin:0 0 -1px 0}
.x .sct a{display:block;color:#666;background:#fafafa;border:1px solid #eee;border-left:0;border-right:0;padding:5px 20px 5px 5px;text-decoration:none}
.x .sct form{position:absolute;margin:0;padding:0;top:6px;right:5px}
.x .sct .text{text-decoration:none;font-weight:bold;color:#999 !important}
.x .sct{float:right;width:138px;position:relative;right:-160px;margin:0 0 0 -140px;padding:8px 0}
.x .sct h2{margin:0 0 5px 15px;font-size:13px}
.x .sct ul{margin:0;font-size:12px}
.x .sct li{position:relative}
.x .sct a{text-decoration:none}
.x .sct form{position:absolute;margin:0;padding:0;top:2px;right:-10px}
.x .sct .text{text-decoration:none;font-weight:bold;color:#999 !important;width:16px;height:16px;margin:0}
.x .sct .text:hover,
.x .sct .text:active,
.x .sct .text:focus{color:#333 !important}
/* Content Navigation */
.x .cnb{margin:1em 0;position:relative;zoom:1}
.x .cnb:after{content:"";display:block;clear:both}
@ -251,7 +255,7 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x .h2Anchor{position:absolute;right:0;border:0;background:none;color:#00f;text-decoration:underline}
/* Skip Navigation */
.x .skipNav{margin:0;text-align:center}
@media only all and (max-width:860px){
@media all and (max-width:860px){
.x .skipNav{display:none}
}
.x .skipNav a{position:absolute;width:1px;height:1px;display:block;padding:10px 0;font-weight:bold;overflow:hidden}
@ -280,7 +284,7 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x .header .account a{color:#fff;display:inline-block;height:14px}
.x .header .account a.language{padding-right:16px;background:url(../img/iconArrow.gif) no-repeat right -160px}
.x .header #language{position:absolute;top:19px;right:-20px;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
@media only all and (max-width:860px){
@media all and (max-width:860px){
.x .header #language{right:-10px}
}
.x .header #language li{border:0;display:block;padding:1px 8px 1px 10px;text-align:left;line-height:1}
@ -294,16 +298,17 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x .header .account a:focus{color:#6e9cf2;text-decoration:underline}
/* Footer */
.x .footer{border-top:1px solid #ddd;text-align:center;font-size:12px;padding:1.5em 0;zoom:1}
.x .footer *{font-size:12px}
.x .footer:after{content:"";display:block;clear:both}
.x .footer p{margin:0}
.x .footer .power{float:left}
.x .footer .cache{float:right}
.x .footer .vr{color:#ccc}
/* Body */
.x .body{position:relative;z-index:1;padding:30px 20px 30px 260px;zoom:1}
.x .body{position:relative;z-index:1;padding:30px 170px 30px 240px;zoom:1}
.x .body:after{content:"";display:block;clear:both}
/* Content */
.x .content{float:right;width:100%;margin-left:-100%;zoom:1}
.x .content{float:right;width:100%;margin-left:-100%;zoom:1;outline:0}
.x .content:after{content:"";display:block;clear:both}
.x .content a{color:#33a}
.x .content a:hover,
@ -314,19 +319,16 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x .content .portlet a:active,
.x .content .portlet a:focus{text-decoration:underline}
/* Dashboard */
.x .dashboard{position:relative;float:none !important;width:auto !important}
.x .shortcut .dashboard{margin:0 -140px 0 0 !important}
.x .dashboard .portlet{float:left;width:48%;margin-right:1em}
.x .dashboard .section{margin-top:0}
.x .dashboard .portlet{float:left;width:48%;margin-right:1em;margin-top:0}
.x .dashboard .portlet:nth-of-type(odd){float:left;width:49%;margin-right:0}
.x .dashboard .portlet:nth-of-type(even){float:right;width:49%;margin-right:0}
@media only all and (min-width:1300px){
@media all and (min-width:1300px){
.x .dashboard .portlet{float:left !important;width:32% !important;margin-right:1em !important}
}
/* Single Column*/
.x .single{padding:30px 20px}
.x .single{padding-left:10px}
.x .single .content{position:relative;float:left;width:100%;margin:0}
/* Shortcut */
.x .shortcut{padding-right:160px}
/* Search */
.x .search{zoom:1}
.x .search:after{content:"";display:block;clear:both}
@ -581,7 +583,7 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.x a.cMenu{display:inline-block;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;vertical-align:middle;background:url(../../../../common/img/icon.bubble.png) no-repeat}
.x .sTog{float:right;border:0;background-color:transparent;width:28px;height:18px;opacity:.5;filter:alpha(opacity=50)}
/* Responsive Layout */
@media only all and (max-width:860px){
@media all and (max-width:860px){
.x .header .account ul{padding-right:10px}
.x .body{padding:1em 0 0 0}
.x .content{float:none;margin-left:0}
@ -711,7 +713,7 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
*
* Designed and built with all the love in the world@twitter by@mdo and@fat.
*/
/* Bootstrap - Icon */
/* Bootstrap - Icons */
[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}
[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0}
.icon-white{background-image:url("../img/glyphicons-halflings-white.png")}
@ -855,3 +857,68 @@ body.modalContainer{_height:100%;_width:100%} /* IE6 only */
.icon-filter{background-position:-408px -144px}
.icon-briefcase{background-position:-432px -144px}
.icon-fullscreen{background-position:-456px -144px}
/* Bootstrap - Nav */
.nav{margin-bottom:18px;margin-left:0;list-style:none}
.nav > li > a{display:block}
.nav > li > a:hover{text-decoration:none;background-color:#eeeeee}
.nav > .pull-right{float:right}
.nav .nav-header{display:block;padding:3px 15px;font-weight:bold;line-height:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase}
.nav li + .nav-header{margin-top:9px}
.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}
.nav-list > li > a,
.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5)}
.nav-list > li > a{padding:3px 15px}
.nav-list > .active > a,
.nav-list > .active > a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc}
.nav-list [class^="icon-"]{margin-right:2px}
.nav-list .divider{*width:100%;height:1px;margin:8px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff}
.nav-tabs,
.nav-pills{ *zoom:1}
.nav-tabs:before,
.nav-pills:before,
.nav-tabs:after,
.nav-pills:after{display:table;content:""}
.nav-tabs:after,
.nav-pills:after{clear:both}
.nav-tabs > li,
.nav-pills > li{float:left}
.nav-tabs > li > a,
.nav-pills > li > a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}
.nav-tabs{border-bottom:1px solid #ddd}
.nav-tabs > li{margin-bottom:-1px}
.nav-tabs > li > a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}
.nav-tabs > li > a:hover{border-color:#eeeeee #eeeeee #dddddd}
.nav-tabs > .active > a,
.nav-tabs > .active > a:hover{color:#555555;cursor:default;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent}
.nav-pills > li > a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
.nav-pills > .active > a,
.nav-pills > .active > a:hover{color:#ffffff;background-color:#0088cc}
.nav-stacked > li{float:none}
.nav-stacked > li > a{margin-right:0}
.nav-tabs.nav-stacked{border-bottom:0}
.nav-tabs.nav-stacked > li > a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.nav-tabs.nav-stacked > li:first-child > a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}
.nav-tabs.nav-stacked > li:last-child > a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}
.nav-tabs.nav-stacked > li > a:hover{z-index:2;border-color:#ddd}
.nav-pills.nav-stacked > li > a{margin-bottom:3px}
.nav-pills.nav-stacked > li:last-child > a{margin-bottom:1px}
.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px}
.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}
.nav-tabs .dropdown-toggle .caret,
.nav-pills .dropdown-toggle .caret{margin-top:6px;border-top-color:#0088cc;border-bottom-color:#0088cc}
.nav-tabs .dropdown-toggle:hover .caret,
.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}
.nav-tabs .active .dropdown-toggle .caret,
.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333}
.nav > .dropdown.active > a:hover{color:#000000;cursor:pointer}
.nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle,
.nav > li.dropdown.open.active > a:hover{color:#ffffff;background-color:#999999;border-color:#999999}
.nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret,
.nav li.dropdown.open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100)}
/* Bootstrap - Miscellaneous */
.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05)}
.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15)}
.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}
.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}

4
modules/admin/tpl/css/admin.min.css vendored
View file

File diff suppressed because one or more lines are too long

1
modules/admin/tpl/index.html
View file

@ -101,4 +101,5 @@
</div>
</div>
</div>
<include target="./_spShortcut.html" />
<include target="./_spFooter.html" />

17
modules/admin/tpl/js/admin.js
View file

@ -154,14 +154,14 @@ jQuery(function($){
$.fn.xeMenu = function(){
this
.attr('role', 'navigation') // WAI-ARIA role
.find('>.nav>li')
.find('>.nav-gnb>li')
.attr('role', 'menuitem') // WAI-ARIA role
.find('>ul').css('height','0').end()
.filter(':has(>ul)')
.attr('aria-haspopup', 'true') // WAI-ARIA
.end()
.end()
.find('>.nav')
.find('>.nav-gnb')
.mouseover(function(){
$(this)
.parent('.gnb').addClass('active').end()
@ -1399,21 +1399,11 @@ function completeInstallModule(ret_obj) {
jQuery(function($){
$('body').ajaxComplete(function(){ hideWaitingFogLayer() });
});
jQuery(function($){
// admin single column layout
if($('.x>.body>.lnb').length == 0){ // When it have no lnb
$('.x>.body').addClass('single'); // Add class single
}
// admin shortcut remove
if($('.x>.body>.sct>ul>li').length == 0){
$('.x>.body>.sct').remove();
}
});
// Details toggle in admin table
jQuery(function($){
var viewBtn = $('.x .dsTg span.side>button.text');
var tdTitle = $('.x .dsTg td.title');
tdTitle.each(function(){
@ -1429,10 +1419,7 @@ jQuery(function($){
viewBtn.toggleClass('details');
details.slideToggle(200);
});
});
// Toggle Content
jQuery(function($){
var $h2h3 = $('.x .content .h2, .x .content .h3').not('.portlet .h2, .modal .h2');
$h2h3.each(function(){
var $sTog = $('<button type="button" class="sTog" title="Open/Close"><i class="icon-chevron-up"></i></button>');

2
modules/admin/tpl/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
modules/admin/tpl/layout.html
View file

@ -1,7 +1,7 @@
<include target="./_spHeader.html" />
<div class="content" id="content">
<div class="content" id="content" tabindex="0">
{$content}
</div>
<include target="./_spLnb.content.html" cond="$parentSrl != 0" />
<include target="./_spShortcut.html" cond="!is_array($favorite_list) || count($favorite_list) >= 1" />
<include target="./_spShortcut.html" />
<include target="./_spFooter.html" />