Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

src/main/resources/config/application-run.yml

@@ -29,38 +29,38 @@ logging.config: classpath:log/logback-run.xml
 domain:
     admin: //bos.style24.com
     style24: //www.style24.com
-    image: //image.istyle24.com
+    image: //image.istyle24.com/Upload
     uximage: //bos.style24.com
 
 upload:
-    dext.target.path: /usr/local/data/style24/dext
+    dext.target.path: /files/data/style24/dext
     default:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     goods:
-        target.path: /usr/local/data/style24/productimage
+        target.path: /files/data/style24/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     excel:
-        target.path: /usr/local/data/style24/excel
+        target.path: /files/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //image.istyle24.com/excel
+        view: //image.istyle24.com/Upload/excel
     sample:
-        target.path: /usr/local/data/style24/sample
+        target.path: /files/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.style24.com/sample
+        view: //image.style24.com/Upload/sample
 
-download.path: /usr/local/data
+download.path: /files/data/style24
 
 # SMTP
 mail:

src/main/resources/config/application-style.yml

@@ -19,40 +19,40 @@ domain:
     admin: //bos.style24.com
     style24: //www.style24.com
     front: //www.style24.com
-    image: //image.istyle24.com
-    cdnimage: //image.istyle24.com
+    image: //image.istyle24.com/Upload
+    cdnimage: //image.istyle24.com/Upload
     uximage: //bos.style24.com
 
 upload:
-    dext.target.path: /usr/local/data/style24/dext
+    dext.target.path: /files/data/style24/dext
 
     default:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     goods:
-        target.path: /usr/local/data/style24/productimage
+        target.path: /files/data/style24/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
         view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /usr/local/data/style24
+        target.path: /files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com
+        view: //image.istyle24.com/Upload
     excel:
-        target.path: /usr/local/data/style24/excel
+        target.path: /files/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //image.istyle24.com/excel
+        view: //image.istyle24.com/Upload/excel
     sample:
-        target.path: /usr/local/data/style24/sample
+        target.path: /files/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.style24.com/sample
+        view: //image.style24.com/Upload/sample
 
