From e55a375d6fc855711817aebbc7b0f42a67fcea8e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 17 Mar 2016 19:19:05 +0000
Subject: [PATCH] improve RoomPreviewBar as per
 https://github.com/vector-im/vector-web/issues/761

---
 src/components/structures/RoomView.js        | 4 ++++
 src/components/views/rooms/RoomPreviewBar.js | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 65dd9534d7..389d7be9fb 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1107,6 +1107,7 @@ module.exports = React.createClass({
                                                 canJoin={ true } canPreview={ false }
                                                 spinner={this.state.joining}
                                                 inviterName={inviterName}
+                                                room={this.state.room}
                                 />
                             </div>
                             <div className="mx_RoomView_messagePanel"></div>
@@ -1147,6 +1148,7 @@ module.exports = React.createClass({
                                             inviterName={ inviterName }
                                             canJoin={ true } canPreview={ false }
                                             spinner={this.state.joining}
+                                            room={this.state.room}                                            
                             />
                         </div>
                         <div className="mx_RoomView_messagePanel"></div>
@@ -1219,6 +1221,7 @@ module.exports = React.createClass({
                                 onRejectClick={ this.onRejectThreepidInviteButtonClicked }
                                 spinner={this.state.joining}
                                 inviterName={inviterName}
+                                room={this.state.room}                                
                 />
             );
         }
@@ -1226,6 +1229,7 @@ module.exports = React.createClass({
             aux = (
                 <RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true}
                                 spinner={this.state.joining} canPreview={ this.state.canPeek }
+                                room={this.state.room}
                 />
             );
         }
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 50159401cc..cb18e8cfd1 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -32,6 +32,7 @@ module.exports = React.createClass({
         canJoin: React.PropTypes.bool,
         canPreview: React.PropTypes.bool,
         spinner: React.PropTypes.bool,
+        room: React.PropTypes.object,
     },
 
     getDefaultProps: function() {
@@ -66,10 +67,13 @@ module.exports = React.createClass({
 
         }
         else if (this.props.canJoin) {
+            var name = this.props.room ? this.props.room.name : "";
+            name = name ? <b>{ name }</b> : "a room";
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        Would you like to <a onClick={ this.props.onJoinClick }>join</a> this room?
+                        You are trying to access { name }.<br/>
+                        Would you like to <a onClick={ this.props.onJoinClick }>join</a> in order to participate in the discussion?
                     </div>
                 </div>
             );