Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Commit

Permalink
Merge branch 'editor'
Browse files Browse the repository at this point in the history
  • Loading branch information
SOYIJUN committed Mar 15, 2019
2 parents 5795f6f + 657d317 commit 8eb0c4c
Show file tree
Hide file tree
Showing 6 changed files with 137 additions and 90 deletions.
48 changes: 0 additions & 48 deletions opengds2018prod/src/main/resources/static/resources/js/gb/gb_debug.js
View file

This file was deleted.

108 changes: 108 additions & 0 deletions opengds2018prod/src/main/resources/static/resources/js/gb/gb_namespace.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/**
* @namespace {Object} gb
*/
var gb;
if (!gb)
gb = {};
/**
* @namespace {Object} gb.crs
* @memberof gb
*/
if (!gb.crs)
gb.crs = {};
/**
* @namespace {Object} gb.edit
* @memberof gb
*/
if (!gb.edit)
gb.edit = {};
/**
* @namespace {Object} gb.embed
* @memberof gb
*/
if (!gb.embed)
gb.embed = {};
/**
* @namespace {Object} gb.footer
* @memberof gb
*/
if (!gb.footer)
gb.footer = {};
/**
* @namespace {Object} gb.geoserver
* @memberof gb
*/
if (!gb.geoserver)
gb.geoserver = {};
/**
* @namespace {Object} gb.header
* @memberof gb
*/
if (!gb.header)
gb.header = {};
/**
* @namespace {Object} gb.interaction
* @memberof gb
*/
if (!gb.interaction)
gb.interaction = {};
/**
* @namespace {Object} gb.layer
* @memberof gb
*/
if (!gb.layer)
gb.layer = {};
/**
* @namespace {Object} gb.map
* @memberof gb
*/
if (!gb.map)
gb.map = {};
/**
* @namespace {Object} gb.modal
* @memberof gb
*/
if (!gb.modal)
gb.modal = {};
/**
* @namespace {Object} gb.module
* @memberof gb
*/
if (!gb.module)
gb.module = {};
/**
* @namespace {Object} gb.overriding
* @memberof gb
*/
if (!gb.overriding)
gb.overriding = {};
/**
* @namespace {Object} gb.panel
* @memberof gb
*/
if (!gb.panel)
gb.panel = {};
/**
* @namespace {Object} gb.style
* @memberof gb
*/
if (!gb.style)
gb.style = {};
/**
* @namespace {Object} gb.tree
* @memberof gb
*/
if (!gb.tree)
gb.tree = {};
/**
* @namespace {Object} gb.validation
* @memberof gb
*/
if (!gb.validation)
gb.validation = {};
/**
* @namespace {Object} gb.versioning
* @memberof gb
*/
if (!gb.versioning)
gb.versioning = {};
46 changes: 22 additions & 24 deletions opengds2018prod/src/main/resources/static/resources/js/gb/versioning/feature.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,12 @@ gb.versioning.Feature = function(obj) {
var th1 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.author[that.locale]);
var th2 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.time[that.locale]);
var th3 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.type[that.locale]);
var th4 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.detail[that.locale]);
var th5 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.revert[that.locale]);
var thr = $("<div>").addClass("tr").addClass("gb-versioning-feature-tr").append(th1).append(th2).append(th3).append(th4);
var thead = $("<div>").addClass("thead").addClass("gb-versioning-feature-trg").append(thr).css({
var th4 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.detail[that.locale]).css({
"text-align" : "center"
});
var th5 = $("<div>").addClass("th").addClass("gb-versioning-feature-td").text(that.translation.revert[that.locale]);
var thr = $("<div>").addClass("tr").addClass("gb-versioning-feature-tr").append(th1).append(th2).append(th3).append(th4);
var thead = $("<div>").addClass("thead").addClass("gb-versioning-feature-trg").append(thr);

var table = $("<div>").addClass("gb-table").css({
"display" : "table",
Expand Down Expand Up @@ -357,9 +357,7 @@ gb.versioning.Feature.prototype.loadFeatureHistory = function(server, repo, path
continue;
}
}
var td1 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").append(data.simpleCommits[i].authorName).css({
"text-align" : "center"
});
var td1 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").append(data.simpleCommits[i].authorName);
var td2 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").append(data.simpleCommits[i].date).css({
"width" : "150px"
});
Expand All @@ -385,27 +383,27 @@ gb.versioning.Feature.prototype.loadFeatureHistory = function(server, repo, path
// $(that.getTBody()).find(".gb-versioning-feature-tr").last().find(".gb-button").attr("idx");
that.openDetailChanges(geoserver, repo, path, nidx, oidx);
});
var td4 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").css({
var td4 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").append(button).css({
"text-align" : "center"
}).append(button);
var refIcon = $("<i>").addClass("fas").addClass("fa-sync-alt");
var rvButton = $("<button>").addClass("gb-button-clear").addClass("gb-versioning-feature-revert-btn").append(refIcon)
.click(function() {
var geoserver = that.getServer();
var repo = that.getRepo();
var path = that.getPath();
var ocommit = $(this).parents().eq(1).find(".gb-versioning-feature-detail-btn").val();
var ncommit = $(this).parents().eq(2).children().first().find(".gb-versioning-feature-detail-btn").val();
that.openRevertModal(geoserver, repo, path, ocommit, ncommit);
});
var td5 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").css({
"text-align" : "center",
"width" : "100px"
}).append(rvButton);
});
/*
* var refIcon = $("<i>").addClass("fas").addClass("fa-sync-alt");
* var rvButton = $("<button>").addClass("gb-button-clear").addClass("gb-versioning-feature-revert-btn").append(refIcon)
* .click(function() { var geoserver = that.getServer(); var
* repo = that.getRepo(); var path = that.getPath(); var
* ocommit =
* $(this).parents().eq(1).find(".gb-versioning-feature-detail-btn").val();
* var ncommit =
* $(this).parents().eq(2).children().first().find(".gb-versioning-feature-detail-btn").val();
* that.openRevertModal(geoserver, repo, path, ocommit,
* ncommit); }); var td5 = $("<div>").addClass("td").addClass("gb-versioning-feature-td").css({
* "text-align" : "center", "width" : "100px"
* }).append(rvButton);
*/

