Главная Обзор Помощь
Вход
style24
/
style24.front
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

브랜드 GNB

bin2107 5 лет назад
Родитель
bb88dfa260
Сommit
2f37999fb4
10 измененных файлов с 21 добавлено и 56 удалено
Разделённый вид Показать статистику Diff
  1. 5 0
      src/main/java/com/style24/front/biz/web/TsfPlanningController.java
  2. 8 4
      src/main/webapp/WEB-INF/views/web/common/layout/BrandLayoutWeb.html
  3. 0 44
      src/main/webapp/WEB-INF/views/web/common/layout/PlanningLayoutWeb.html
  4. 1 1
      src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html
  5. 1 1
      src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb2.html
  6. 1 1
      src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb3.html
  7. 1 1
      src/main/webapp/WEB-INF/views/web/display/LookbookDetailFormWeb.html
  8. 1 1
      src/main/webapp/WEB-INF/views/web/display/LookbookMainFormWeb.html
  9. 1 1
      src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html
  10. 2 2
      src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

+ 5 - 0
src/main/java/com/style24/front/biz/web/TsfPlanningController.java
Просмотреть файл 

@@ -102,6 +102,11 @@ public class TsfPlanningController extends TsfBaseController {
 
 
 		mav.addObject("cateNo", cateNo);
 
 		mav.addObject("brandGroupNo", brandGroupNo);
 
+		if(!"".equals(brandGroupNo)){
 
+			mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(brandGroupNo));
 
+		}else{
 
+			mav.addObject("brandGroupInfo", null);
 
+		}
 
 
 		return mav;
 
 	}

+ 8 - 4
src/main/webapp/WEB-INF/views/web/common/layout/BrandLayoutWeb.html
Просмотреть файл 

@@ -14,9 +14,15 @@
 
 </div>
 
 	
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
 
+<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
 
 
 <!-- GNB -->
 
-<header id="header" th:replace="~{web/common/fragments/BrandGnbWeb :: gnb}"></header>
 
+<th:block th:if="${brandGroupInfo == null }">
 
+	<header id="header" th:replace="~{web/common/fragments/GnbWeb :: gnb}"></header>
 
+</th:block>
 
+<th:block th:if="${brandGroupInfo != null }">
 
+	<header id="header" th:replace="~{web/common/fragments/BrandGnbWeb :: gnb}"></header>
 
+</th:block>
 
 <!--// GNB -->
 
 
 <!-- CONTENT AREA -->
 
@@ -26,12 +32,10 @@
 
 <!-- Footer -->
 
 <footer id="footer" th:replace="~{web/common/fragments/FooterWeb :: footer}"></footer>
 
 
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
 
-
 
 <script th:inline="javascript">
 
 /*<![CDATA[*/
 
 	$(document).ready(function() {
 
-		
+		$("#container").css('backgroundColor','#fff');
 
 	});
 
 /*]]>*/
 
 </script>

+ 0 - 44
src/main/webapp/WEB-INF/views/web/common/layout/PlanningLayoutWeb.html
Просмотреть файл 

@@ -1,44 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="ko"
 
-	xmlns:th="http://www.thymeleaf.org"
 
-	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 
-
 
-<head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
 
-
 
-<body>
 
-
 
-<div class="skipComment">
 
-	<a href="#content">본문 바로가기</a>
 
-	<a href="#gnb">주메뉴 바로가기</a>
 
-	<a href="#footer">하단메뉴 바로가기</a>
 
-</div>
 
-	
-<th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
 
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
 
-
 
-<!-- GNB -->
 
-<th:block th:if="${brandGroupInfo == null }">
 
-	<header id="header" th:replace="~{web/common/fragments/GnbWeb :: gnb}"></header>
 
-</th:block>
 
-<th:block th:if="${brandGroupInfo != null }">
 
-	<header id="header" th:replace="~{web/common/fragments/BrandGnbWeb :: gnb}"></header>
 
-</th:block>
 
-<!--// GNB -->
 
-
 
-<!-- CONTENT AREA -->
 
-<th:block layout:fragment="content"></th:block>
 
-<!-- // CONTENT AREA -->
 
-
 
-<!-- Footer -->
 
-<footer id="footer" th:replace="~{web/common/fragments/FooterWeb :: footer}"></footer>
 
-
 
-<script th:inline="javascript">
 
-/*<![CDATA[*/
 
-	$(document).ready(function() {
 
-		$("#container").css('backgroundColor','#fff');
 
-	});
 
-/*]]>*/
 
-</script>
 
-
 
-</body>
 
-</html>

+ 1 - 1
src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko"
 
 	  xmlns:th="http://www.thymeleaf.org"
 
 	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	  layout:decorator="web/common/layout/PlanningLayoutWeb">
 
+	  layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : CategoryGoodsListFormWeb.html

+ 1 - 1
src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb2.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko"
 
 	  xmlns:th="http://www.thymeleaf.org"
 
 	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	  layout:decorator="web/common/layout/PlanningLayoutWeb">
 
+	  layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : CategoryGoodsListFormWeb.html

+ 1 - 1
src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb3.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko"
 
 	  xmlns:th="http://www.thymeleaf.org"
 
 	  xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	  layout:decorator="web/common/layout/PlanningLayoutWeb">
 
+	  layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : CategoryGoodsListFormWeb.html

+ 1 - 1
src/main/webapp/WEB-INF/views/web/display/LookbookDetailFormWeb.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko"
 
 	xmlns:th="http://www.thymeleaf.org"
 
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	layout:decorator="web/common/layout/PlanningLayoutWeb">
 
+	layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : LookbookDetailFormWeb.html

+ 1 - 1
src/main/webapp/WEB-INF/views/web/display/LookbookMainFormWeb.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko"
 
 	xmlns:th="http://www.thymeleaf.org"
 
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	layout:decorator="web/common/layout/PlanningLayoutWeb">
 
+	layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : LookbookMainFormWeb.html

+ 1 - 1
src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html
Просмотреть файл 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <html lang="ko" xmlns:th="http://www.thymeleaf.org"
 
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	layout:decorator="web/common/layout/PlanningLayoutWeb">
 
+	layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : PlanningDetailFormWeb.html

+ 2 - 2
src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html
Просмотреть файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko"
 
 	xmlns:th="http://www.thymeleaf.org"
 
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 
-	layout:decorator="web/common/layout/DefaultLayoutWeb">
 
+	layout:decorator="web/common/layout/BrandLayoutWeb">
 
 <!--
 
  *******************************************************************************
 
  * @source  : PlanningMainFormWeb.html
 
@@ -133,7 +133,7 @@
 
 						$.each(result, function(idx, item) {
 
 						    tag += '  <div class="exhi_item">\n';
 
 						    tag += '       <div class="exhi_item_img">\n';
 
-						    tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">\n'; 
+						    tag += '           <a href= "javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\',\'' + [[${brandGroupNo}]] + '\')">\n';
 
                             if (item.newYn == 'Y') {
 
 						    	tag += '				<div class="shape ranker"><span>NEW</span></div>\n';
 
 						    }