refs #1725 : added - close button.

- TODO : Design for close button. - TODO : Add button on modify/delete view.
Needlworks · Jan 17, 2015 · 964c8e5 · 964c8e5
1 parent 372dd2d
commit 964c8e5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -7,7 +7,7 @@
 define('TEXTCUBE_NAME', 'Textcube');
 define('TEXTCUBE_VERSION_ID', '1.10.2');
 define('TEXTCUBE_REVISION', 'root-main-branch1.10-r35');
-define('TEXTCUBE_CODENAME', ': Release Candidate 1');
+define('TEXTCUBE_CODENAME', 'Attacca');
 define('TEXTCUBE_VERSION', TEXTCUBE_VERSION_ID.' : '.TEXTCUBE_CODENAME);
 define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2015. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');

diff --git a/library/view/replyEditorView.php b/library/view/replyEditorView.php
@@ -98,10 +98,9 @@ function confirmOverwrite() {
 	<form name="commentToComment" method="post" action="<?php echo ($_POST['mode'] == 'edit' ? $blogURL . '/comment/delete/' . $suri['id'] : $suri['url']);?>">
 		<input type="hidden" name="mode" value="commit" />
 		<input type="hidden" name="oldPassword" value="<?php echo isset($_POST['password']) ? $_POST['password'] : '';?>" />
-
+		<a onclick="closeDialog();" href="#" class="close-button"><span>X</span></a>
 		<div id="comment-reply-box">
 			<img src="<?php echo $service['path'] . $adminSkinSetting['skin'];?>/image/img_comment_popup_logo.gif" alt="<?php echo _text('텍스트큐브 로고');?>" />
-
 			<div class="title"><span class="text" id="title"><?php echo $pageTitle ;?></span></div>
 <?php
 if($viewMode == 'comment') {

diff --git a/resources/script/common2.js b/resources/script/common2.js
@@ -1265,10 +1265,6 @@ function openCenteredDialog(url, dialogId, width, height) {
         loadCallback: function() {
             jQuery('#tcDialog iframe').contents().find('#commentSubmit').on('click', function(e) {
             });
-            jQuery('#tcDialog iframe').contents().find('#closes').on('click', function(e) {
-                alert("clicked");
-                tcDialog.close();
-            });
         }
     });
     tcDialogFrame = $('#tcDialog iframe');