diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 5bd2b2380..7a991e455 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -12,7 +12,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x button[disabled]{color:#ccc !important} .x a[target="_blank"]:after{ content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 0 0 2px;background-position:-120px -72px;opacity:.3;filter:alpha(opacity=30)} /* Bootstrap Override */ -.x .x_page-header{padding-bottom:0} +.x .x_page-header{padding-bottom:0;border-bottom:2px solid #ddd} +.x .x_page-header>h1{margin-bottom:0} .x h1,.x h2,.x h3,.x h4,.x h5,.x h6{line-height:1.5;font-weight:600;color:#666} .x h1{font-size:26px} .x h2{font-size:22px} @@ -20,17 +21,19 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x h4{font-size:14px} .x h5{font-size:12px} .x h6{font-size:12px} +.x section>h1{border-bottom:1px solid #ddd} .x .x_btn-link{padding:0;margin:0;overflow:visible} .x [class^="x_icon-"], .x [class*=" x_icon-"]{text-decoration:none;border:0;padding:0;background-color:transparent;overflow:hidden;font-size:0} .x .x_close{width:24px;height:24px} .x .x_alert .x_close{top:-3px;right:-30px} .x .x_pagination ul>.x_active>a, -.x .x_pagination ul>.x_active>span{ background-color:#767676;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif} +.x .x_pagination ul>.x_active>span, +.x .x_pagination ul>.x_active>strong{line-height:40px;border:0;background-color:#555;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif} .x .x_btn{border-radius:2px;overflow:visible;font-size:14px;line-height:18px;padding:3px 9px} .x .x_btn-large{font-size:16px;padding:9px 14px;font-weight:bold} .x .x_btn-small{font-size:14px} -.x .x_btn-mini{font-size:12px} +.x .x_btn-mini{font-size:11px;padding:1px 6px;line-height:17px} .x .x_btn-group{zoom:1} .x .x_btn-group:after{content:"";display:block;clear:both} .x .x_btn-group>.x_btn{border-radius:0} @@ -41,9 +44,21 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x input[type="checkbox"]{margin:0} .x a.x_icon-question-sign, .x button.x_icon-question-sign{cursor:help} -.x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px} -.x .x_table{border-top:2px solid #ddd;border-bottom:1px solid #ddd} +.x .x_nav-tabs>li>a{padding-top:6px;padding-bottom:6px} +.x .x_table{margin:20px 0;border-top:2px solid #ddd;border-bottom:1px solid #ddd} .x .x_table>caption{text-align:left;padding:8px 0} +.x .x_inline{display:inline-block;*display:inline;*zoom:1} +.x label.x_inline{margin-right:16px} +.x input[type="search"]+.x_btn, +.x input[type="search"]+.x_btn+.x_btn{line-height:20px;font-size:14px;padding:4px 14px} +/* Custom Styles */ +.x .section{margin:20px 0} +.x .section>h1{position:relative} +.x .section>h1>.snToggle{position:absolute;bottom:0;right:0;width:32px;height:32px;opacity:.5;filter:alpha(opacity=50)} +.x .section>h1>.snToggle.x_icon-chevron-up{background-position:-279px -112px} +.x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px} +.x .center{text-align:center} +.x .search{margin:20px 0} /* Image Sprite */ .x a[target="_blank"]:after, .x>.body>.gnb>ul>li>a:before, @@ -222,7 +237,7 @@ to{-o-transform:rotate(360deg)} } .x .multilingual>select{display:none} .x .multilingual>label.x_add-on>input[type="checkbox"]{opacity:0;filter:alpha(opacity=0);position:relative;z-index:2} -.x .multilingual>label.x_add-on{font-size:0;position:relative} +.x .multilingual>label.x_add-on{font-size:0;position:relative;cursor:pointer} .x .multilingual>label.x_add-on>i{position:absolute;top:50%;left:50%;margin:-7px 0 0 -7px;z-index:1;opacity:.25;filter:alpha(opacity=25)} .x .multilingual>label.x_add-on.checked>i{opacity:1;filter:alpha(opacity=100)} .x .multilingual_item>.en{background:url(../img/flag.en.gif) no-repeat right center} diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css index a7d07e1eb..be478d108 100644 --- a/modules/admin/tpl/css/admin.min.css +++ b/modules/admin/tpl/css/admin.min.css @@ -12,7 +12,8 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x button[disabled]{color:#ccc !important} .x a[target="_blank"]:after{ content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 0 0 2px;background-position:-120px -72px;opacity:.3;filter:alpha(opacity=30)} /* Bootstrap Override */ -.x .x_page-header{padding-bottom:0} +.x .x_page-header{padding-bottom:0;border-bottom:2px solid #ddd} +.x .x_page-header>h1{margin-bottom:0} .x h1,.x h2,.x h3,.x h4,.x h5,.x h6{line-height:1.5;font-weight:600;color:#666} .x h1{font-size:26px} .x h2{font-size:22px} @@ -20,17 +21,19 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x h4{font-size:14px} .x h5{font-size:12px} .x h6{font-size:12px} +.x section>h1{border-bottom:1px solid #ddd} .x .x_btn-link{padding:0;margin:0;overflow:visible} .x [class^="x_icon-"], .x [class*=" x_icon-"]{text-decoration:none;border:0;padding:0;background-color:transparent;overflow:hidden;font-size:0} .x .x_close{width:24px;height:24px} .x .x_alert .x_close{top:-3px;right:-30px} .x .x_pagination ul>.x_active>a, -.x .x_pagination ul>.x_active>span{ background-color:#767676;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif} +.x .x_pagination ul>.x_active>span, +.x .x_pagination ul>.x_active>strong{line-height:40px;border:0;background-color:#555;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif} .x .x_btn{border-radius:2px;overflow:visible;font-size:14px;line-height:18px;padding:3px 9px} .x .x_btn-large{font-size:16px;padding:9px 14px;font-weight:bold} .x .x_btn-small{font-size:14px} -.x .x_btn-mini{font-size:12px} +.x .x_btn-mini{font-size:11px;padding:1px 6px;line-height:17px} .x .x_btn-group{zoom:1} .x .x_btn-group:after{content:"";display:block;clear:both} .x .x_btn-group>.x_btn{border-radius:0} @@ -41,9 +44,21 @@ body>.x,.x label,.x table,.x input,.x textarea,.x select,.x button{font-size:13p .x input[type="checkbox"]{margin:0} .x a.x_icon-question-sign, .x button.x_icon-question-sign{cursor:help} -.x .x_nav-tabs>li>a{padding-top:4px;padding-bottom:4px} -.x .x_table{border-top:2px solid #ddd;border-bottom:1px solid #ddd} +.x .x_nav-tabs>li>a{padding-top:6px;padding-bottom:6px} +.x .x_table{margin:20px 0;border-top:2px solid #ddd;border-bottom:1px solid #ddd} .x .x_table>caption{text-align:left;padding:8px 0} +.x .x_inline{display:inline-block;*display:inline;*zoom:1} +.x label.x_inline{margin-right:16px} +.x input[type="search"]+.x_btn, +.x input[type="search"]+.x_btn+.x_btn{line-height:20px;font-size:14px;padding:4px 14px} +/* Custom Styles */ +.x .section{margin:20px 0} +.x .section>h1{position:relative} +.x .section>h1>.snToggle{position:absolute;bottom:0;right:0;width:32px;height:32px;opacity:.5;filter:alpha(opacity=50)} +.x .section>h1>.snToggle.x_icon-chevron-up{background-position:-279px -112px} +.x .section>h1>.snToggle.x_icon-chevron-down{background-position:-303px -111px} +.x .center{text-align:center} +.x .search{margin:20px 0} /* Image Sprite */ .x a[target="_blank"]:after, .x>.body>.gnb>ul>li>a:before, @@ -222,7 +237,7 @@ to{-o-transform:rotate(360deg)} } .x .multilingual>select{display:none} .x .multilingual>label.x_add-on>input[type="checkbox"]{opacity:0;filter:alpha(opacity=0);position:relative;z-index:2} -.x .multilingual>label.x_add-on{font-size:0;position:relative} +.x .multilingual>label.x_add-on{font-size:0;position:relative;cursor:pointer} .x .multilingual>label.x_add-on>i{position:absolute;top:50%;left:50%;margin:-7px 0 0 -7px;z-index:1;opacity:.25;filter:alpha(opacity=25)} .x .multilingual>label.x_add-on.checked>i{opacity:1;filter:alpha(opacity=100)} .x .multilingual_item>.en{background:url(../img/flag.en.gif) no-repeat right center} diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js index 1a5b37780..88b497da8 100644 --- a/modules/admin/tpl/js/admin.js +++ b/modules/admin/tpl/js/admin.js @@ -89,7 +89,7 @@ jQuery(function($){ contentBugFix(); }); // Multilingual - var $mlCheck = $('.multilingual>label>input[type="checkbox"]'); + var $mlCheck = $('.x .multilingual>label>input[type="checkbox"]'); function multilingual(){ $mlCheck.each(function(event){ var $this = $(this); @@ -113,7 +113,7 @@ jQuery(function($){ multilingual(); $mlCheck.change(multilingual); // Check All - $('th>input[type="checkbox"]').change(function(){ + $('.x th>input[type="checkbox"]').change(function(){ var $this =$(this); var $target = $this.closest('table').find('th>input[type="checkbox"], td>input[type="checkbox"]'); if($this.is(':checked')){ @@ -123,4 +123,21 @@ jQuery(function($){ } }); +// Pagination + $('.x .x_pagination .x_disabled, .x .x_pagination .x_active').click(function(){ + return false; + }); +// Section Toggle + $('.x .section>h1').append(''); + $('.x .section>h1>.snToggle').click(function(){ + var $this = $(this); + var $section = $this.closest('.section'); + if(!$section.hasClass('collapse')){ + $section.addClass('collapse').children('h1:first').siblings().hide(); + $this.removeClass('x_icon-chevron-up').addClass('x_icon-chevron-down'); + } else { + $section.removeClass('collapse').children('h1:first').siblings().show(); + $this.removeClass('x_icon-chevron-down').addClass('x_icon-chevron-up'); + } + }); }); \ No newline at end of file diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js index 1a5b37780..88b497da8 100644 --- a/modules/admin/tpl/js/admin.min.js +++ b/modules/admin/tpl/js/admin.min.js @@ -89,7 +89,7 @@ jQuery(function($){ contentBugFix(); }); // Multilingual - var $mlCheck = $('.multilingual>label>input[type="checkbox"]'); + var $mlCheck = $('.x .multilingual>label>input[type="checkbox"]'); function multilingual(){ $mlCheck.each(function(event){ var $this = $(this); @@ -113,7 +113,7 @@ jQuery(function($){ multilingual(); $mlCheck.change(multilingual); // Check All - $('th>input[type="checkbox"]').change(function(){ + $('.x th>input[type="checkbox"]').change(function(){ var $this =$(this); var $target = $this.closest('table').find('th>input[type="checkbox"], td>input[type="checkbox"]'); if($this.is(':checked')){ @@ -123,4 +123,21 @@ jQuery(function($){ } }); +// Pagination + $('.x .x_pagination .x_disabled, .x .x_pagination .x_active').click(function(){ + return false; + }); +// Section Toggle + $('.x .section>h1').append(''); + $('.x .section>h1>.snToggle').click(function(){ + var $this = $(this); + var $section = $this.closest('.section'); + if(!$section.hasClass('collapse')){ + $section.addClass('collapse').children('h1:first').siblings().hide(); + $this.removeClass('x_icon-chevron-up').addClass('x_icon-chevron-down'); + } else { + $section.removeClass('collapse').children('h1:first').siblings().show(); + $this.removeClass('x_icon-chevron-down').addClass('x_icon-chevron-up'); + } + }); }); \ No newline at end of file diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html index b52f4c393..8cbaaf259 100644 --- a/modules/menu/tpl/sitemap.html +++ b/modules/menu/tpl/sitemap.html @@ -80,7 +80,7 @@ -
+

URL 링크

    @@ -124,14 +124,14 @@
  • -
    +
    -
    +
    @@ -172,7 +172,7 @@
    -
    +

    기본 설정

      @@ -205,7 +205,7 @@

    • -
  • +
    • -
  • +
  • +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    • +
  • @@ -564,6 +580,17 @@ .col .nav li>a:focus>i, .col .nav li.active>a>i{background-image:url({getUrl('')}common/img/glyphicons-halflings-white.png);background-repeat:no-repeat;opacity:1;filter:alpha(opacity=100)} .col input[type="file"]{width:1px;height:1px;overflow:hidden;font-size:0;line-height:0;opacity:0;filter:alpha(opacity=0)} +/* Menu Type */ +.col .typePage{display:none;border-top:1px solid #ddd;padding-top:8px;margin-top:8px} +.col .typeUrl{display:none;border-top:1px solid #ddd;margin-top:8px} +.col.page .typePage, +.col.url .typeUrl{display:block} +/* Menu Clone */ +.col .clone{margin:0 0 15px 0} +.col .clone ul{margin:0 !important} +.col .clone li{list-style:none} +.col .clone ul ul{padding-left:15px} +.col .clone .root{margin-top:15px} /* Download */ .download.col{max-width:600px} .download .list{padding:1px 0;border-bottom:1px solid #ccc} @@ -628,14 +655,6 @@ #add>*>.x_btn-group{border:0;padding:0} /* Add Menu */ #add_menu ul{margin:15px 0} -#add_menu .typePage{display:none;border-top:1px solid #ddd;padding-top:8px;margin-top:8px} -#add_menu .typeUrl{display:none;border-top:1px solid #ddd;margin-top:8px} -#add_menu.page .typePage, -#add_menu.url .typeUrl{display:block} -#add_menu .clone ul{margin:0} -#add_menu .clone li{list-style:none} -#add_menu .clone ul ul{padding-left:15px} -#add_menu .clone .root{margin-top:15px} /* Auth */ #auth ul{margin:15px 0} #auth li{border-top:1px solid #ddd;margin:0 0 15px 0;padding:15px 0 0 0} @@ -878,7 +897,7 @@ function createTreeMarkup(aNode){ sText = sText + " ${h}"; } - sResult += $.tmpl( "menuTreeNode", {MenuTitle:sText,MenuId:sNodeSrl,NodeType:nNodeType,SubTree:sSubTree,Target:sTargetPanel} ).get()[0].outerHTML.replace("${s}", "").replace("${h}", "HOME"); + sResult += $.tmpl( "menuTreeNode", {MenuTitle:sText,MenuId:sNodeSrl,NodeType:nNodeType,SubTree:sSubTree,Target:sTargetPanel} ).get()[0].outerHTML.replace("${s}", "").replace("${h}", "[HOME]"); } return $.tmpl( "menuTree", {Nodes:sResult} ).get()[0].outerHTML; @@ -1297,9 +1316,9 @@ jQuery(function($){ }).resize(); // #linkMenu copy and set text to input setTimeout(function(){ - $('.mapi').clone().removeClass().removeAttr('id').addClass('clone').appendTo('#linkMenu').find('li').removeAttr('id').removeAttr('class').find('ins, .side').remove(); + $('.mapi').clone().removeClass().removeAttr('id').addClass('clone').appendTo('#add_linkMenu, #fix_linkMenu').find('li').removeAttr('id').removeAttr('class').find('ins, .side').remove(); $('.clone a').click(function(){ - $('#linkMenu>input').val($(this).text()); + $(this).closest('.clone').prev('input[type="text"]').val($(this).text()); }); }, 1000); /*