Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js =================================================================== diff -u -r0458868e2f55929c8fe0cb20fb8f5fb5e416dee6 -r19f54f3fdc1ef0f050e34673a5c66b1d5466e684 --- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 0458868e2f55929c8fe0cb20fb8f5fb5e416dee6) +++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 19f54f3fdc1ef0f050e34673a5c66b1d5466e684) @@ -3,19 +3,19 @@ 'use strict'; grunt.initConfig({ - pkg : grunt.file.readJSON('package.json'), - connect:{ + pkg: grunt.file.readJSON('package.json'), + connect: { server: { options: { - port:9999, + port: 9999, hostname: '0.0.0.0', middleware: function (connect, options, defaultMiddleware) { - defaultMiddleware.unshift(function(req, res, next) { + defaultMiddleware.unshift(function (req, res, next) { res.setHeader('Access-Control-Allow-Credentials', true); res.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.setHeader('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS'); - if (req.method.toUpperCase() == 'POST') req.method='GET'; + if (req.method.toUpperCase() == 'POST') req.method = 'GET'; return next(); }); @@ -28,8 +28,8 @@ }, proxies: [ { - context: ['/auth-anon','/auth-user','/auth-admin','/auth-check','/sso','/dwr','/logout'], - //host:'www.313.co.kr', + context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], + // host: 'www.313.co.kr', host: '127.0.0.1', port: 13131, https: false, @@ -38,13 +38,13 @@ ] }, }, - watch : { - less : { + watch: { + less: { // Compiles less files upon saving files: ['build/less/*.less'], tasks: ['less:development', 'less:production', 'replace', 'notify:less'] }, - js : { + js: { // Compile js files upon saving files: ['build/js/*.js'], tasks: ['js', 'notify:js'] @@ -59,94 +59,94 @@ notify: { less: { options: { - title : 'AdminLTE', + title: 'AdminLTE', message: 'LESS finished running' } }, - js : { + js: { options: { - title : 'AdminLTE', + title: 'AdminLTE', message: 'JS bundler finished running' } } }, // 'less'-task configuration // This task will compile all less files upon saving to create both AdminLTE.css and AdminLTE.min.css - less : { + less: { // Development not compressed - development : { + development: { files: { // compilation.css : source.less - 'dist/css/AdminLTE.css' : 'build/less/AdminLTE.less', + 'dist/css/AdminLTE.css': 'build/less/AdminLTE.less', // AdminLTE without plugins - 'dist/css/alt/AdminLTE-without-plugins.css' : 'build/less/AdminLTE-without-plugins.less', + 'dist/css/alt/AdminLTE-without-plugins.css': 'build/less/AdminLTE-without-plugins.less', // Separate plugins - 'dist/css/alt/AdminLTE-select2.css' : 'build/less/select2.less', - 'dist/css/alt/AdminLTE-fullcalendar.css' : 'build/less/fullcalendar.less', + 'dist/css/alt/AdminLTE-select2.css': 'build/less/select2.less', + 'dist/css/alt/AdminLTE-fullcalendar.css': 'build/less/fullcalendar.less', 'dist/css/alt/AdminLTE-bootstrap-social.css': 'build/less/bootstrap-social.less' } }, // Production compressed version - production : { + production: { options: { compress: true }, - files : { + files: { // compilation.css : source.less - 'dist/css/AdminLTE.min.css' : 'build/less/AdminLTE.less', + 'dist/css/AdminLTE.min.css': 'build/less/AdminLTE.less', // AdminLTE without plugins - 'dist/css/alt/AdminLTE-without-plugins.min.css' : 'build/less/AdminLTE-without-plugins.less', + 'dist/css/alt/AdminLTE-without-plugins.min.css': 'build/less/AdminLTE-without-plugins.less', // Separate plugins - 'dist/css/alt/AdminLTE-select2.min.css' : 'build/less/select2.less', - 'dist/css/alt/AdminLTE-fullcalendar.min.css' : 'build/less/fullcalendar.less', + 'dist/css/alt/AdminLTE-select2.min.css': 'build/less/select2.less', + 'dist/css/alt/AdminLTE-fullcalendar.min.css': 'build/less/fullcalendar.less', 'dist/css/alt/AdminLTE-bootstrap-social.min.css': 'build/less/bootstrap-social.less' } }, // Non minified skin files - skins : { + skins: { files: { - 'dist/css/skins/skin-blue.css' : 'build/less/skins/skin-blue.less', - 'dist/css/skins/skin-black.css' : 'build/less/skins/skin-black.less', - 'dist/css/skins/skin-yellow.css' : 'build/less/skins/skin-yellow.less', - 'dist/css/skins/skin-green.css' : 'build/less/skins/skin-green.less', - 'dist/css/skins/skin-red.css' : 'build/less/skins/skin-red.less', - 'dist/css/skins/skin-purple.css' : 'build/less/skins/skin-purple.less', - 'dist/css/skins/skin-blue-light.css' : 'build/less/skins/skin-blue-light.less', - 'dist/css/skins/skin-black-light.css' : 'build/less/skins/skin-black-light.less', + 'dist/css/skins/skin-blue.css': 'build/less/skins/skin-blue.less', + 'dist/css/skins/skin-black.css': 'build/less/skins/skin-black.less', + 'dist/css/skins/skin-yellow.css': 'build/less/skins/skin-yellow.less', + 'dist/css/skins/skin-green.css': 'build/less/skins/skin-green.less', + 'dist/css/skins/skin-red.css': 'build/less/skins/skin-red.less', + 'dist/css/skins/skin-purple.css': 'build/less/skins/skin-purple.less', + 'dist/css/skins/skin-blue-light.css': 'build/less/skins/skin-blue-light.less', + 'dist/css/skins/skin-black-light.css': 'build/less/skins/skin-black-light.less', 'dist/css/skins/skin-yellow-light.css': 'build/less/skins/skin-yellow-light.less', - 'dist/css/skins/skin-green-light.css' : 'build/less/skins/skin-green-light.less', - 'dist/css/skins/skin-red-light.css' : 'build/less/skins/skin-red-light.less', + 'dist/css/skins/skin-green-light.css': 'build/less/skins/skin-green-light.less', + 'dist/css/skins/skin-red-light.css': 'build/less/skins/skin-red-light.less', 'dist/css/skins/skin-purple-light.css': 'build/less/skins/skin-purple-light.less', - 'dist/css/skins/_all-skins.css' : 'build/less/skins/_all-skins.less' + 'dist/css/skins/_all-skins.css': 'build/less/skins/_all-skins.less' } }, // Skins minified minifiedSkins: { options: { compress: true }, - files : { - 'dist/css/skins/skin-blue.min.css' : 'build/less/skins/skin-blue.less', - 'dist/css/skins/skin-black.min.css' : 'build/less/skins/skin-black.less', - 'dist/css/skins/skin-yellow.min.css' : 'build/less/skins/skin-yellow.less', - 'dist/css/skins/skin-green.min.css' : 'build/less/skins/skin-green.less', - 'dist/css/skins/skin-red.min.css' : 'build/less/skins/skin-red.less', - 'dist/css/skins/skin-purple.min.css' : 'build/less/skins/skin-purple.less', - 'dist/css/skins/skin-blue-light.min.css' : 'build/less/skins/skin-blue-light.less', - 'dist/css/skins/skin-black-light.min.css' : 'build/less/skins/skin-black-light.less', + files: { + 'dist/css/skins/skin-blue.min.css': 'build/less/skins/skin-blue.less', + 'dist/css/skins/skin-black.min.css': 'build/less/skins/skin-black.less', + 'dist/css/skins/skin-yellow.min.css': 'build/less/skins/skin-yellow.less', + 'dist/css/skins/skin-green.min.css': 'build/less/skins/skin-green.less', + 'dist/css/skins/skin-red.min.css': 'build/less/skins/skin-red.less', + 'dist/css/skins/skin-purple.min.css': 'build/less/skins/skin-purple.less', + 'dist/css/skins/skin-blue-light.min.css': 'build/less/skins/skin-blue-light.less', + 'dist/css/skins/skin-black-light.min.css': 'build/less/skins/skin-black-light.less', 'dist/css/skins/skin-yellow-light.min.css': 'build/less/skins/skin-yellow-light.less', - 'dist/css/skins/skin-green-light.min.css' : 'build/less/skins/skin-green-light.less', - 'dist/css/skins/skin-red-light.min.css' : 'build/less/skins/skin-red-light.less', + 'dist/css/skins/skin-green-light.min.css': 'build/less/skins/skin-green-light.less', + 'dist/css/skins/skin-red-light.min.css': 'build/less/skins/skin-red-light.less', 'dist/css/skins/skin-purple-light.min.css': 'build/less/skins/skin-purple-light.less', - 'dist/css/skins/_all-skins.min.css' : 'build/less/skins/_all-skins.less' + 'dist/css/skins/_all-skins.min.css': 'build/less/skins/_all-skins.less' } } }, // Uglify task info. Compress the js files. uglify: { - options : { - mangle : true, + options: { + mangle: true, output: { comments: 'some' }, @@ -162,25 +162,25 @@ concat: { options: { separator: '\n\n', - banner : '/*! AdminLTE app.js\n' - + '* ================\n' - + '* Main JS application file for AdminLTE v2. This file\n' - + '* should be included in all pages. It controls some layout\n' - + '* options and implements exclusive AdminLTE plugins.\n' - + '*\n' - + '* @author Colorlib\n' - + '* @support \n' - + '* @version <%= pkg.version %>\n' - + '* @repository <%= pkg.repository.url %>\n' - + '* @license MIT \n' - + '*/\n\n' - + '// Make sure jQuery has been loaded\n' - + 'if (typeof jQuery === \'undefined\') {\n' - + 'throw new Error(\'AdminLTE requires jQuery\')\n' - + '}\n\n' + banner: '/*! AdminLTE app.js\n' + + '* ================\n' + + '* Main JS application file for AdminLTE v2. This file\n' + + '* should be included in all pages. It controls some layout\n' + + '* options and implements exclusive AdminLTE plugins.\n' + + '*\n' + + '* @author Colorlib\n' + + '* @support \n' + + '* @version <%= pkg.version %>\n' + + '* @repository <%= pkg.repository.url %>\n' + + '* @license MIT \n' + + '*/\n\n' + + '// Make sure jQuery has been loaded\n' + + 'if (typeof jQuery === \'undefined\') {\n' + + 'throw new Error(\'AdminLTE requires jQuery\')\n' + + '}\n\n' }, - dist : { - src : [ + dist: { + src: [ 'build/js/BoxRefresh.js', 'build/js/BoxWidget.js', 'build/js/ControlSidebar.js', @@ -196,23 +196,23 @@ // Replace image paths in AdminLTE without plugins replace: { - withoutPlugins : { - src : ['dist/css/alt/AdminLTE-without-plugins.css'], - dest : 'dist/css/alt/AdminLTE-without-plugins.css', + withoutPlugins: { + src: ['dist/css/alt/AdminLTE-without-plugins.css'], + dest: 'dist/css/alt/AdminLTE-without-plugins.css', replacements: [ { from: '../img', - to : '../../img' + to: '../../img' } ] }, withoutPluginsMin: { - src : ['dist/css/alt/AdminLTE-without-plugins.min.css'], - dest : 'dist/css/alt/AdminLTE-without-plugins.min.css', + src: ['dist/css/alt/AdminLTE-without-plugins.min.css'], + dest: 'dist/css/alt/AdminLTE-without-plugins.min.css', replacements: [ { from: '../img', - to : '../../img' + to: '../../img' } ] } @@ -221,12 +221,12 @@ // Build the documentation files includes: { build: { - src : ['*.html'], // Source files - dest : 'documentation/', // Destination directory + src: ['*.html'], // Source files + dest: 'documentation/', // Destination directory flatten: true, - cwd : 'documentation/build', + cwd: 'documentation/build', options: { - silent : true, + silent: true, includePath: 'documentation/build/include' } } @@ -238,9 +238,9 @@ files: [ { expand: true, - cwd : 'build/img/', - src : ['**/*.{png,jpg,gif,svg,jpeg}'], - dest : 'dist/img/' + cwd: 'build/img/', + src: ['**/*.{png,jpg,gif,svg,jpeg}'], + dest: 'dist/img/' } ] } @@ -251,19 +251,19 @@ options: { jshintrc: 'build/js/.jshintrc' }, - grunt : { + grunt: { options: { jshintrc: 'build/grunt/.jshintrc' }, - src : 'Gruntfile.js' + src: 'Gruntfile.js' }, - core : { + core: { src: 'build/js/*.js' }, - demo : { + demo: { src: 'dist/js/demo.js' }, - pages : { + pages: { src: 'dist/js/pages/*.js' } }, @@ -272,10 +272,10 @@ options: { config: 'build/js/.jscsrc' }, - core : { + core: { src: '<%= jshint.core.src %>' }, - pages : { + pages: { src: '<%= jshint.pages.src %>' } }, @@ -285,7 +285,7 @@ options: { csslintrc: 'build/less/.csslintrc' }, - dist : [ + dist: [ 'dist/css/AdminLTE.css' ] }, @@ -295,7 +295,7 @@ options: { relaxerror: ['W005'] }, - files : ['pages/**/*.html', '*.html'] + files: ['pages/**/*.html', '*.html'] }, // Delete images in build directory Index: arms/html/pdServiceVersion/content-container.html =================================================================== diff -u -rd2b2bf2a9cef41cdfa2a622b6352cd719654ebc5 -r19f54f3fdc1ef0f050e34673a5c66b1d5466e684 --- arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision d2b2bf2a9cef41cdfa2a622b6352cd719654ebc5) +++ arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 19f54f3fdc1ef0f050e34673a5c66b1d5466e684) @@ -230,9 +230,9 @@
- - +
Index: arms/js/pdServiceVersion.js =================================================================== diff -u -r1b480ed3f05c4e24fe8d65dd9682aa00fcef92e5 -r19f54f3fdc1ef0f050e34673a5c66b1d5466e684 --- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 1b480ed3f05c4e24fe8d65dd9682aa00fcef92e5) +++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 19f54f3fdc1ef0f050e34673a5c66b1d5466e684) @@ -6,34 +6,9 @@ CKEDITOR.replace("input_pdservice_editor"); CKEDITOR.replace("modal-editor"); -// --- 팝업 띄울때 사이즈 조정 -- // -$("#modalPopupId").click(function () { - // alert() - // $("#modalTitle").text('제품(서비스) 신규 버전 등록 팝업'); - // $("#modalSub").text('선택한 제품(서비스)에 버전을 등록합니다.'); - // var height = $(document).height() - 400; - // $(".modal-body") - // .find(".cke_contents:eq(0)") - // .css("height", height + "px"); -}); -$("#versionPopup").click(function () { - // 편집하기 내의 팝업창 css 수정 - $("#modalTitle").text('제품(서비스) 버전 등록 / 변경'); - $("#modalSub").text('선택한 제품(서비스)에 버전을 등록/변경 합니다.'); - var height = $(document).height() - 400; - $(".modal-body") - .find(".cke_contents:eq(0)") - .css("height", height + "px"); - // modal - title -}); - - - - - // document ready $(function () { @@ -91,6 +66,50 @@ $("select[name=pdserviceTable_length]").css("width", "50px"); }); + +// --- 팝업 띄울때 사이즈 조정 -- // + +function modalPopup(id) { + // modalPopupId = 신규버전 + if (id === 'modalPopupId') { + $("#modalTitle").text('제품(서비스) 신규 버전 등록 팝업'); + $("#modalSub").text('선택한 제품(서비스)에 버전을 등록합니다.'); + } else { + $("#modalTitle").text('제품(서비스) 버전 등록 / 변경'); + $("#modalSub").text('선택한 제품(서비스)에 버전을 등록/변경 합니다.'); + } + + var height = $(document).height() - 800; + $(".modal-body") + .find(".cke_contents:eq(0)") + .css("height", height + "px"); +} + +// 신규버전 등록 팝업 +// $("#modalPopupId").click(function () { +// $("#modalTitle").text('제품(서비스) 신규 버전 등록 팝업'); +// $("#modalSub").text('선택한 제품(서비스)에 버전을 등록합니다.'); + +// var height = $(document).height() - 800; +// $(".modal-body") +// .find(".cke_contents:eq(0)") +// .css("height", height + "px"); +// }); + + +// 편집하기 팝업창으로 보기 팝업 +// $("#versionPopup").click(function () { + +// var height = $(document).height() - 800; +// console.log('height', height) +// $(".modal-body") +// .find(".cke_contents:eq(0)") +// .css("height", height + "px"); +// }); + + + + // 데이터 테이블 구성 이후 꼭 구현해야 할 메소드 : 열 클릭시 이벤트 function dataTableClick(selectedData) { $("#versionContents").html(""); @@ -222,10 +241,11 @@ `; for (let i = 0; i < menu.length; i++) {