Merge branch 'release/1.8.0' into develop

config/config.inc.php

@@ -29,7 +29,7 @@ define('__ZBXE__', __XE__);
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.0-beta.3');
+define('__XE_VERSION__', '1.8.0');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

layouts/xedition/conf/info.xml

@@ -3,7 +3,7 @@
 	<title xml:lang="ko">XEDITION</title>
 	<description xml:lang="ko">XE 1.8 기본 테마</description>
 	<version>1.8</version>
-	<date>2015-04-07</date>
+	<date>2015-04-08</date>
 	<author email_address="developer@xpressengine.com" link="https://www.xpressengine.com/">
 		<name xml:lang="ko">NAVER</name>
 	</author>
@@ -13,7 +13,6 @@
 		</menu>
 		<menu name="UNB" maxdepth="1">
 			<title xml:lang="ko">매거진형 추가 메뉴</title>
-			<description xml:lang="ko">asdf</description>
 		</menu>
 		<menu name="FNB" maxdepth="2">
 			<title xml:lang="ko">푸터 메뉴</title>

layouts/xedition/css/layout.css

@@ -75,7 +75,7 @@ a:hover,a:active,a:focus{text-decoration:none}
 
 
 /* button */
-.btn_item{display:inline-block;margin:35px 0;padding:0 27px;height:50px;font-family: "Open Sans";background-color:#555;font-size:13px;line-height:50px;letter-spacing:1px;color:#FFF;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
+.btn_item{display:inline-block;margin:35px 0;padding:0 27px;height:50px;font-family: "Open Sans";background-color:#555;font-size:14px;line-height:50px;letter-spacing:1px;color:#FFF;-webkit-transition: all .2s ease-in-out;-moz-transition: all .2s ease-in-out;-ms-transition: all .2s ease-in-out;-o-transition: all .2s ease-in-out;transition: all .2s ease-in-out}
 .btn_item:hover,
 .btn_item:active
 .btn_item:focus{background-color:#CBA061;color:#fff}
@@ -124,7 +124,7 @@ a:hover,a:active,a:focus{text-decoration:none}
 
 /* Onepage Header Type */
 .onepage .header_wrap{position:absolute;top:0;left:0;width:100%;z-index:1000}
-.onepage .gnb>ul{background:transparent}
+.onepage .gnb>ul{background:url(../img/blank.gif) 0 0 repeat}
 .onepage .gnb>ul>li>a{line-height:60px;color:#f6f6f6}
 .onepage .gnb>ul>li>a:hover,.onepage .gnb>ul>li>a:focus,.onepage .gnb>ul>li>a:focus,.onepage .gnb>ul>li.on>a{color:#fff}
 .onepage .shrink .gnb>ul>li>a{color:#888}
@@ -138,6 +138,7 @@ a:hover,a:active,a:focus{text-decoration:none}
 .onepage .header>h1{padding:20px 0 0}
 .onepage .search_area input[type=text]{color:#f6f6f6}
 .onepage .shrink .search_area input[type=text]{color:#888}
+.onepage .visual.sub.sub_type3 {margin-top:-100px;}
 
 /* Search */
 .search_wrap{position:relative;width:1200px;margin:0 auto}

layouts/xedition/css/welcome.css

@@ -17,7 +17,7 @@
 .welcomeXE .xeicon h1 {margin-top: 170px; font-size: 40px; color: #f6f6f6; text-align: center; letter-spacing: 3px; font-weight: 400; line-height: 1.2em; text-transform: uppercase; }
 .welcomeXE .xeicon h1 a {color: #FFF; }
 .welcomeXE .xeicon .button-area {text-align: center; }
-.welcomeXE .xeicon .button-area .btn_item {font-size: 16px; letter-spacing: 2px;}
+.welcomeXE .xeicon .button-area .btn_item {font-size: 14px; letter-spacing: 2px;}
 
 /* section.guide */
 .welcomeXE .guide{height:640px;padding-top:80px}

layouts/xedition/js/layout.min.js

@@ -1 +1 @@
-!function(a){"use strict";a(function(){var b=300,c=a(".fixed_header .header_wrap"),d=a(".gnb"),e=a(".hover"),f=a(".click > a"),g=a(".search_area");if(c.length){var h=c.height(),i=!1,j=c.find(".header h1 img"),k=j.data("logo"),l=j.attr("src");a(window).scroll(function(){var d=a(this).scrollTop();d>=b?i||(a("body").css("padding-top",h),c.addClass("shrink"),k&&j.attr("src",k),i=!0):i&&(a("body").css("padding-top",0),c.removeClass("shrink"),k&&j.attr("src",l),i=!1)}),a(window).triggerHandler("scroll")}d.find(">ul>li>a").mouseover(function(){d.find(">ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul").hide().parent().removeClass("on")}),d.find(">ul>li>ul>li>a").mouseover(function(){d.find(">ul>li>ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul>li>ul").hide().parent().removeClass("on")}),e.on("mouseenter mouseleave focusin focusout",function(b){b.preventDefault(),"mouseenter"==b.type||"focusin"==b.type?a(this).addClass("on"):a(this).removeClass("on")}),f.click(function(){return g.is(":hidden")&&(g.fadeIn().find("input").focus(),a(".magazine").length>0?(a(".custom_area").css("opacity",0),a(".side").css("opacity",0)):a(".header").css("opacity",0)),!1}),a(".btn_close").click(function(){var b=a(this);return b.parent().fadeOut().find("input").val(""),a(".magazine").length>0?(a(".custom_area").css("opacity",1),a(".side").css("opacity",1)):a(".header").css("opacity",1),f.focus(),!1}),a.isFunction(a.fn.camera)&&a(".camera_wrap").length&&a(".camera_wrap").camera({height:"600px",pagination:!0,thumbnails:!1,playPause:!1,loader:"none",fx:"simpleFade",time:3e3});var m=function(){var b=a(".btn_top"),c=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;a(window).scroll(function(){a(this).scrollTop()>150&&c>1e3?b.fadeIn(100):b.fadeOut(100)}),b.click(function(){return a("html, body").animate({scrollTop:0},400),!1})};m(),a(".sub_type3 .bg_img").parallax("50%",.4)})}(jQuery),function(a){"use strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);
+!function(a){"use strict";a(function(){var b=300,c=a(".fixed_header .header_wrap"),d=a(".gnb"),e=a(".hover"),f=a(".click > a"),g=a(".search_area");if(c.length){var h=(c.height(),!1),i=c.find(".header h1 img"),j=i.data("logo"),k=i.attr("src");a(window).scroll(function(){var d=a(this).scrollTop();d>=b?h||(c.addClass("shrink"),j&&i.attr("src",j),h=!0):h&&(c.removeClass("shrink"),j&&i.attr("src",k),h=!1)}),a(window).triggerHandler("scroll")}d.find(">ul>li>a").mouseover(function(){d.find(">ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul").hide().parent().removeClass("on")}),d.find(">ul>li>ul>li>a").mouseover(function(){d.find(">ul>li>ul>li>ul:visible").hide().parent("li").removeClass("on"),a(this).next("ul:hidden").stop().fadeIn(200).parent("li").addClass("on")}).focus(function(){a(this).mouseover()}).end().mouseleave(function(){d.find(">ul>li>ul>li>ul").hide().parent().removeClass("on")}),e.on("mouseenter mouseleave focusin focusout",function(b){b.preventDefault(),"mouseenter"==b.type||"focusin"==b.type?a(this).addClass("on"):a(this).removeClass("on")}),f.click(function(){return g.is(":hidden")&&(g.fadeIn().find("input").focus(),a(".magazine").length>0?(a(".custom_area").css("opacity",0),a(".side").css("opacity",0)):a(".header").css("opacity",0)),!1}),a(".btn_close").click(function(){var b=a(this);return b.parent().fadeOut().find("input").val(""),a(".magazine").length>0?(a(".custom_area").css("opacity",1),a(".side").css("opacity",1)):a(".header").css("opacity",1),f.focus(),!1}),a.isFunction(a.fn.camera)&&a(".camera_wrap").length&&a(".camera_wrap").camera({height:"600px",pagination:!0,thumbnails:!1,playPause:!1,loader:"none",fx:"simpleFade",time:3e3});var l=function(){var b=a(".btn_top"),c=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;a(window).scroll(function(){a(this).scrollTop()>150&&c>1e3?b.fadeIn(100):b.fadeOut(100)}),b.click(function(){return a("html, body").animate({scrollTop:0},400),!1})};l(),a(".sub_type3 .bg_img").parallax("50%",.4)})}(jQuery),function(a){"use strict";var b=a(window),c=b.height();b.resize(function(){c=b.height()}),a.fn.parallax=function(d,e,f){function g(){var f=b.scrollTop();j.each(function(){var b=a(this),g=b.offset().top,k=h(b);f>g+k||g>f+c||j.css("backgroundPosition",d+" "+Math.round((i-f)*e)+"px")})}var h,i,j=a(this);j.each(function(){i=j.offset().top}),h=f?function(a){return a.outerHeight(!0)}:function(a){return a.height()},(arguments.length<1||null===d)&&(d="50%"),(arguments.length<2||null===e)&&(e=.1),(arguments.length<3||null===f)&&(f=!0),b.bind("scroll",g).resize(g),g()}}(jQuery);

layouts/xedition/layout.html

@@ -167,7 +167,7 @@
 					<input type="hidden" name="vid" value="{$vid}" />
 					<input type="hidden" name="mid" value="{$mid}" />
 					<input type="hidden" name="act" value="IS" />
-					<input type="text" name="is_keyword" value="{$is_keyword}" required="required" title="{$lang->cmd_search}" placeholder="{$lang->cmd_search}" />
+					<input type="text" name="is_keyword" value="{$is_keyword}" required="required" title="{$lang->cmd_search}" placeholder="Search" />
 				</form>
 				<!-- /SEARCH -->
 				<a href="#" class="btn_close" title="{$lang->cmd_xedition_search_close}" onclick="return false"><i class="xi-close"></i><span class="blind">{$lang->cmd_xedition_search_close}</span></a>

modules/install/script/ko.install.php

@@ -16,40 +16,40 @@ $sitemap = array(
 				'module_type' => 'WIDGET',
 				'module_id' => 'index',
 			),
-			array(
-				'menu_name' => 'XEIcon',
-				'module_type' => 'WIDGET',
-				'module_id' => 'xeicon',
-			),
 			array(
 				'menu_name' => 'Board',
 				'module_type' => 'board',
 				'module_id' => 'board',
 				'list' => array(
 					array(
-						'menu_name' => 'Smaple 1',
+						'menu_name' => 'SMAPLE 1',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#',
 						'list' => array(
 							array(
-								'menu_name' => 'Smaple 1-1',
+								'menu_name' => 'SMAPLE 1-1',
 								'is_shortcut' => 'Y',
 								'shortcut_target' => '#'
 							),
 						)
 					),
 					array(
-						'menu_name' => 'Smaple 2',
+						'menu_name' => 'SMAPLE 2',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#'
 					),
 					array(
-						'menu_name' => 'Smaple 3',
+						'menu_name' => 'SMAPLE 3',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#'
 					),
 				)
 			),
+			array(
+				'menu_name' => 'XEIcon',
+				'module_type' => 'WIDGET',
+				'module_id' => 'xeicon',
+			),
 		)
 	),
 	'UNB' => array(
@@ -78,46 +78,46 @@ $sitemap = array(
 				'shortcut_target' => 'index',
 				'list' => array(
 					array(
-						'menu_name' => 'Sample 1',
+						'menu_name' => 'SAMPLE 1',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#'
 					),
 					array(
-						'menu_name' => 'Smaple 2',
+						'menu_name' => 'SAMPLE 2',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#'
 					),
 					array(
-						'menu_name' => 'Smaple 3',
+						'menu_name' => 'SAMPLE 3',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#'
 					)
 				),
 			),
-			array(
-				'menu_name' => 'XEIcon',
-				'is_shortcut' => 'Y',
-				'shortcut_target' => 'xeicon',
-				'list' => array(
-					array(
-						'menu_name' => 'Sample 1',
-						'is_shortcut' => 'Y',
-						'shortcut_target' => '#'
-					),
-					array(
-						'menu_name' => 'Smaple 2',
-						'is_shortcut' => 'Y',
-						'shortcut_target' => '#'
-					)
-				)
-			),
 			array(
 				'menu_name' => 'Board',
 				'is_shortcut' => 'Y',
 				'shortcut_target' => 'board',
 				'list' => array(
 					array(
-						'menu_name' => 'Sample 1',
+						'menu_name' => 'SAMPLE 1',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					),
+					array(
+						'menu_name' => 'SAMPLE 2',
+						'is_shortcut' => 'Y',
+						'shortcut_target' => '#'
+					)
+				)
+			),
+			array(
+				'menu_name' => 'XEIcon',
+				'is_shortcut' => 'Y',
+				'shortcut_target' => 'xeicon',
+				'list' => array(
+					array(
+						'menu_name' => 'SAMPLE 1',
 						'is_shortcut' => 'Y',
 						'shortcut_target' => '#'
 					)
@@ -304,7 +304,7 @@ $oModuleController->updateSite($site_args);
 
 
 // XEIcon page
-$moduleInfo = $oModuleModel->getModuleInfoByMenuItemSrl($sitemap['GNB']['list'][1]['menu_srl']);
+$moduleInfo = $oModuleModel->getModuleInfoByMenuItemSrl($sitemap['GNB']['list'][2]['menu_srl']);
 $xeicon_module_srl = $moduleInfo->module_srl;
 
 $xeicon_document_srl = array();

modules/install/script/xeicon_content/xeicon_content_ko_2.html

@@ -2,32 +2,32 @@
 	<div class="tit"><h1>FEATURE</h1></div>
 	<ul>
 	<li>
-		<div class="ico"><i class="xi-pen"></i><span class="blind">사이트 제목 바꾸기</span></div>
+		<div class="ico"><i class="xi-cube"></i></div>
 		<h2>한개의 폰트, 680개의 아이콘</h2>
 		<p>웹 콘텐츠의 목적에 맞는 아이콘을 다양한 구성에서 찾아볼 수 있습니다.<br /><a href="https://xpressengine.github.io/XEIcon/library_common.html" target="_blank">라이브러리</a>에서 필요한 아이콘을 찾아보세요!</p>
 	</li>
 	<li>
-		<div class="ico"><i class="xi-sitemap"></i><span class="blind">메뉴 구조 구성하기</span></div>
+		<div class="ico"><i class="xi-sitemap"></i></div>
 		<h2>호환성</h2>
 		<p>XEIcon은 자바스크립트 없이 구현됩니다. <br />또한 다양한 브라우저에서도 동일한 뷰로 웹 페이지를 노출합니다.</p>
 	</li>
 	<li>
-		<div class="ico"><i class="xi-layout-top-left"></i><span class="blind">레이아웃 디자인 바꾸기</span></div>
+		<div class="ico"><i class="xi-layout-top-left"></i></div>
 		<h2>최적화</h2>
 		<p>XpressEngine 뿐 아니라, 다양한 프레임워크에서 동일하게 구현됩니다. 여러 환경에서 자유롭게 이용해보세요!</p>
 	</li>
 	<li>
-		<div class="ico"><i class="xi-home"></i><span class="blind">초기화면 바꾸기</span></div>
+		<div class="ico"><i class="xi-arrows-alt"></i></div>
 		<h2>확장성</h2>
 		<p>백터 아이콘으로 만들어진 XEIcon은 어떤 크기로도 확장이 가능하며 높은 해상도의 화면에서도 선명한 형태를 유지합니다.</p>
 	</li>
 	<li>
-		<div class="ico"><i class="xi-marquee-add"></i><span class="blind">기능과 디자인 추가하기</span></div>
+		<div class="ico"><i class="xi-pen"></i></div>
 		<h2>자유로운 변형</h2>
 		<p>CSS를 통해 아이콘의 색상, 크기 등을 손쉽게 변형할 수 있습니다. <a href="https://xpressengine.github.io/XEIcon/examples.html" target="_blank">LESS SASS</a>로 더 넓어진 활용 범위를 확인하세요!</p>
 	</li>
 	<li>
-		<div class="ico"><i class="xi-paint-brush"></i><span class="blind">레이아웃 꾸미기</span></div>
+		<div class="ico"><i class="xi-present"></i></div>
 		<h2>오픈소스</h2>
 		<p>XEIcon은 OFL 라이선스를 따르는 오픈소스로 모든 사용자에게 무료로 제공됩니다. <a href="https://xpressengine.github.io/XEIcon/license.html" target="_blank">라이선스</a>를 확인해 보세요!</p>
 	</li>