#47 - Changes the location of the reply and edit comment box.

diff --git a/app/Repos/CommentRepo.php b/app/Repos/CommentRepo.php
index b8aa579c6ed56cabe8c9470dd3f977353d0e839a..ce71b923498ac0ed376ac25ab154f42852ddfb2b 100644 (file)
--- a/app/Repos/CommentRepo.php
+++ b/app/Repos/CommentRepo.php
@@ -46,8 +46,8 @@ class CommentRepo {
     }
 
     public function delete($comment) {
-        $comment->text = trans('activities.comment_deleted');
-        $comment->html = trans('activities.comment_deleted');
+        $comment->text = trans('entities.comment_deleted');
+        $comment->html = trans('entities.comment_deleted');
         $comment->active = false;
         $userId = user()->id;
         $comment->updated_by = $userId;

diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index 51f018232f708a14c25214026b184e005bccd2d2..67e77a5422958b7b68e3f2018569958954885100 100644 (file)
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -848,7 +848,7 @@ module.exports = function (ngApp, events) {
         comment.updated_by = resp.comment.updated_by;
         comment.active = resp.comment.active;
         if (isDelete && !resp.comment.active) {
-            comment.html = trans('activities.comment_deleted');
+            comment.html = trans('entities.comment_deleted');
         } else {
             comment.html = resp.comment.html;
         }

diff --git a/resources/assets/js/directives.js b/resources/assets/js/directives.js
index 5bd764fa7ee01acb35b569ecfdbe95fdfd76d6b4..3577cf3962ef9fb8a82286b2f2fcd4fe9ec98e98 100644 (file)
--- a/resources/assets/js/directives.js
+++ b/resources/assets/js/directives.js
@@ -890,7 +890,7 @@ module.exports = function (ngApp, events) {
                 });
 
                 element.on('click', function () {
-                    var $container = element.parents('.comment-box').first();
+                    var $container = element.parents('.comment-actions').first();
                     if (!$container.length) {
                         console.error('commentReplyLink directive should be placed inside a container with class comment-box!');
                         return;

diff --git a/resources/lang/en/activities.php b/resources/lang/en/activities.php
index 125326b3304416c8fc82c48f8c8b4cba504c6ee3..094f973062ae358d61ba381b0fd1a60d64a2d9d7 100644 (file)
--- a/resources/lang/en/activities.php
+++ b/resources/lang/en/activities.php
@@ -41,6 +41,5 @@ return [
     'comment_create_notification' => '',
     'comment_update_notification' => '',
     'comment_delete_notification' => '',
-    'comment_deleted'             => 'This comment has been deleted.'
 
 ];

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index dd7c54755d99198d3af30aa05c7e0f071879a9c0..c0439f0e144700307fd5c7d05ee6d9339dbd1efe 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -246,5 +246,6 @@ return [
     'one_comment' => '1 Comment',
     'comments_loading' => 'Loading...',
     'comment_save' => 'Save Comment',
-    'comment_cancel' => 'Cancel'
+    'comment_cancel' => 'Cancel',
+    'comment_deleted' => 'This comment has been deleted.'
 ];
\ No newline at end of file

diff --git a/resources/views/comments/list-item.blade.php b/resources/views/comments/list-item.blade.php
index 12629f0d6857d786fe32c14caa626f13ccaf1221..ec0b13f172762c2ee14ff938e10dc851a09253b8 100644 (file)
--- a/resources/views/comments/list-item.blade.php
+++ b/resources/views/comments/list-item.blade.php
@@ -10,7 +10,7 @@
 
         </div>
         <div ng-if="::!comment.active" class="comment-body comment-inactive">
-            {{ trans('activities.comment_deleted') }}
+            {{ trans('entities.comment_deleted') }}
         </div>
         <div class="comment-actions">
             <ul ng-if="!comment.is_hidden">