Skip to content

Commit 31d9fa7

Browse files
authored
Merge branch 'main' into 2021-11-23-bvl_feedback_widget_project_site
2 parents 2f959ea + 6eb61c5 commit 31d9fa7

23 files changed

+1453
-354
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ multi-echo aquisitions (PR #7515).
120120
- The `Center_name` field in the `mri_protocol` table has been replaced by `CenterID`
121121
from the `psc` table. The default value of `CenterID` is `NULL`. Previously, the
122122
default for `Center_name` was `AAAA` or `ZZZZ`. (PR #7525)
123-
- BVL Feedback widget only shows notifications for the users sites / projects (PR #)
123+
- BVL Feedback widget only shows notifications for the users sites / projects (PR #7848)
124+
- The statistics displayed in the dashboard was changed to only show the data relevant to the user's site(s). (PR #8132)
124125

125126
#### Bug Fixes
126127
- A LINST instrument Date field name now appears correctly (not truncated) on the

modules/electrophysiology_browser/css/electrophysiology_browser.css

+33-1
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,43 @@ svg {
4242
user-select: none;
4343
}
4444

45-
.annotation.list-group-item {
45+
.list-group-item {
46+
position: relative;
47+
display: flex;
48+
flex-direction: row;
49+
justify-content: space-between;
50+
align-items: center;
51+
}
52+
53+
.annotation {
4654
background: #fffae6;
4755
border-left: 5px solid #ff6600;
4856
}
4957

58+
.epoch-details {
59+
padding-right: 100px;
60+
}
61+
62+
.epoch-action {
63+
display: flex;
64+
flex-direction: row;
65+
justify-content: center;
66+
align-items: center;
67+
position: absolute;
68+
right: 0;
69+
}
70+
71+
.epoch-tag {
72+
padding: 5px;
73+
background: #e7e4e4;
74+
border-left: 5px solid #797878;
75+
}
76+
77+
.epoch-tag p {
78+
word-wrap: break-word;
79+
width: 95%;
80+
}
81+
5082
.event-list .btn.btn-primary {
5183
color: #555;
5284
border: 1px solid #555;

modules/electrophysiology_browser/jsx/components/DownloadPanel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class DownloadPanel extends Component {
9191
>Not Available</a>
9292
: <a
9393
className='btn btn-primary download col-xs-6'
94-
href={this.state.outputType == 'derivative' &&
94+
href={
9595
(download.type ==
9696
'physiological_annotation_files' ||
9797
download.type == 'all_files') ?

0 commit comments

Comments
 (0)