1 files changed, 25 insertions, 18 deletions

diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 65247b705..e37de8d88 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -125,12 +125,12 @@ module.exports = React.createClass({
 
         $('body').on('mouseenter mouseleave', '.post', function(ev){
             if(ev.type === 'mouseenter'){
-                $(this).parent('div').prev('.date-seperator').addClass('hovered--after');
-                $(this).parent('div').next('.date-seperator').addClass('hovered--before');
+                $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after');
+                $(this).parent('div').next('.date-separator, .new-separator').addClass('hovered--before');
             }
             else {
-                $(this).parent('div').prev('.date-seperator').removeClass('hovered--after');
-                $(this).parent('div').next('.date-seperator').removeClass('hovered--before');
+                $(this).parent('div').prev('.date-separator, .new-separator').removeClass('hovered--after');
+                $(this).parent('div').next('.date-separator, .new-separator').removeClass('hovered--before');
             }
         });
 
@@ -356,6 +356,7 @@ module.exports = React.createClass({
                 var ui_name = channel.display_name
                 var members = ChannelStore.getCurrentExtraInfo().members;
                 var creator_name = "";
+                var userStyle = { color: UserStore.getCurrentUser().props.theme }
 
                 for (var i = 0; i < members.length; i++) {
                     if (members[i].roles.indexOf('admin') > -1) {
@@ -382,14 +383,24 @@ module.exports = React.createClass({
                             </p>
                         </div>
                     );
+                } else if (channel.name === Constants.OFFTOPIC_CHANNEL) {
+                    more_messages = (
+                        <div className="channel-intro">
+                            <h4 className="channel-intro-title">Welcome</h4>
+                            <p>
+                                {"This is the start of " + ui_name + ", a channel for conversations you’d prefer out of more focused channels."}
+                                <br/>
+                                <a className="intro-links" href="#" style={userStyle} data-toggle="modal" data-target="#edit_channel" data-desc={channel.description} data-title={ui_name} data-channelid={channel.id}><i className="fa fa-pencil"></i>Set a description</a>
+                            </p>
+                        </div>
+                    );
                 } else {
-                    var userStyle = { color: UserStore.getCurrentUser().props.theme }
                     var ui_type = channel.type === 'P' ? "private group" : "channel";
                     more_messages = (
                         <div className="channel-intro">
                             <h4 className="channel-intro-title">Welcome</h4>
                             <p>
-                                { creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "." 
+                                { creator_name != "" ? "This is the start of the " + ui_name + " " + ui_type + ", created by " + creator_name + " on " + utils.displayDate(channel.create_at) + "."
                                 : "This is the start of the " + ui_name + " " + ui_type + ", created on "+ utils.displayDate(channel.create_at) + "." }
                                 { channel.type === 'P' ? " Only invited members can see this private group." : " Any member can join and read this channel." }
                                 <br/>
@@ -434,9 +445,9 @@ module.exports = React.createClass({
             currentPostDay = utils.getDateForUnixTicks(post.create_at);
             if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) {
                 postCtls.push(
-                    <div className="date-seperator">
-                        <hr className="date-seperator__hr" />
-                        <div className="date-seperator__text">{currentPostDay.toDateString()}</div>
+                    <div className="date-separator">
+                        <hr className="separator__hr" />
+                        <div className="separator__text">{currentPostDay.toDateString()}</div>
                     </div>
                 );
             }
@@ -444,17 +455,13 @@ module.exports = React.createClass({
             if (post.create_at > last_viewed && !rendered_last_viewed) {
                 rendered_last_viewed = true;
                 postCtls.push(
-                    <div>
-                        <div className="new-seperator">
-                            <hr id="new_message" className="new-seperator__hr" />
-                            <div className="new-seperator__text">New Messages</div>
-                         </div>
-                         {postCtl}
-                     </div>
+                    <div className="new-separator">
+                        <hr id="new_message" className="separator__hr" />
+                        <div className="separator__text">New Messages</div>
+                    </div>
                 );
-            } else {
-                postCtls.push(postCtl);
             }
+            postCtls.push(postCtl);
             previousPostDay = utils.getDateForUnixTicks(post.create_at);
         }