관리자 페이지 새 스타일에 맞추어서 픽셀과 position 조정. (#1060)

modules/menu/lang/en.php

@@ -93,7 +93,7 @@ $lang->menu_link = 'Menu link';
 $lang->view_zoom = 'Zoom';
 $lang->use_site_default_layout = 'Use site default layout';
 $lang->site_default_layout_settings = 'Site default layout settings';
-$lang->no_use_layout = 'No use layout';
+$lang->no_use_layout = 'Will not use any layout';
 $lang->make_copy = 'Make copy';
 $lang->install_other_layouts = 'Install other layouts';
 $lang->layout_html_css_settings = 'HTML/CSS settings';
@@ -122,3 +122,5 @@ $lang->about_menu_type_in_default = 'To change the menu type, you have to delete
 $lang->img_uploaded = 'Button image is uploaded.';
 $lang->img_deleted = 'Button image is deleted.';
 $lang->do_not_display_again = 'Do not display again.';
+$lang->skin_settings = 'Skin settings';
+$lang->no_use_skin = 'Will not use any skin';

modules/menu/lang/ko.php

@@ -139,5 +139,7 @@ $lang->need_ftp_password_title = 'FTP 비밀번호';
 $lang->need_core_update = '설치하려면 Rhymix 업데이트가 필요합니다';
 $lang->need_core_update_continue = 'Rhymix 업데이트가 함께 진행됩니다. 계속하시겠습니까?';
 $lang->not_found_module = '모듈이 존재하지 않음';
+$lang->skin_settings = '스킨 설정';
 $lang->no_skin = '스킨 없음';
+$lang->no_use_skin = '스킨 사용 안 함';
 $lang->menu_desc = '메뉴 설명';

modules/menu/tpl/css/sitemap.css

@@ -125,7 +125,7 @@ padding:0;list-style:none}
 .col .nav li>a,
 .col .nav li>button{text-align:left;color:#000;line-height:20px;background-color:transparent;border:0;display:block;padding:8px 20px 8px 8px;color:#333;text-decoration:none;background:#fff;overflow:hidden;text-overflow:ellipsis;}
 .col .nav .themeName{font-size:11px;color:#666;font-weight:normal}
-.col .nav li>button{width:100%;max-width:268px}
+.col .nav li>button{width:100%;}
 .col .nav li>a:hover,
 .col .nav li>a:focus,
 .col .nav li.active>a,
@@ -234,10 +234,10 @@ padding:0;list-style:none}
 .theme .x_btn-group{margin:0 5px;padding:0;position:absolute;left:4px;right:4px;}
 /* Add Sitemap */
 #add_sitemap [for="sitemapName"]{font-weight:bold}
-#add_sitemap .btnBoth{position:absolute;margin:5px 0;left:4px;right:4px}
+#add_sitemap .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;}
 /* Sitemap General */
 #sitemap_general [for="sitemapName2"]{font-weight:bold}
-#sitemap_general .btnBoth{position:absolute;margin:5px 0;left:4px;right:4px}
+#sitemap_general .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;}
 /* Properties */
 #properties ul{margin:0;padding:0 0 8px 0}
 #properties li{position:relative;white-space:nowrap;border-top:1px solid #ddd}
@@ -271,17 +271,17 @@ padding:0;list-style:none}
 #add_menu label{font-weight:bold}
 #add_menu .x_tabbable{padding-top:8px}
 #add_menu .desc{width:220px;border-bottom:1px solid #ddd;color:#666;margin:0;padding:5px 0 10px;}
-#add_menu .x_btn-group{position:absolute;margin:0 5px;left:4px;right:4px;}
+#add_menu .x_btn-group{position:relative;margin:0 5px;box-sizing:border-box;width:100%;}
 /* 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;left:4px;right:4px;margin:5px 0}
+#default .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;}
 /* 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;left:4px;right:4px;margin:0 5px}
+#auth .x_btn-group{position:relative;left:4px;right:4px;padding:0 5px;width:100%;box-sizing:border-box}
 /* Image Button */
 #imgbtn form{padding:8px 0 0 0;margin:0}
 #imgbtn figure{margin:0;text-align:center}
