Ivan Diaz - Fix activity list minor issues [skip ci]
This commit is contained in:
parent
5ea4137e41
commit
4213c77e6e
|
@ -45,8 +45,9 @@ class AdminPanelActivity extends React.Component {
|
||||||
getMenuProps() {
|
getMenuProps() {
|
||||||
return {
|
return {
|
||||||
className: 'admin-panel-activity__menu',
|
className: 'admin-panel-activity__menu',
|
||||||
onItemClick: this.onMenuItemClick.bind(this),
|
|
||||||
type: 'horizontal-list-bright',
|
type: 'horizontal-list-bright',
|
||||||
|
onItemClick: this.onMenuItemClick.bind(this),
|
||||||
|
tabbable: true,
|
||||||
items: [
|
items: [
|
||||||
{
|
{
|
||||||
content: i18n('MY_NOTIFICATIONS'),
|
content: i18n('MY_NOTIFICATIONS'),
|
||||||
|
@ -57,26 +58,16 @@ class AdminPanelActivity extends React.Component {
|
||||||
icon: ''
|
icon: ''
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
renderList() {
|
renderList() {
|
||||||
if (this.state.mode === 'staff') {
|
return (
|
||||||
return (
|
<div>
|
||||||
<div>
|
{this.state.activities.map(this.renderRow.bind(this))}
|
||||||
{this.state.activities.map(this.renderRow.bind(this))}
|
{(!this.state.limit) ? this.renderButton() : null}
|
||||||
{(!this.state.limit) ? this.renderButton() : null}
|
</div>
|
||||||
</div>
|
);
|
||||||
);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
{this.state.activities.map(this.renderRow.bind(this))}
|
|
||||||
{(!this.state.limit) ? this.renderButton() : null}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
renderButton() {
|
renderButton() {
|
||||||
|
@ -89,7 +80,7 @@ class AdminPanelActivity extends React.Component {
|
||||||
|
|
||||||
renderRow(row, index) {
|
renderRow(row, index) {
|
||||||
return (
|
return (
|
||||||
<ActivityRow key={index} {...row} mode={this.state.mode} />
|
<ActivityRow key={index} mode={this.state.mode} {...row} />
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.admin-panel-activity {
|
.admin-panel-activity {
|
||||||
|
|
||||||
&__menu {
|
&__menu {
|
||||||
margin: 0 auto;
|
margin: 0 auto 20px auto;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1060,7 +1060,7 @@ module.exports = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/staff/last-events',
|
path: '/staff/last-events',
|
||||||
time: 30,
|
time: 300,
|
||||||
response: function(data) {
|
response: function(data) {
|
||||||
|
|
||||||
if(data.page > 5) {
|
if(data.page > 5) {
|
||||||
|
|
|
@ -159,7 +159,7 @@ module.exports = [
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/system/get-logs',
|
path: '/system/get-logs',
|
||||||
time: 30,
|
time: 300,
|
||||||
response: function() {
|
response: function() {
|
||||||
return {
|
return {
|
||||||
"status": "success",
|
"status": "success",
|
||||||
|
|
Loading…
Reference in New Issue