if (i === 0) {
$(button).prop("disabled", true);
$(rvButton).prop("disabled", true);
// $(rvButton).prop("disabled", true);
}

var msg = $("<div>").addClass("gb-tooltip-text").text(data.simpleCommits[i].message);
Expand Down
4 changes: 1 addition & 3 deletions opengds2018prod/src/main/webapp/WEB-INF/jsp/common/libimport.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<!-- gb CSS -->
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/js/gb/css/gb.css">
<!-- gb namespace -->
<script src="${pageContext.request.contextPath}/resources/js/gb/gb_debug.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/gb_namespace.js"></script>
<!-- gb.modal -->
<script src="${pageContext.request.contextPath}/resources/js/gb/modal/base.js"></script>
<!-- gb 임베드 베이스 -->
Expand All @@ -52,5 +52,3 @@
<script src="${pageContext.request.contextPath}/resources/js/gb/validation/layerdefinition.js"></script>
<!-- gb 옵션 정의 -->
<script src="${pageContext.request.contextPath}/resources/js/gb/validation/optiondefinition.js"></script>
<!-- gb 검수 파일 정보 -->
<script src="${pageContext.request.contextPath}/resources/js/gb/modal/detailinformation.js"></script>
12 changes: 6 additions & 6 deletions opengds2018prod/src/main/webapp/WEB-INF/jsp/common/libimport_editor.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,22 @@
<!-- gb CSS -->
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/js/gb/css/gb.css">
<!-- gb namespace -->
<script src="${pageContext.request.contextPath}/resources/js/gb/gb_debug.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/gb_namespace.js"></script>
<!-- gb module -->
<script src="${pageContext.request.contextPath}/resources/js/gb/module/isEditing.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/module/serviceVersion.js"></script>
<!-- gb map -->
<!-- gb.map.Map -->
<script src="${pageContext.request.contextPath}/resources/js/gb/map/map.js"></script>
<!-- gb.map.MousePosition -->
<script src="${pageContext.request.contextPath}/resources/js/gb/map/mouseposition.js"></script>
<!-- gb.modal -->
<script src="${pageContext.request.contextPath}/resources/js/gb/modal/base.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/edit/modifylayerprop.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/validation/validation.js"></script>
<!-- gb panel base -->
<script src="${pageContext.request.contextPath}/resources/js/gb/panel/base.js"></script>
<!-- gb basemap -->
<!-- gb.style -->
<script src="${pageContext.request.contextPath}/resources/js/gb/style/basemap.js"></script>
<!-- gb layerstyle -->
<script src="${pageContext.request.contextPath}/resources/js/gb/style/layerstyle.js"></script>
<!-- gb layerstyle -->
<script src="${pageContext.request.contextPath}/resources/js/spectrum/spectrum.js"></script>
Expand All @@ -120,6 +121,7 @@
<!-- gb.edit -->
<script src="${pageContext.request.contextPath}/resources/js/gb/edit/edithistory.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/edit/undo.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/edit/modifylayerprop.js"></script>
<!-- gb.footer -->
<script src="${pageContext.request.contextPath}/resources/js/gb/footer/base.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/footer/featureList.js"></script>
Expand All @@ -136,8 +138,6 @@
<!-- gb.geocoder -->
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/js/gb/css/ol-geocoder.css">
<script src="${pageContext.request.contextPath}/resources/js/gb/geocoder/ol-geocoder.js"></script>
<!-- gb.map.MousePosition -->
<script src="${pageContext.request.contextPath}/resources/js/gb/map/mouseposition.js"></script>
<script src="${pageContext.request.contextPath}/resources/js/gb/geocoder/ol-geocoder.js"></script>
<!-- gb.geoserver.ImportSHP-->
<script src="${pageContext.request.contextPath}/resources/js/gb/geoserver/uploadshp.js"></script>
Expand Down
9 changes: 0 additions & 9 deletions opengds2018prod/src/main/webapp/WEB-INF/jsp/user/list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@
</head>
<body>
<script>
var detail = new gb.modal.DetailInformation({
"target" : ".gb-detailinformation-btn"
});
$(document).on("click", ".gb-detailinformation-btn", function(e) {
e.stopPropagation();
e.preventDefault();
});
$(document).on("click", ".gb-download-btn", function(e) {
e.stopPropagation();
});
Expand Down

0 comments on commit 8eb0c4c

Please sign in to comment.