1 files changed, 34 insertions, 37 deletions

diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx
index 58cc1cac7..a55bf0039 100644
--- a/web/react/components/rhs_comment.jsx
+++ b/web/react/components/rhs_comment.jsx
@@ -8,6 +8,7 @@ var UserStore = require('../stores/user_store.jsx');
 var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
 var Utils = require('../utils/utils.jsx');
 var Constants = require('../utils/constants.jsx');
+var DeletePostModal = require('./delete_post_modal.jsx');
 var FileAttachmentList = require('./file_attachment_list.jsx');
 var Client = require('../utils/client.jsx');
 var AsyncClient = require('../utils/async_client.jsx');
@@ -114,12 +115,7 @@ export default class RhsComment extends React.Component {
                     <a
                         href='#'
                         role='menuitem'
-                        data-toggle='modal'
-                        data-target='#delete_post'
-                        data-title='Comment'
-                        data-postid={post.id}
-                        data-channelid={post.channel_id}
-                        data-comments={0}
+                        onClick={() => DeletePostModal.show(post, 0)}
                     >
                         {'Delete'}
                     </a>
@@ -135,7 +131,7 @@ export default class RhsComment extends React.Component {
             <div className='dropdown'>
                 <a
                     href='#'
-                    className='dropdown-toggle theme'
+                    className='post__dropdown dropdown-toggle'
                     type='button'
                     data-toggle='dropdown'
                     aria-expanded='false'
@@ -197,38 +193,39 @@ export default class RhsComment extends React.Component {
 
         return (
             <div className={'post ' + currentUserCss}>
-                <div className='post-profile-img__container'>
-                    <img
-                        className='post-profile-img'
-                        src={'/api/v1/users/' + post.user_id + '/image?time=' + timestamp + '&' + Utils.getSessionIndex()}
-                        height='36'
-                        width='36'
-                    />
-                </div>
                 <div className='post__content'>
-                    <ul className='post-header'>
-                        <li className='post-header-col'>
-                            <strong><UserProfile userId={post.user_id} /></strong>
-                        </li>
-                        <li className='post-header-col'>
-                            <time className='post-profile-time'>
-                                {Utils.displayCommentDateTime(post.create_at)}
-                            </time>
-                        </li>
-                        <li className='post-header-col post-header__reply'>
-                            {dropdown}
-                        </li>
-                    </ul>
-                    <div className='post-body'>
-                        <div className={postClass}>
-                            {loading}
-                            <div
-                                ref='message_holder'
-                                onClick={TextFormatting.handleClick}
-                                dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}}
-                            />
+                    <div className='post__img'>
+                        <img
+                            src={'/api/v1/users/' + post.user_id + '/image?time=' + timestamp + '&' + Utils.getSessionIndex()}
+                            height='36'
+                            width='36'
+                        />
+                    </div>
+                    <div>
+                        <ul className='post__header'>
+                            <li className='col__name'>
+                                <strong><UserProfile userId={post.user_id} /></strong>
+                            </li>
+                            <li className='col'>
+                                <time className='post__time'>
+                                    {Utils.displayCommentDateTime(post.create_at)}
+                                </time>
+                            </li>
+                            <li className='col col__reply'>
+                                {dropdown}
+                            </li>
+                        </ul>
+                        <div className='post__body'>
+                            <div className={postClass}>
+                                {loading}
+                                <div
+                                    ref='message_holder'
+                                    onClick={TextFormatting.handleClick}
+                                    dangerouslySetInnerHTML={{__html: TextFormatting.formatText(post.message)}}
+                                />
+                            </div>
+                            {fileAttachment}
                         </div>
-                        {fileAttachment}
                     </div>
                 </div>
             </div>