refs #1725 : added - close button on delete / modify pop-up (modal)

-
Needlworks · Jan 18, 2015 · bd21f78 · bd21f78
1 parent 17ad992
commit bd21f78
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/interface/blog/comment/delete/index.php b/interface/blog/comment/delete/index.php
@@ -223,7 +223,7 @@
 	<form name="deleteComment" method="post" action="<?php echo $context->getProperty('uri.blog');?>/comment/delete/<?php echo $context->getProperty('suri.id');?>">
 		<div id="comment-box">
 			<img src="<?php echo $context->getProperty('service.path') . $context->getProperty('admin.skin');?>/image/img_comment_popup_logo.gif" alt="<?php echo _text('텍스트큐브 로고');?>" />	
-
+			<a onclick="closeDialog();" href="#" class="close-button"><span>X</span></a>
 			<div id="command-box">
 <?php
 	$render = true;

diff --git a/resources/script/common2.js b/resources/script/common2.js
@@ -1276,7 +1276,11 @@ function openCenteredDialog(url, dialogId, width, height) {
 
 function closeDialog() {
     var scope = (window.location !== window.parent.location ? window.parent : window);
-    scope.tcDialog.close();
+    if (scope == window) {
+        scope.close();
+    } else {
+        scope.tcDialog.close();
+    }
     return false;
 }
 

diff --git a/skin/admin/canon/image/btn_close.png b/skin/admin/canon/image/btn_close.png
diff --git a/skin/admin/canon/index.xml b/skin/admin/canon/index.xml
@@ -2,7 +2,7 @@
 <adminSkin version="1.1" language="ko">
 	<information>
 		<name>Canon</name> 
-		<version>1.9</version>
+		<version>1.10.2</version>
 		<description><![CDATA[텍스트큐브 1.8의 관리자 화면 스킨입니다. Safari/Google Chrome/Firefox에서 동작합니다.]]></description>
 		<license><![CDATA[GPL]]></license>
 	</information> 

diff --git a/skin/admin/canon/popup-comment.css b/skin/admin/canon/popup-comment.css
@@ -28,6 +28,22 @@ body
 	border-radius: 2px;
 }
 
+/* Close button */
+a.close-button {
+	display:block;
+	position:absolute;
+	width:30px;
+	height:30px;
+	top:10px;
+	right:10px;
+	color:#fff;
+	background-image: url("./image/btn_close.png");
+}
+
+a.close-button span {
+	display:none;
+}
+
 /* Ask whether edit or delete ********************************************************************/
 
 #comment-box