a couple more visual and logical fixes

This commit is contained in:
or-else
2021-08-14 16:24:45 -07:00
parent d6ca3f9f3c
commit d22b35aacc
7 changed files with 77 additions and 119 deletions
+11 -11
View File
@@ -396,14 +396,19 @@ class InfoView extends React.Component {
return; return;
} }
const isMe = this.props.tinode.isMe(params.topicName);
const menuItems = [ const menuItems = [
{title: formatMessage(messages.edit_permissions), handler: () => { {title: formatMessage(messages.edit_permissions), handler: () => {
this.handleLaunchPermissionsEditor('user', params.topicName); this.handleLaunchPermissionsEditor(isMe ? 'want' : 'user', params.topicName);
}}, }}
'member_delete',
user.acs.isMuted() ? 'member_unmute' : 'member_mute',
user.acs.isJoiner() ? 'member_block' : 'member_unblock'
]; ];
if (!isMe) {
menuItems.push('member_delete');
}
menuItems.push(user.acs.isMuted() ? 'member_unmute' : 'member_mute');
if (!isMe) {
menuItems.push(user.acs.isJoiner() ? 'member_block' : 'member_unblock');
}
this.props.showContextMenu({ this.props.showContextMenu({
topicName: this.props.topic, topicName: this.props.topic,
x: params.x, x: params.x,
@@ -413,7 +418,6 @@ class InfoView extends React.Component {
render() { render() {
const args = (this.props.panel || 'info').split('/'); const args = (this.props.panel || 'info').split('/');
console.log("args:", args);
const view = args[0]; const view = args[0];
args.shift(); args.shift();
@@ -533,7 +537,6 @@ class InfoView extends React.Component {
</div> : null} </div> : null}
</div> </div>
<div className="hr" /> <div className="hr" />
<div className="panel-form-column">
<div className="panel-form-row"> <div className="panel-form-row">
<label> <label>
<FormattedMessage id="label_muting_topic" defaultMessage="Muted:" <FormattedMessage id="label_muting_topic" defaultMessage="Muted:"
@@ -541,9 +544,8 @@ class InfoView extends React.Component {
</label> </label>
<CheckBox name="P" checked={this.state.muted} onChange={this.handleMuted} /> <CheckBox name="P" checked={this.state.muted} onChange={this.handleMuted} />
</div> </div>
</div>
<div className="hr" /> <div className="hr" />
<div className="panel-form-column"> <div className="panel-form-row">
<a href="#" className="flat-button" onClick={(e) => {e.preventDefault(); this.props.onNavigate('security');}}> <a href="#" className="flat-button" onClick={(e) => {e.preventDefault(); this.props.onNavigate('security');}}>
<i className="material-icons">security</i>&nbsp;<FormattedMessage id="button_security" <i className="material-icons">security</i>&nbsp;<FormattedMessage id="button_security"
defaultMessage="Security" description="Navigaton button for security panel." /> defaultMessage="Security" description="Navigaton button for security panel." />
@@ -552,7 +554,6 @@ class InfoView extends React.Component {
{this.state.groupTopic && this.state.sharer ? {this.state.groupTopic && this.state.sharer ?
<> <>
<div className="hr" /> <div className="hr" />
<div className="panel-form-column">
<div className="panel-form-row"> <div className="panel-form-row">
<label className="small"> <label className="small">
<FormattedMessage id="label_group_members" defaultMessage="Group members:" <FormattedMessage id="label_group_members" defaultMessage="Group members:"
@@ -581,7 +582,6 @@ class InfoView extends React.Component {
showContextMenu={this.state.admin ? this.handleContextMenu : false} showContextMenu={this.state.admin ? this.handleContextMenu : false}
/> />
}</FormattedMessage> }</FormattedMessage>
</div>
</> </>
: :
null null
+17 -11
View File
@@ -2200,12 +2200,24 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
return; return;
} }
const isMe = this.props.tinode.isMe(params.topicName);
const menuItems = [{ const menuItems = [{
title: formatMessage(messages.edit_permissions), title: formatMessage(messages.edit_permissions),
handler: () => { handler: () => {
this.handleLaunchPermissionsEditor('user', params.topicName); this.handleLaunchPermissionsEditor(isMe ? 'want' : 'user', params.topicName);
} }
}, 'member_delete', user.acs.isMuted() ? 'member_unmute' : 'member_mute', user.acs.isJoiner() ? 'member_block' : 'member_unblock']; }];
if (!isMe) {
menuItems.push('member_delete');
}
menuItems.push(user.acs.isMuted() ? 'member_unmute' : 'member_mute');
if (!isMe) {
menuItems.push(user.acs.isJoiner() ? 'member_block' : 'member_unblock');
}
this.props.showContextMenu({ this.props.showContextMenu({
topicName: this.props.topic, topicName: this.props.topic,
x: params.x, x: params.x,
@@ -2216,7 +2228,6 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
render() { render() {
const args = (this.props.panel || 'info').split('/'); const args = (this.props.panel || 'info').split('/');
console.log("args:", args);
const view = args[0]; const view = args[0];
args.shift(); args.shift();
const { const {
@@ -2359,8 +2370,6 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
})), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, this.state.description)) : null), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { })), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, this.state.description)) : null), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "hr" className: "hr"
}), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-column"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row" className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
id: "label_muting_topic", id: "label_muting_topic",
@@ -2372,10 +2381,10 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
name: "P", name: "P",
checked: this.state.muted, checked: this.state.muted,
onChange: this.handleMuted onChange: this.handleMuted
}))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { })), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "hr" className: "hr"
}), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-column" className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", {
href: "#", href: "#",
className: "flat-button", className: "flat-button",
@@ -2394,8 +2403,6 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
}))), this.state.groupTopic && this.state.sharer ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }))), this.state.groupTopic && this.state.sharer ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "hr" className: "hr"
}), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-column"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
className: "panel-form-row" className: "panel-form-row"
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
className: "small" className: "small"
@@ -2437,7 +2444,7 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
noScroll: true, noScroll: true,
onTopicSelected: this.handleMemberSelected, onTopicSelected: this.handleMemberSelected,
showContextMenu: this.state.admin ? this.handleContextMenu : false showContextMenu: this.state.admin ? this.handleContextMenu : false
})))) : null)); }))) : null));
} }
} }
@@ -10377,7 +10384,6 @@ class PermissionsEditor extends (react__WEBPACK_IMPORTED_MODULE_0___default().Co
handleSubmit() { handleSubmit() {
const mode = (this.state.mode || 'N').split('').sort().join(''); const mode = (this.state.mode || 'N').split('').sort().join('');
const before = (this.props.mode || 'N').split('').sort().join(''); const before = (this.props.mode || 'N').split('').sort().join('');
console.log("permissions editor", mode, before);
if (mode !== before) { if (mode !== before) {
this.props.onSubmit(mode); this.props.onSubmit(mode);
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+10 -58
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long