Browse Source

기획전 수정 임시커밋

sowon4187 5 years ago
parent
commit
95b0aa05fc

+ 7 - 7
src/main/webapp/WEB-INF/views/marketing/PlanTemplatePopupForm.html

@@ -2130,12 +2130,12 @@
 	
 	
 $(document).ready(function() {
-		gagaSn.setContents('#fsrcPcBtm', ''); 
-		gagaSn.setContents('#fsrcMobileBtm', '');
-		gagaSn.setContents('#fsrcPcTop', ''); 
-		gagaSn.setContents('#fsrcMobileTop', '');
-		gagaSn.setContents('#note', '');
-/* 		var snOptions1 = gagaSn.getToolbarOptions('media');
+		//gagaSn.setContents('#fsrcPcBtm', ''); 
+		//gagaSn.setContents('#fsrcMobileBtm', '');
+		//gagaSn.setContents('#fsrcPcTop', ''); 
+		//gagaSn.setContents('#fsrcMobileTop', '');
+		//gagaSn.setContents('#note', '');
+ 		var snOptions1 = gagaSn.getToolbarOptions('media');
 		var snOptions2 = gagaSn.getToolbarOptions('media');
 		var snOptions3 = gagaSn.getToolbarOptions('media');
 		var snOptions4 = gagaSn.getToolbarOptions('media');
@@ -2144,7 +2144,7 @@ $(document).ready(function() {
 		gagaSn.createSummernote(snOptions1, '#fsrcPcTop');
 		gagaSn.createSummernote(snOptions2, '#fsrcMobileTop');
 		gagaSn.createSummernote(snOptions3, '#fsrcPcBtm');
-		gagaSn.createSummernote(snOptions4, '#fsrcMobileBtm');  */
+		gagaSn.createSummernote(snOptions4, '#fsrcMobileBtm');  
 		
 		// 그리드 그리기
 		gagaAgGrid.createGrid("gridListPlanReview", gridOptionsPlanReviewList);

+ 2 - 2
src/main/webapp/WEB-INF/views/marketing/SocialShoppingListForm.html

@@ -268,8 +268,8 @@
 							<li class="right">
 								<button type="button" class="btn btn-default btn-lg" onclick="fnOpenGoodsPopup();">상품추가</button>
 								<button type="button" class="btn btn-default btn-lg" onclick="fnDeleteGoods();">상품삭제</button>
-								<!-- <button type="button" class="btn btn-default btn-lg" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
-								<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button> -->
+								<button type="button" class="btn btn-default btn-lg" onclick="fnSocialGoodsExcelUpload();">엑셀상품추가</button>
+								<button type="button" class="btn btn-default btn-lg" onclick="cfnDownloadSampleFile('SF011');">엑셀상품추가 양식 다운로드</button>
 								<button type="button" class="btn btn-success btn-lg" onclick="fnSocialGoodsSave();">저장</button>
 							</li>
 						</ul>

+ 2 - 1
src/main/webapp/ux/plugins/gaga/gaga.summernote.js

@@ -143,5 +143,6 @@ var gagaSn = {
 			}
 		});
 	}
-
+	
 }
+