merge

src/components/views/rooms/MessageComposerInputOld.js

@@ -35,7 +35,7 @@ export function onSendMessageFailed(err, room) {
         Modal.createDialog(UnknownDeviceDialog, {
             devices: err.devices,
             room: room,
-        });
+        }, "mx_Dialog_unknownDevice");
     }
     dis.dispatch({
         action: 'message_send_failed',

src/components/views/rooms/ReadReceiptMarker.js

@@ -170,15 +170,15 @@ module.exports = React.createClass({
 
         let title;
         if (this.props.timestamp) {
-            let suffix = " (" + this.props.member.userId + ")";
+            const prefix = "Seen by " + this.props.member.userId + " at ";
             let ts = new Date(this.props.timestamp);
             if (this.props.showFullTimestamp) {
                 // "15/12/2016, 7:05:45 PM (@alice:matrix.org)"
-                title = ts.toLocaleString() + suffix;
+                title = prefix + ts.toLocaleString();
             }
             else {
                 // "7:05:45 PM (@alice:matrix.org)"
-                title = ts.toLocaleTimeString() + suffix;
+                title = prefix + ts.toLocaleTimeString();
             }
         }
 
@@ -192,9 +192,9 @@ module.exports = React.createClass({
                     width={14} height={14} resizeMethod="crop"
                     style={style}
                     title={title}
+                    onClick={this.props.onClick}
                 />
             </Velociraptor>
         );
-        /* onClick={this.props.onClick} */
     },
 });

src/components/views/rooms/RoomHeader.js

@@ -301,8 +301,8 @@ module.exports = React.createClass({
         var rightPanel_buttons;
         if (this.props.collapsedRhs) {
             rightPanel_buttons =
-                <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="<">
-                    <TintableSvg src="img/minimise.svg" width="10" height="16"/>
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="Show panel">
+                    <TintableSvg src="img/maximise.svg" width="10" height="16"/>
                 </AccessibleButton>;
         }
 

src/components/views/rooms/RoomPreviewBar.js

@@ -146,7 +146,7 @@ module.exports = React.createClass({
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
                         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?
+                        <a onClick={ this.props.onJoinClick }><b>Click here</b></a> to join the discussion!
                     </div>
                 </div>
             );