Add buttons to room sub list headers
Conflicts:
src/component-index.js
src/components/views/rooms/RoomList.js
cherry-picking commit ce119a6.
This commit is contained in:
David Baker
Luke Barnard
parent
d6d9a89453
commit
bff0577cb6
2 changed files with 102 additions and 13 deletions
75
src/components/views/elements/RoleButton.js
Normal file
75
src/components/views/elements/RoleButton.js
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
/*
|
||||
Copyright Vector Creations Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
import AccessibleButton from './AccessibleButton';
|
||||
import dis from '../../../dispatcher';
|
||||
import sdk from '../../../index';
|
||||
|
||||
export default React.createClass({
|
||||
displayName: 'RoleButton',
|
||||
|
||||
propTypes: {
|
||||
role: PropTypes.string.isRequired,
|
||||
size: PropTypes.string,
|
||||
},
|
||||
|
||||
getDefaultProps: function() {
|
||||
return {
|
||||
size: 25,
|
||||
};
|
||||
},
|
||||
|
||||
_onClick: function(ev) {
|
||||
ev.stopPropagation();
|
||||
|
||||
let action;
|
||||
switch(this.props.role) {
|
||||
case 'start_chat':
|
||||
action = 'view_create_chat';
|
||||
break;
|
||||
case 'room_directory':
|
||||
action = 'view_room_directory';
|
||||
break;
|
||||
case 'create_room':
|
||||
action = 'view_create_room';
|
||||
break;
|
||||
}
|
||||
if (action) dis.dispatch({action: action});
|
||||
},
|
||||
|
||||
_getIconPath() {
|
||||
switch(this.props.role) {
|
||||
case 'start_chat':
|
||||
return 'img/icons-people.svg';
|
||||
case 'room_directory':
|
||||
return 'img/icons-directory.svg';
|
||||
case 'create_room':
|
||||
return 'img/icons-create-room.svg';
|
||||
}
|
||||
},
|
||||
|
||||
render: function() {
|
||||
const TintableSvg = sdk.getComponent("elements.TintableSvg");
|
||||
|
||||
return (
|
||||
<AccessibleButton className="mx_RoleButton" onClick={ this._onClick }>
|
||||
<TintableSvg src={this._getIconPath()} width={this.props.size} height={this.props.size} />
|
||||
</AccessibleButton>
|
||||
);
|
||||
}
|
||||
});
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
Copyright 2015, 2016 OpenMarket Ltd
|
||||
Copyright Vector Creations Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
|
|
@ -510,27 +511,23 @@ module.exports = React.createClass({
|
|||
},
|
||||
|
||||
_getEmptyContent: function(section) {
|
||||
const RoleButton = sdk.getComponent('elements.RoleButton');
|
||||
if (this.state.totalRoomCount === 0) {
|
||||
const TintableSvg = sdk.getComponent('elements.TintableSvg');
|
||||
switch (section) {
|
||||
case 'im.vector.fake.direct':
|
||||
return <div className="mx_RoomList_emptySubListTip">
|
||||
<div className="mx_RoomList_butonPreview">
|
||||
<TintableSvg src="img/icons-people.svg" width="25" height="25" />
|
||||
</div>
|
||||
Use the button below to chat with someone!
|
||||
Press
|
||||
<RoleButton role='start_chat' size="16" />
|
||||
to start a chat with someone
|
||||
</div>;
|
||||
case 'im.vector.fake.recent':
|
||||
return <div className="mx_RoomList_emptySubListTip">
|
||||
<div className="mx_RoomList_butonPreview">
|
||||
<TintableSvg src="img/icons-directory.svg" width="25" height="25" />
|
||||
</div>
|
||||
Use the button below to browse the room directory
|
||||
<br /><br />
|
||||
<div className="mx_RoomList_butonPreview">
|
||||
<TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
|
||||
</div>
|
||||
or this button to start a new one!
|
||||
You're not in any rooms yet! Press
|
||||
<RoleButton role='create_room' size="16" />
|
||||
to make a room or
|
||||
<RoleButton role='room_directory' size="16" />
|
||||
to browse the directory
|
||||
</div>;
|
||||
}
|
||||
}
|
||||
|
|
@ -541,6 +538,21 @@ module.exports = React.createClass({
|
|||
return <RoomDropTarget label={labelText} />;
|
||||
},
|
||||
|
||||
_getHeaderItems: function(section) {
|
||||
const RoleButton = sdk.getComponent('elements.RoleButton');
|
||||
switch (section) {
|
||||
case 'im.vector.fake.direct':
|
||||
return <span className="mx_RoomList_headerButtons">
|
||||
<RoleButton role='start_chat' size="16" />
|
||||
</span>;
|
||||
case 'im.vector.fake.recent':
|
||||
return <span className="mx_RoomList_headerButtons">
|
||||
<RoleButton role='room_directory' size="16" />
|
||||
<RoleButton role='create_room' size="16" />
|
||||
</span>;
|
||||
}
|
||||
},
|
||||
|
||||
render: function() {
|
||||
var RoomSubList = sdk.getComponent('structures.RoomSubList');
|
||||
var self = this;
|
||||
|
|
@ -577,6 +589,7 @@ module.exports = React.createClass({
|
|||
label="People"
|
||||
tagName="im.vector.fake.direct"
|
||||
emptyContent={this._getEmptyContent('im.vector.fake.direct')}
|
||||
headerItems={this._getHeaderItems('im.vector.fake.direct')}
|
||||
editable={ true }
|
||||
order="recent"
|
||||
selectedRoom={ self.props.selectedRoom }
|
||||
|
|
@ -591,6 +604,7 @@ module.exports = React.createClass({
|
|||
label="Rooms"
|
||||
editable={ true }
|
||||
emptyContent={this._getEmptyContent('im.vector.fake.recent')}
|
||||
headerItems={this._getHeaderItems('im.vector.fake.recent')}
|
||||
order="recent"
|
||||
selectedRoom={ self.props.selectedRoom }
|
||||
incomingCall={ self.state.incomingCall }
|
||||
|
|
|
|||
Loading…
Reference in a new issue