-download.path: /usr/local/data
+download.path: /files/data/style24
 
 # PG
 pg:

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -100,7 +100,7 @@
 			html += '</td>';
 			if(contentsLoc!='SCM002' && contentsLoc!='SCM003'){
 				html += '<td class="aL">';
-				if(contentsLoc!='SMM005'  && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+				if(contentsLoc!='SMM005'  && contentsLoc!='SMM011' && contentsLoc!='SBM012' && contentsLoc!='SBMM012'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
 				}
 				if(contentsLoc=='SMM001' || contentsLoc=='SMM002' || contentsLoc=='SBM004' || contentsLoc=='SBMM004' || contentsLoc=='SCM001' || contentsLoc=='SOM001'){
@@ -109,10 +109,10 @@
 				if(contentsLoc=='SBM005' || contentsLoc=='SBMM005'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddBrandDescRow(this);">브랜드소개추가</button>';
 				}
-				if(contentsLoc!='SMM005' && contentsLoc!='SBM005' && contentsLoc!='SBMM005' && contentsLoc!='SGNB001'  && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+				if(contentsLoc!='SMM005' && contentsLoc!='SBM005' && contentsLoc!='SBMM005' && contentsLoc!='SGNB001'  && contentsLoc!='SMM011' && contentsLoc!='SBM012' && contentsLoc!='SBMM012'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddImgPopRow(this);">이미지추가</button>';
 				}
-				if(contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+				if(contentsLoc!='SMM011' && contentsLoc!='SBM012' && contentsLoc!='SBMM012'){
 					html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddLinkPopRow(this);">링크추가</button>';
 				}
 				html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
@@ -132,7 +132,7 @@
 				html += '	</td>';
 				html += '</tr>';
 			}
-			if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
+			if(contentsLoc=='SMM011' || contentsLoc=='SBM012' || contentsLoc=='SBMM012'){
 				html += '<tr class="cateTypeTr">';
 				html += '	<th>동영상구분</th>';
 				html += '	<td colspan="3">';
@@ -376,7 +376,7 @@
 					html += '</tr>';
 			}
 			html += '</thead><tbody>';
-			if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+			if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012' && contentsLoc!='SBMM012'){
 				for(var j=1; j<5; j++){
 					var strTitle = eval("result["+i+"].strTitle" + j);
 					var imgPath = eval("result["+i+"].imgPath" + j);
@@ -550,7 +550,7 @@
 		html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
 		html += '</td>';
 		html += '<td class="aL">';
-		if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012'){
+		if(contentsLoc!='SCM002' && contentsLoc!='SCM003' && contentsLoc!='SMM011' && contentsLoc!='SBM012' && contentsLoc!='SBMM012'){
 			if(contentsLoc!='SMM005'){
 				html += '<button type="button" class="btn btn-base btn-lg" id="addTitle'+dataIdx+'" onclick="fnAddTitlePopRow(this);">타이틀추가</button>';
 			}
@@ -576,7 +576,7 @@
 			html += '	</td>';
 			html += '</tr>';
 		}
-		if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
+		if(contentsLoc=='SMM011' || contentsLoc=='SBM012' || contentsLoc=='SBMM012'){
 			html += '<tr class="cateTypeTr">';
 			html += '	<th>동영상구분</th>';
 			html += '	<td colspan="3">';
@@ -924,7 +924,7 @@
 				i++;
 			});
 
-			if(contentsLoc=='SMM011' || contentsLoc=='SBM012'){
+			if(contentsLoc=='SMM011' || contentsLoc=='SBM012' || contentsLoc=='SBMM012'){
 				var thisIdx = $(this).find("input[name=tableIdx]").val();
 				strVar1 = $(this).find("input:radio[name=tvPlayer"+thisIdx+"]:checked").val();
 				strVar2 = $(this).find("input[name=tvMediaKey"+thisIdx+"]").val();

src/main/webapp/WEB-INF/views/display/MainGnbContentsPopupForm.html

@@ -99,11 +99,13 @@
 			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="L" onclick="fnChangeCateType(this,'+addIdx+');"/>이벤트링크</label>';
 			html += '	</td>';
 			html += '</tr>';
-		}else if(contentsLoc=='SBM002'){
+		}else if(contentsLoc=='SBM002' || contentsLoc=='SBMM002'){
 			html += '<tr class="cateTypeTr">';
 			html += '	<th>유형선택</th>';
 			html += '	<td colspan="3">';
-			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="L" checked="checked"/>이벤트링크</label>';
+			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="L" onclick="fnChangeGnbType(this,'+addIdx+');" checked="checked"/>이벤트링크</label>';
+			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="B" onclick="fnChangeGnbType(this,'+addIdx+');" />룩북</label>';
+			html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="P" onclick="fnChangeGnbType(this,'+addIdx+');" />기획전</label>';
 			html += '	</td>';
 			html += '</tr>';
 		}
@@ -144,7 +146,7 @@
 				html += '		</td>';
 				html += '	</tr>';
 			}
-		}else if(contentsLoc=='SBM002'){
+		}else if(contentsLoc=='SBM002'||contentsLoc=='SBMM002'){
 			html += '	<tr name="tabLinkTitleRow">';
 			html += '		<th>타이틀</th>';
 			html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value=""/></td>';
@@ -371,7 +373,7 @@
 					gtabNm = "아울렛";
 				}
 
-				if(radioValue=='L'){
+				if(radioValue=='L' || radioValue=='B' || radioValue=='P'){
 					gtabNm = $(this).find("input[name=title]").val();
 					linkUrl = $(this).find("input[name=link]").val();
 				}
@@ -604,9 +606,21 @@
 			html += '			<th>유형선택</th>';
 			html += '			<td colspan="3">';
 			if(result[i].brandGroupNo!='' && result[i].brandGroupNo!=null){
+				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeGnbType(this,'+i+');"';
 				if(result[i].contentsType=='L'){
-					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" checked="checked"/>이벤트링크</label>';
+					html += ' checked="checked" ';
 				}
+				html += '/>이벤트링크</label>';
+				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="B" onclick="fnChangeGnbType(this,'+i+');"';
+				if(result[i].contentsType=='B'){
+					html += ' checked="checked" ';
+				}
+				html += ' />룩북</label>';
+				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="P" onclick="fnChangeGnbType(this,'+i+');"';
+				if(result[i].contentsType=='P'){
+					html += ' checked="checked" ';
+				}
+				html += ' />기획전</label>';
 			}else{
 				if(result[i].contentsType=='C'){
 					html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>대카테고리</label>';
@@ -650,23 +664,7 @@
 			html += '		</tr>';
 			html += '	</thead>';
 			html += '<tbody>';
-			if(result[i].contentsType=='C'){
-				html += '	<tr name="tabCateRow">';
-				html += '		<th>카테고리</th>';
-				html += '		<td colspan="3">카테고리선택';
-				html += '			<select name="cate1List">';
-				html += '				<option value="">[선택]</option>';
-				for(let i=0; i<cate1List.length; i++){
-					if(cateNo == cate1List[i].cd){
-						html += '<option value="'+cate1List[i].cd+'" selected="selected">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-					}else{
-						html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-					}
-				}
-				html += '			</select>';
-				html += '		</td>';
-				html += '	</tr>';
-			}else if(result[i].contentsType=='L'){
+			if(result[i].brandGroupNo!='' && result[i].brandGroupNo!=null){
 				html += '	<tr name="tabLinkTitleRow">';
 				html += '		<th>타이틀</th>';
 				html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+result[i].gtabNm+'"/></td>';
@@ -675,7 +673,35 @@
 				html += '		<th>링크 (없으면 #)</th>';
 				html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value="'+result[i].linkUrl+'"/></td>';
 				html += '	</tr>';
+			}else{
+				if(result[i].contentsType=='C'){
+					html += '	<tr name="tabCateRow">';
+					html += '		<th>카테고리</th>';
+					html += '		<td colspan="3">카테고리선택';
+					html += '			<select name="cate1List">';
+					html += '				<option value="">[선택]</option>';
+					for(let i=0; i<cate1List.length; i++){
+						if(cateNo == cate1List[i].cd){
+							html += '<option value="'+cate1List[i].cd+'" selected="selected">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
+						}else{
+							html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
+						}
+					}
+					html += '			</select>';
+					html += '		</td>';
+					html += '	</tr>';
+				}else if(result[i].contentsType=='L'){
+					html += '	<tr name="tabLinkTitleRow">';
+					html += '		<th>타이틀</th>';
+					html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+result[i].gtabNm+'"/></td>';
+					html += '	</tr>';
+					html += '	<tr name="tabLinkRow">';
+					html += '		<th>링크 (없으면 #)</th>';
+					html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value="'+result[i].linkUrl+'"/></td>';
+					html += '	</tr>';
+				}
 			}
+
 			html += '</tbody>';
 			html += '</table>';
 			tableIdx = i;
@@ -691,6 +717,17 @@
 		tableIdx = tableIdx+1;
 	}
 
+	var fnChangeGnbType = function (obj, idx){
+		let chkType = $("#tabTable"+idx).find("input:radio[name=cateType"+idx+"]:checked").val();
+		if(chkType=='L'){
+			$("#tabTable"+idx).find("input[name=link]").val('');
+		}else if(chkType=='B'){
+			$("#tabTable"+idx).find("input[name=link]").val('/display/lookbook/main/form?brandGroupNo='+brandGroupNo);
+		}else{
+			$("#tabTable"+idx).find("input[name=link]").val('/planning/main/form?brandGroupNo='+brandGroupNo);
+		}
+	}
+
 	$(document).ready(function() {
 		$("#gnbTabList").disableSelection();
 		$("#gnbTabList").sortable({

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -659,7 +659,7 @@
 		// 브랜드픽, MD추천 다른 팝업 사용
 		if(contentsLoc=='SMM007'||contentsLoc=='SMM009'||contentsLoc=='SMM012'){
 			cfnOpenMainMultiContentsPopup(cateNo, contentsLoc, brandGroupNo);
-		}else if(contentsLoc=='STAB001' || contentsLoc=='STAB002' || contentsLoc=='SBM002'){
+		}else if(contentsLoc=='STAB001' || contentsLoc=='STAB002' || contentsLoc=='SBM002' || contentsLoc=='SBMM002'){
 			cfnOpenMainGnbContentsPopup(cateNo, contentsLoc, brandGroupNo);
 		}else{
 			cfnOpenMainContentsPopup(cateNo, contentsLoc, brandGroupNo);