@@ -318,7 +318,7 @@ padding:0;list-style:none}
 #design .mask.on_message{background:#666;color:white}
 #design .mask.loading{background:white}
 #design .mask>span{display:block;padding:10px;text-align:center}
-#design .btnBoth{position:absolute;left:4px;right:4px;margin:5px 0}
+#design .btnBoth{position:relative;margin:5px 0;box-sizing:border-box;width:100%;}
 #design._mobile_view_disabled #mobile .shadow,
 #design._mobile_view_disabled._mobileMode .nav,
 #design._mobileMode .langDesktop,
@@ -353,6 +353,7 @@ padding:0;list-style:none}
 /* Help Alert */
 ._quick_help.x_alert{display:none;position:fixed;top:85px;left:226px;z-index:100;width:600px;box-shadow: 0 0 2px rgba(0, 0, 0, 0.25);color:#333}
 ._quick_help.x_alert>label{display:inline-block;cursor:pointer}
+.x_alert-info.x_alert{display:none;box-sizing:border-box;width:169px;min-width:100%;}
 
 @media (max-width: 980px) {
 	._quick_help.x_alert{position:fixed;left:0;z-index:100;box-sizing:border-box;width:100%;box-shadow: 0 0 2px rgba(0, 0, 0, 0.25);color:#333}

modules/menu/tpl/sitemap.html

@@ -166,7 +166,7 @@
 					</li>
 					<li class="typePage">
 						<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">
+						<div id="mid1_help" class="x_alert x_alert-info">
 							<button type="button" class="x_close" data-admin-hide="#mid1_help">×</button>
 							<p>{$lang->about_menu_id} {$lang->about_new_menu_id}</p>
 						</div>
@@ -235,14 +235,14 @@
 					</li>
 					<li class="typePage" style="border-top:1px solid #DDD">
 						<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">
+						<div id="help_menuName" class="x_alert x_alert-info">
 							<button type="button" class="x_close" data-admin-hide="#help_menuName">×</button>
 							<p>{$lang->about_browser_title}</p>
 						</div>
 						<input id="pageTitle" class="_browserTitle lang_code" type="text">
 
 						<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">
+						<div id="mid2_help" class="x_alert x_alert-info">
 							<button type="button" class="x_close" data-admin-hide="#mid2_help">×</button>
 							<p>{$lang->about_menu_id}</p>
 						</div>
@@ -270,7 +270,7 @@
 						</div>
 					</li>
 					<li>
-						<p id="menuTypeHelpInDefault" style="width:220px">{$lang->about_menu_type_in_default}</p>
+						<p id="menuTypeHelpInDefault" style="width:220px;min-width:100%">{$lang->about_menu_type_in_default}</p>
 					</li>
 				</ul>
 				<div class="btnBoth">
@@ -285,7 +285,7 @@
 		<fieldset>
 			<h1>{$lang->menu_img_btn}</h1>
 			<div class="cnt">
-				<p style="border-bottom:1px solid #ddd;width:220px;padding-bottom:10px">{$lang->about_imgbtn}</p>
+				<p style="border-bottom:1px solid #ddd;width:220px;min-width:100%;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"/>
@@ -446,9 +446,6 @@
 					</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:7px;color:#000"><i class="x_icon-plus-sign"></i> {$lang->install_other_layouts}</a>
-				-->
 			</div>
 			<div class="x_btn-group siteMapUI">
 				<button type="button" class="x_btn x_btn-primary x_pull-right _save">{$lang->cmd_save}</button>
@@ -493,8 +490,8 @@
 
 				<div class="search x_input-append x_pull-right">
 					<input type="search" value="" title="Search" name="search_keyword">
-					<button class="x_btn x_btn-inverse _search">검색</button>
-					<a class="x_btn _cancel" href="#">취소</a>
+					<button class="x_btn x_btn-inverse _search">{$lang->cmd_search}</button>
+					<a class="x_btn _cancel" href="#">{$lang->cmd_cancel}</a>
 				</div>
 				</script>
 				<script id="tmpl_pagination_list" type="text/x-jquery-tmpl">
@@ -519,15 +516,6 @@
 			<h1>{$lang->skin}</h1>
 			<div class="cnt">
 				<label style="cursor:pointer">
-					<!--
-					<input type="checkbox" class="_chkUseDefault" title="{$lang->use_site_default_skin}"> {$lang->use_site_default_skin}
-					<a href="?module=admin&act=dispMenuAdminSiteDesign" class="x_icon-cog _siteDesignSetupLink">{$lang->site_default_skin_settings}</a>
-
-					<label class="" style="white-space: nowrap; cursor: pointer; width: 100%; font-weight: normal;" for="i6">
-					사이트 기본 레이아웃 사용
-					<input id="i6" class="_chkUseDefaultLayout switch" type="checkbox" title="사이트 기본 레이아웃 사용">
-					<i style="float:right"></i>
-					-->
 					{$lang->use_site_design}
 					<input type="checkbox" class="_chkUseDefault switch" title="{$lang->use_site_default_skin}">
 					<i style="float:right"></i>
@@ -539,7 +527,7 @@
 						<script id="tmpl_skin_list_item_no_skin" type="text/x-jquery-tmpl">
 						<li class="_item ${Selected}">
 							<label>
-								<input type="radio" name="skin_item" title="스킨 사용 안 함"> 스킨 사용 안 함
+								<input type="radio" name="skin_item" title="스킨 사용 안 함"> {lang('menu.no_use_layout')}
 							</label>
 						</li>
 						</script>
@@ -581,7 +569,7 @@
 	</div>
 	<div class="col skinSetup" id="skinSetup" style="display:none">
 		<section>
-			<h1>스킨 설정</h1>
+			<h1>{lang('menu.skin_settings')}</h1>
 			<div class="cnt">
 				<div class="_contents"></div>
 			</div>
@@ -3942,17 +3930,9 @@ jQuery(function($){
 			'width': '100%',
 			'margin': 0
 		});
-		$('#site > .col .cnt').css('margin-bottom', '25px');
-		$('#properties, #propertiesRoot, #imgbtn, #layoutSetup, #layoutMarkupSetup, #skinSetup').find('.cnt').css('margin-bottom', '25px');
+		$('#add').find('.cnt').css('margin-bottom', '25px');
 
 		var wHeigh = $(window).height();
-		<!--@if($act == 'dispMenuAdminSiteMap')-->
-		//$('#design').find('.cnt').height(wHeigh - 75);
-		<!--@end-->
-
-		<!--@if($act == 'dispMenuAdminSiteDesign')-->
-		//$('#layout, #skin').find('.cnt').height(wHeigh - 75);
-		<!--@end-->
 
 		$('#site > .col').bind('show', function(ev){
 			if(ev.target != this) return;
@@ -3973,18 +3953,11 @@ jQuery(function($){
 	<!--@else-->
 		$(window).resize(function(){
 			var wHeigh = $(window).height();
-			$('#site').height(wHeigh - 147).find('>.col').height(wHeigh - 185).find('.cnt').height(wHeigh - 292);
-			$('#properties, #propertiesRoot, #imgbtn, #layoutSetup, #layoutMarkupSetup, #skinSetup').find('.cnt').height(wHeigh - 262);
+			$('#site').height(wHeigh - 147).find('>.col').height(wHeigh - 167).find('.cnt').height(wHeigh - 245);
+			$('#skinSetup, #add').find('.cnt').height(wHeigh - 272);
 
 			<!--@if($act == 'dispMenuAdminSiteMap')-->
-			// minus height 40px for find-form display
-			$('#site').find('.cnt:first').height(wHeigh - 252 - 40);
-			$('#design').find('.cnt').height(wHeigh - 262);
-			<!--@end-->
-
-			<!--@if($act == 'dispMenuAdminSiteDesign')-->
-
-			$('#layout, #skin').find('.cnt').height(wHeigh - 262);
+			$('#site').find('.cnt:first').height(wHeigh - 316);
 			<!--@end-->
 		}).resize();
 	<!--@end-->