Index: reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss =================================================================== diff -u -r9290220cdb089c416d1fc5f04bcbdbdc2c86f8db -r16323db1700c34f9686fe55bd88a67144558a450 --- reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 9290220cdb089c416d1fc5f04bcbdbdc2c86f8db) +++ reference/jquery-plugins/select2-4.0.13/src/scss/theme/default/layout.scss (.../layout.scss) (revision 16323db1700c34f9686fe55bd88a67144558a450) @@ -14,15 +14,49 @@ rightBottomTopForwardIcon(); var urlParams = new URL(location.href).searchParams; - var page = urlParams.get("page"); + var onlyContents = urlParams.get("withoutLayer"); + if (isEmpty(onlyContents)) { + $("body").removeAttr("class"); + } else { + $("body").addClass("sidebar-hidden"); + $("header.page-header").hide(); + } + $.getStylesheet = function(href) { + $("", { + rel: "stylesheet", + type: "text/css", + href: href + }).appendTo("head"); + }; + + $.getJavascript = function(href) { + $.ajax({ + url: href, + dataType: "script", + async: false, + cache: true + }); + }; + if (ajax_setup()) { + var page = urlParams.get("page"); if (includeLayout(page)) { - if (authUserCheck()) { + var str = window.location.href; + if (str.indexOf("community") > 0) { $.getScript("js/" + page + ".js", function () { /* 로그인 인증 여부 체크 함수 */ execDocReady(); }); + } else if (str.indexOf("arms") > 0) { + if (authUserCheck()) { + $.getScript("js/" + page + ".js", function () { + /* 로그인 인증 여부 체크 함수 */ + execDocReady(); + }); + } + } else { + alert("who are you?"); } } } @@ -330,10 +364,14 @@ $(`#${categoryName}`).css({ color: "#a4c6ff" }); $(`#${categoryName}`).css({ "font-weight": "900" }); - $(`#${listName}`).addClass("active"); - $(`#${listName}`).css({ color: "#a4c6ff" }); - $(`#${listName}`).css({ "font-weight": "900" }); - }, 1000); + if(isEmpty(listName)){ + console.log("listName → is null"); + }else{ + $(`#${listName}`).addClass("active"); + $(`#${listName}`).css({ color: "#a4c6ff" }); + $(`#${listName}`).css({ "font-weight": "900" }); + } + }, 313); } //////////////////////////////////////////////////////////////////////////////////////// @@ -952,18 +990,19 @@ } //데이터 테이블 하위에 상세 리스트 보이는거 지우기 -// Enumerate all rows -$("#hostTable") - .DataTable() - .rows() - .every(function () { - // If row has details expanded - if (this.child.isShown()) { - // Collapse row details - this.child.hide(); - $(this.node()).removeClass("shown"); - } - }); +function hideDetail_Datagrid() { + $("#hostTable") + .DataTable() + .rows() + .every(function () { + // If row has details expanded + if (this.child.isShown()) { + // Collapse row details + this.child.hide(); + $(this.node()).removeClass("shown"); + } + }); +} //////////////////////////////////////////////////////////////////////////////////////// Index: arms/js/dashboard.js =================================================================== diff -u -ra758e14a3543dc8564d19a37af52e3ebe2ac4644 -r16323db1700c34f9686fe55bd88a67144558a450 --- arms/js/dashboard.js (.../dashboard.js) (revision a758e14a3543dc8564d19a37af52e3ebe2ac4644) +++ arms/js/dashboard.js (.../dashboard.js) (revision 16323db1700c34f9686fe55bd88a67144558a450) @@ -6,40 +6,44 @@ function execDocReady() { - //좌측 메뉴 - setTimeout(function () { - $("#sidebar_menu_dashboard").css({ color: "#a4c6ff" }); - $("#sidebar_menu_dashboard").css({ "font-weight": "900" }); - }, 1000); - function tsExample(){ - // interface IPerson { - // name: String - // age: Number - // marry: Boolean - // family?: Object - // hobby?: any - // dead?: undefined - // } + $.when( + // $.getJavascript("../reference/light-blue/lib/vendor/jquery.ui.widget.js"), + // $.getJavascript("../reference/light-blue/lib/vendor/http_blueimp.github.io_JavaScript-Templates_js_tmpl.js"), + // $.getJavascript("../reference/light-blue/lib/vendor/http_blueimp.github.io_JavaScript-Load-Image_js_load-image.js"), + // $.getJavascript("../reference/light-blue/lib/vendor/http_blueimp.github.io_JavaScript-Canvas-to-Blob_js_canvas-to-blob.js"), + // $.getJavascript("../reference/light-blue/lib/jquery.iframe-transport.js"), + // $.getJavascript("../reference/light-blue/lib/jquery.fileupload.js"), + // $.getJavascript("../reference/light-blue/lib/jquery.fileupload-fp.js"), + // $.getJavascript("../reference/light-blue/lib/jquery.fileupload-ui.js"), + // $.getJavascript("../reference/lightblue4/docs/lib/slimScroll/jquery.slimscroll.min.js"), - // class PersonImp implements IPerson{ - // // IPerson 을 인용해서, - // // interface에 쓴 값을 다시 constructor안에 선언하는 이유는 interface에 선언한 값은 ~한 속성이 있어야 한다는 규약일뿐 선언된건 없음, - // // class 몸통엔 반드시 멤버속성이 등록되어 있어야 하므로 constructor안에 값을 써 줘야 사용 가능함. - // constructor(public name: string, public age : number , public marry : Boolean, public family? : Object, public hobby?: any, - // public dead?: undefined ){} - // } + // $.getJavascript("../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.cookie.js"), + // $.getJavascript("../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.hotkeys.js"), + // $.getJavascript("../reference/jquery-plugins/jstree-v.pre1.0/jquery.jstree.js"), + // $.getJavascript("../reference/jquery-plugins/jnotify_v2.1/jquery/jNotify.jquery.min.js"), + // $.getStylesheet("../reference/jquery-plugins/jnotify_v2.1/jquery/jNotify.jquery.css"), - // let jeck: IPerson = {name: 'jeck', age:18, marry: false} - // let {name , age} = jeck - // console.log(name, age) // jeck, 18 + // $.getStylesheet("../reference/jquery-plugins/dataTables-1.10.16/media/css/jquery.dataTables_lightblue4.css"), + // $.getStylesheet("../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/css/responsive.dataTables_lightblue4.css"), + // $.getStylesheet("../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/css/select.dataTables_lightblue4.css"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/media/js/jquery.dataTables.min.js"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/js/dataTables.responsive.min.js"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/js/dataTables.select.min.js"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/dataTables.buttons.min.js"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/buttons.html5.js"), + // $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/buttons.print.js") + //$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/jszip.min.js"), + //$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/pdfmake.min.js"), + //$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/vfs_fonts.js") + ).done(function() { - // // 타입변환 - // const num: number = 123; - // const str: string = num as string; // num 변수를 string 타입으로 변환 + //좌측 메뉴 + setSideMenu("sidebar_menu_dashboard", ""); + }); - } } var testData = testData(['Search', 'Referral', 'Direct', 'Organic'], Index: arms/template.html =================================================================== diff -u -r8a2ba38bfd9b5c9388c94b3be22b96ba4740a533 -r16323db1700c34f9686fe55bd88a67144558a450 --- arms/template.html (.../template.html) (revision 8a2ba38bfd9b5c9388c94b3be22b96ba4740a533) +++ arms/template.html (.../template.html) (revision 16323db1700c34f9686fe55bd88a67144558a450) @@ -147,99 +147,17 @@ rel="stylesheet" /> - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -292,68 +210,6 @@ alt="맨위로" /> - - - - - - - - - - + FishEye: Tag 16323db1700c34f9686fe55bd88a67144558a450 refers to a dead (removed) revision in file `community/js/common.js'. FishEye: No comparison available. Pass `N' to diff? Index: community/js/devtools.js =================================================================== diff -u -r32f9a5158ad5e1376803419c525edb989f0b3f24 -r16323db1700c34f9686fe55bd88a67144558a450 --- community/js/devtools.js (.../devtools.js) (revision 32f9a5158ad5e1376803419c525edb989f0b3f24) +++ community/js/devtools.js (.../devtools.js) (revision 16323db1700c34f9686fe55bd88a67144558a450) @@ -4,13 +4,39 @@ function execDocReady() { - // --- 에디터 설정 --- // - window.CKEDITOR_BASEPATH = "/reference/jquery-plugins/ckeditor4-4.16.1/"; $.when( - //$.getStylesheet("test.css"), - $.getScript( "../reference/jquery-plugins/ckeditor4-4.16.1/ckeditor.js" ), - // $.getScript( "test.js" ) - ).done(function(){ + $.getJavascript("../reference/light-blue/lib/vendor/jquery.ui.widget.js"), + $.getJavascript("../reference/light-blue/lib/vendor/http_blueimp.github.io_JavaScript-Templates_js_tmpl.js"), + $.getJavascript("../reference/light-blue/lib/vendor/http_blueimp.github.io_JavaScript-Load-Image_js_load-image.js"), + $.getJavascript("../reference/light-blue/lib/vendor/http_blueimp.github.io_JavaScript-Canvas-to-Blob_js_canvas-to-blob.js"), + $.getJavascript("../reference/light-blue/lib/jquery.iframe-transport.js"), + $.getJavascript("../reference/light-blue/lib/jquery.fileupload.js"), + $.getJavascript("../reference/light-blue/lib/jquery.fileupload-fp.js"), + $.getJavascript("../reference/light-blue/lib/jquery.fileupload-ui.js"), + + $.getJavascript("../reference/lightblue4/docs/lib/slimScroll/jquery.slimscroll.min.js"), + + // $.getJavascript("../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.cookie.js"), + // $.getJavascript("../reference/jquery-plugins/jstree-v.pre1.0/_lib/jquery.hotkeys.js"), + // $.getJavascript("../reference/jquery-plugins/jstree-v.pre1.0/jquery.jstree.js"), + $.getJavascript("../reference/jquery-plugins/jnotify_v2.1/jquery/jNotify.jquery.min.js"), + $.getStylesheet("../reference/jquery-plugins/jnotify_v2.1/jquery/jNotify.jquery.css"), + + $.getStylesheet("../reference/jquery-plugins/dataTables-1.10.16/media/css/jquery.dataTables_lightblue4.css"), + $.getStylesheet("../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/css/responsive.dataTables_lightblue4.css"), + $.getStylesheet("../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/css/select.dataTables_lightblue4.css"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/media/js/jquery.dataTables.min.js"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Responsive/js/dataTables.responsive.min.js"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Select/js/dataTables.select.min.js"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/dataTables.buttons.min.js"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/buttons.html5.js"), + $.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/buttons.print.js") + //$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/jszip.min.js"), + //$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/pdfmake.min.js"), + //$.getJavascript("../reference/jquery-plugins/dataTables-1.10.16/extensions/Buttons/js/vfs_fonts.js") + ).done(function() { + //좌측 메뉴 setSideMenu("sidebar_menu_dashboard", ""); }); Index: community/template.html =================================================================== diff -u --- community/template.html (revision 0) +++ community/template.html (revision 16323db1700c34f9686fe55bd88a67144558a450) @@ -0,0 +1,245 @@ + + + + 313 DEV GRP Community + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+ +
+ + +
+
+ +
+ + + 데이터를 처리 중입니다. + +
+ +
+ 맨위로 +
+ + + + + + + + + Index: reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js =================================================================== diff -u --- reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js (revision 0) +++ reference/jquery-plugins/dataTables-1.10.16/extensions/RowGroup/js/dataTables.rowsGroup.min.js (revision 16323db1700c34f9686fe55bd88a67144558a450) @@ -0,0 +1 @@ +(function(factory){'use strict';if(typeof define==='function'&&define.amd){define(['jquery'],function($){return factory($,window,document)})}else if(typeof exports==='object'){module.exports=function(root,$){if(!root){root=window}if(!$){$=typeof window!=='undefined'?require('jquery'):require('jquery')(root)}return factory($,root,root.document)}}else{factory(jQuery,window,document)}})(function($,window,document){ShowedDataSelectorModifier={order:'current',page:'current',search:'applied'};GroupedColumnsOrderDir='asc';var RowsGroup=function(dt,columnsForGrouping){this.table=dt.table();this.columnsForGrouping=columnsForGrouping;this.orderOverrideNow=false;this.mergeCellsNeeded=false;this.order=[];var self=this;dt.on('order.dt.rowsGroup',function(e,settings){if(!self.orderOverrideNow){self.orderOverrideNow=true;self._updateOrderAndDraw()}else{self.orderOverrideNow=false}});dt.on('preDraw.dt.rowsGroup',function(e,settings){if(self.mergeCellsNeeded){self.mergeCellsNeeded=false;self._mergeCells()}});dt.on('column-visibility.dt.rowsGroup',function(e,settings){self.mergeCellsNeeded=true});dt.on('search.dt.rowsGroup',function(e,settings){self.mergeCellsNeeded=true});dt.on('page.dt.rowsGroup',function(e,settings){self.mergeCellsNeeded=true});dt.on('length.dt.rowsGroup',function(e,settings){self.mergeCellsNeeded=true});dt.on('xhr.dt.rowsGroup',function(e,settings){self.mergeCellsNeeded=true});dt.on('destroy.dt.rowsGroup',function(e){dt.off('.rowsGroup')});this._updateOrderAndDraw()};RowsGroup.prototype={setMergeCells:function(){this.mergeCellsNeeded=true},mergeCells:function(){this.setMergeCells();this.table.draw()},_getOrderWithGroupColumns:function(order,groupedColumnsOrderDir){if(groupedColumnsOrderDir===undefined)groupedColumnsOrderDir=GroupedColumnsOrderDir;var self=this;var groupedColumnsIndexes=this.columnsForGrouping.map(function(columnSelector){return self.table.column(columnSelector).index()});var groupedColumnsKnownOrder=order.filter(function(columnOrder){return groupedColumnsIndexes.indexOf(columnOrder[0])>=0});var nongroupedColumnsOrder=order.filter(function(columnOrder){return groupedColumnsIndexes.indexOf(columnOrder[0])<0});var groupedColumnsKnownOrderIndexes=groupedColumnsKnownOrder.map(function(columnOrder){return columnOrder[0]});var groupedColumnsOrder=groupedColumnsIndexes.map(function(iColumn){var iInOrderIndexes=groupedColumnsKnownOrderIndexes.indexOf(iColumn);if(iInOrderIndexes>=0)return[iColumn,groupedColumnsKnownOrder[iInOrderIndexes][1]];else return[iColumn,groupedColumnsOrderDir]});groupedColumnsOrder.push.apply(groupedColumnsOrder,nongroupedColumnsOrder);return groupedColumnsOrder},_getInjectedMonoSelectWorkaround:function(order){if(order.length===1){var orderingColumn=order[0][0];var previousOrder=this.order.map(function(val){return val[0]});var iColumn=previousOrder.indexOf(orderingColumn);if(iColumn>=0){return[[orderingColumn,this._toogleDirection(this.order[iColumn][1])]]}}return order},_mergeCells:function(){var columnsIndexes=this.table.columns(this.columnsForGrouping,ShowedDataSelectorModifier).indexes().toArray();var showedRowsCount=this.table.rows(ShowedDataSelectorModifier)[0].length;this._mergeColumn(0,showedRowsCount-1,columnsIndexes)},_mergeColumn:function(iStartRow,iFinishRow,columnsIndexes){var columnsIndexesCopy=columnsIndexes.slice();currentColumn=columnsIndexesCopy.shift();currentColumn=this.table.column(currentColumn,ShowedDataSelectorModifier);var columnNodes=currentColumn.nodes();var columnValues=currentColumn.data();var newSequenceRow=iStartRow,iRow;for(iRow=iStartRow+1;iRow<=iFinishRow;++iRow){if(columnValues[iRow]===columnValues[newSequenceRow]){$(columnNodes[iRow]).hide()}else{$(columnNodes[newSequenceRow]).show();$(columnNodes[newSequenceRow]).attr('rowspan',iRow-1-newSequenceRow+1);if(columnsIndexesCopy.length>0)this._mergeColumn(newSequenceRow,iRow-1,columnsIndexesCopy);newSequenceRow=iRow}}$(columnNodes[newSequenceRow]).show();$(columnNodes[newSequenceRow]).attr('rowspan',iRow-1-newSequenceRow+1);if(columnsIndexesCopy.length>0)this._mergeColumn(newSequenceRow,iRow-1,columnsIndexesCopy)},_toogleDirection:function(dir){return dir=='asc'?'desc':'asc'},_updateOrderAndDraw:function(){this.mergeCellsNeeded=true;var currentOrder=this.table.order();currentOrder=this._getInjectedMonoSelectWorkaround(currentOrder);this.order=this._getOrderWithGroupColumns(currentOrder);this.table.order($.extend(true,Array(),this.order));this.table.draw()}};$.fn.dataTable.RowsGroup=RowsGroup;$.fn.DataTable.RowsGroup=RowsGroup;$(document).on('init.dt.rowsGroup',function(e,settings){if(e.namespace!=='dt'){return}var api=new $.fn.dataTable.Api(settings);if(settings.oInit.rowsGroup||$.fn.dataTable.defaults.rowsGroup){options=settings.oInit.rowsGroup?settings.oInit.rowsGroup:$.fn.dataTable.defaults.rowsGroup;var rowsGroup=new RowsGroup(api,options);$.fn.dataTable.Api.register('rowsgroup.update()',function(){rowsGroup.mergeCells();return this});$.fn.dataTable.Api.register('rowsgroup.updateNextDraw()',function(){rowsGroup.setMergeCells();return this})}})}); \ No newline at end of file