tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO'

Browse Source 
Conflicts:
	src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
This commit is contained in:
JIWOO 2024-09-05 14:20:25 +09:00
commit 0c6edf4d74
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/webapp/WEB-INF/jsp/layout/seedAdminLayout.jsp
View File

@ -18,7 +18,7 @@
<link rel="stylesheet" href="/kccadrPb/adm/css/content_media.css">
<!-- script -->
<script src="/kccadrPb/adm/script/jquery-3.5.0.js"></script>
<!-- <script src="/kccadrPb/adm/script/jquery-3.5.0.js"></script> -->
<script src="/kccadrPb/adm/script/common.js"></script>
<script src="/kccadrPb/adm/script/content.js"></script>
@ -29,8 +29,7 @@
<script src="<c:url value='/js/kccadr/kccadrCom.js' />"></script>
<script src="<c:url value='/js/antdatepicker/moment.min.js'/>"></script>
<!-- AS-IS 분쟁조정 -->
<!-- 분쟁조정 기존 파일 -->
<link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
<link rel="icon" href="/img/favicon.ico" type="image/x-icon">
@ -41,22 +40,20 @@
<link rel="stylesheet" href="/css/button.css">
<link rel="stylesheet" href="/css/seed.contents.css">
<link rel="stylesheet" href="/css/seed.mediaquery.css">
<!-- <link rel="stylesheet" href="/css/lib/jquery.mCustomScrollbar.min.css"> -->
<link rel="stylesheet" href="/css/lib/jquery.mCustomScrollbar.min.css">
<link rel="stylesheet" href="/css/jquery-ui.css"/>
<link rel="stylesheet" href="/css/jquery-ui.min.css"/>
<link rel="stylesheet" href="/css/smartPop.css"/>
<link rel="stylesheet" href="/css/space.css"/>
<link rel="stylesheet" href="/css/picker.default.css">
<link rel="stylesheet" href="/css/picker.default.date.css">
<!-- <link rel="stylesheet" href="/css/case/common.css"> -->
<link rel="stylesheet" href="/css/case/common.css">
<!-- 캘린더css -->
<!-- <link rel="stylesheet" href="/css/case/fullcalendar.min.css">
<link rel="stylesheet" href="/css/case/fullcalendar.min.css">
<link rel="stylesheet" href="/css/case/fullcalendar.print.css" media='print'>
<link rel="stylesheet" href="/css/case/scheduler.min.css">
<link type="text/css" rel="stylesheet" href="/css/case/jquery.qtip.css" /> -->
<link type="text/css" rel="stylesheet" href="/css/case/jquery.qtip.css" />
<link rel="stylesheet" type="text/css" href="/css/clipreport.css">
<link rel="stylesheet" type="text/css" href="/css/UserConfig.css">
@ -69,49 +66,44 @@
<![endif]-->
<!-- js -->
<!-- 필요한 js 추후 추가 예정 -->
<!-- 라이브러리, 플러그인 -->
<script src="/js/lib/jquery.blockUI.js"></script>
<script src="/js/lib/jquery-1.9.1.min.js"></script>
<script src="/js/lib/jquery-ui.min.js"></script>
<!-- <script src="/js/lib/jquery-1.9.1.min.js"></script>
<script src="/js/lib/jquery.blockUI.js"></script>
<script src="/js/lib/jquery.pjax.js"></script>
<script src="/js/lib/modernizr-custom.js"></script>
<script src="/js/lib/jquery.mCustomScrollbar.concat.min.js"></script>
<script src="/js/lib/jquery.bxslider.min.js"></script>
<script src="/js/lib/picker.js"></script>
<script src="/js/lib/picker.date.js"></script>
<script src="/js/lib/legacy.js"></script>
<script src="/js/lib/base64.js"></script> -->
<script src="/js/lib/base64.js"></script>
<!-- 라이브러리, 플러그인 끝 -->
<!-- <script src="/js/jquery.seed.js"></script>
<script src="/js/smartPop.js"></script>
<script src="/js/jquery.seed.js"></script>
<!-- <script src="/js/smartPop.js"></script> -->
<script src="/js/seed.common.js"></script>
<script src="/js/seed.tab.js"></script> -->
<!-- <script src="/js/seed.tab.js"></script> -->
<script src="/js/seed.app.js"></script>
<script src="/js/lib/jquery.bxslider.min.js"></script>
<script src="/js/jquery.form.js"></script>
<script src="/js/commonFileUtil.js"></script>
<script src="/js/common_XHR.js"></script>
<script src="/js/jquery.selectboxes.js"></script>
<!-- <script src="/js/jquery.form.js"></script>
<script src="/js/common.js"></script>
<script src="/js/DateTimePicker.js"></script>
-->
<script src="/js/jquery.selectboxes.js"></script>
<!-- 캘린더js -->
<!-- <script src="/js/moment.min.js"></script>
<script src="/js/moment.min.js"></script>
<script src="/js/fullcalendar.min.js"></script>
<script src="/js/scheduler.min.js"></script>
<script src="/js/gcal.js"></script>
<script src="/js/jquery.qtip.js"></script>
<script type='text/javascript' src='/js/clipreport.js'></script>
<script type='text/javascript' src='/js/UserConfig.js'></script> -->
<script type='text/javascript' src='/js/UserConfig.js'></script>
<!-- js -->
<script>
</script>
</head>

3
src/main/webapp/WEB-INF/views/_common/_js/seed.app.js
View File

@ -9,7 +9,8 @@ window.seedApp = window.seedApp || (function( $ ){
****************************************************************************************************** */
$.tailFlag = false;
$('a[href="#"], a[href="#none"]').on('click.DefaultClick', false);
/*레프트 메뉴 이동 오류로 인하여 주석처리*/
/*$('a[href="#"], a[href="#none"]').on('click.DefaultClick', false);*/
$.fn.noop = function(){
return this;

3
src/main/webapp/WEB-INF/views/_common/_js/seed.common.js
View File

@ -4,7 +4,8 @@
function Seed(){
$('a[href="#"], a[href="#none"]').on('click.DefaultClick', false);
/*레프트 메뉴 이동 오류로 인하여 주석처리*/
/*$('a[href="#"], a[href="#none"]').on('click.DefaultClick', false);*/
var $root = $(window),
$document = $(document),