diff --git a/client/src/app/admin/panel/dashboard/admin-panel-activity.js b/client/src/app/admin/panel/dashboard/admin-panel-activity.js
index 145a393f..4b6539e6 100644
--- a/client/src/app/admin/panel/dashboard/admin-panel-activity.js
+++ b/client/src/app/admin/panel/dashboard/admin-panel-activity.js
@@ -45,8 +45,9 @@ class AdminPanelActivity extends React.Component {
getMenuProps() {
return {
className: 'admin-panel-activity__menu',
- onItemClick: this.onMenuItemClick.bind(this),
type: 'horizontal-list-bright',
+ onItemClick: this.onMenuItemClick.bind(this),
+ tabbable: true,
items: [
{
content: i18n('MY_NOTIFICATIONS'),
@@ -57,26 +58,16 @@ class AdminPanelActivity extends React.Component {
icon: ''
}
]
- }
+ };
}
renderList() {
- if (this.state.mode === 'staff') {
- return (
-
- {this.state.activities.map(this.renderRow.bind(this))}
- {(!this.state.limit) ? this.renderButton() : null}
-
- );
- }
- else {
- return (
-
- {this.state.activities.map(this.renderRow.bind(this))}
- {(!this.state.limit) ? this.renderButton() : null}
-
- );
- }
+ return (
+
+ {this.state.activities.map(this.renderRow.bind(this))}
+ {(!this.state.limit) ? this.renderButton() : null}
+
+ );
}
renderButton() {
@@ -89,7 +80,7 @@ class AdminPanelActivity extends React.Component {
renderRow(row, index) {
return (
-
+
);
}
diff --git a/client/src/app/admin/panel/dashboard/admin-panel-activity.scss b/client/src/app/admin/panel/dashboard/admin-panel-activity.scss
index ad8c10e7..f3f4b462 100644
--- a/client/src/app/admin/panel/dashboard/admin-panel-activity.scss
+++ b/client/src/app/admin/panel/dashboard/admin-panel-activity.scss
@@ -1,7 +1,7 @@
.admin-panel-activity {
&__menu {
- margin: 0 auto;
+ margin: 0 auto 20px auto;
width: 300px;
}
}
\ No newline at end of file
diff --git a/client/src/data/fixtures/staff-fixtures.js b/client/src/data/fixtures/staff-fixtures.js
index 79e3c503..ac7a07ee 100644
--- a/client/src/data/fixtures/staff-fixtures.js
+++ b/client/src/data/fixtures/staff-fixtures.js
@@ -1060,7 +1060,7 @@ module.exports = [
},
{
path: '/staff/last-events',
- time: 30,
+ time: 300,
response: function(data) {
if(data.page > 5) {
diff --git a/client/src/data/fixtures/system-fixtures.js b/client/src/data/fixtures/system-fixtures.js
index cb530394..a9f5687c 100644
--- a/client/src/data/fixtures/system-fixtures.js
+++ b/client/src/data/fixtures/system-fixtures.js
@@ -159,7 +159,7 @@ module.exports = [
},
{
path: '/system/get-logs',
- time: 30,
+ time: 300,
response: function() {
return {
"status": "success",