Skip to content

[ENG-6401][ENG-6567] Mobile styling #2398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
futa-ikeda merged 2 commits into from
Nov 18, 2024
Merged

[ENG-6401][ENG-6567] Mobile styling #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0f7c23
Scroll tabs in mobile view
futa-ikeda Nov 15, 2024
0363ae0
Group users tab top bar controls for mobile view
futa-ikeda Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/institutions/dashboard/-components/institutional-dashboard-wrapper/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
@include tab-list;
white-space: nowrap;
display: flex;
flex-wrap: wrap;
flex-wrap: nowrap;
position: relative;
overflow: visible;
overflow-x: auto;
margin-bottom: 0;
border-bottom: 0;

Expand Down
15 changes: 15 additions & 0 deletions app/institutions/dashboard/-components/institutional-users-list/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,3 +292,18 @@ input:checked + .slider::before {
}
}

.flex {
display: flex;
align-items: center;
}

.top-wrapper {
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
}

.right-button-group {
justify-content: flex-end;
margin-right: 15px;
}
184 changes: 95 additions & 89 deletions app/institutions/dashboard/-components/institutional-users-list/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,97 +8,103 @@
</span>
{{t 'institutions.dashboard.users_list.total_users'}}
</div>
<div local-class='orcid-switch'>
<label for='switches-container' local-class='orcid-toggle-label'>{{t 'institutions.dashboard.users_list.has_orcid'}}</label>
<label local-class='switch'>
<input id='switches-container' type='checkbox' checked={{this.hasOrcid}} {{on 'change' (fn this.toggleOrcidFilter (not this.hasOrcid))}}>
<span local-class='slider round'></span>
</label>
</div>
<PowerSelect
@options={{this.departments}}
@searchEnabled={{true}}
@selected={{this.department}}
@triggerClass={{local-class 'select'}}
@search={{perform this.searchDepartment}}
@onChange={{this.onSelectChange}}
as |department|
>
{{department}}
</PowerSelect>
<BasicDropdown
@renderInPlace={{true}}
@onClose={{this.onDropdownClose}}
@preventScroll={{true}}
@eventType='mousedown'
local-class='dropdown'
as |dd|
>
<Button local-class='dropdown-trigger' {{on 'click' dd.actions.toggle}}>
<FaIcon local-class='icon-columns' @icon='columns' />
{{t 'institutions.dashboard.users_list.select_columns'}}
</Button>
{{#if dd.isOpen}}
<div local-class='dropdown-panel {{if (is-mobile) 'mobile'}}'>
<div local-class='dropdown-content'>
{{#each this.columns as |column|}}
<label>
<input
type='checkbox'
value={{column.key}}
checked={{column.selected}}
{{on 'change' (fn this.toggleColumnSelection column.key)}}
/>
{{column.label}}
</label>
{{/each}}
</div>
<div local-class='dropdown-actions'>
<Button @type='secondary' {{on 'click' dd.actions.close}}>
{{t 'general.cancel'}}
</Button>
<Button @type='primary' {{on 'click' this.applyColumnSelection}} {{on 'click' dd.actions.close}}>
{{t 'general.apply'}}
</Button>
</div>
<div local-class='top-wrapper'>
<div local-class='flex'>
<div local-class='orcid-switch'>
<label for='switches-container' local-class='orcid-toggle-label'>{{t 'institutions.dashboard.users_list.has_orcid'}}</label>
<label local-class='switch'>
<input id='switches-container' type='checkbox' checked={{this.hasOrcid}} {{on 'change' (fn this.toggleOrcidFilter (not this.hasOrcid))}}>
<span local-class='slider round'></span>
</label>
</div>
{{/if}}
</BasicDropdown>
<div local-class='download-button-group'>
{{#if @institution.linkToExternalReportsArchive}}
<OsfLink
data-test-link-to-reports-archive
data-analytics-name='Link to archived reports'
@target='_blank'
@fakeButton={{true}}
@href={{@institution.linkToExternalReportsArchive}}
<PowerSelect
@options={{this.departments}}
@searchEnabled={{true}}
@selected={{this.department}}
@triggerClass={{local-class 'select'}}
@search={{perform this.searchDepartment}}
@onChange={{this.onSelectChange}}
as |department|
>
<EmberTooltip @side='bottom'>
{{t 'institutions.dashboard.download_past_reports_label'}}
</EmberTooltip>
<FaIcon @icon='chart-pie'/>
</OsfLink>
{{/if}}
<div local-class='download-dropdown'>
<ResponsiveDropdown @renderInPlace={{true}} @buttonStyling={{true}} as |dd| >
<dd.trigger data-test-download-dropdown local-class='download-dropdown-trigger'>
<FaIcon @icon='download' />
</dd.trigger>
<dd.content local-class='download-dropdown-content'>
<Button local-class='download-option' {{on 'click' (queue this.downloadCsv dd.close)}}>
{{t 'institutions.dashboard.format_labels.csv'}}
</Button>
<Button local-class='download-option' {{on 'click' (queue this.downloadTsv dd.close)}}>
{{t 'institutions.dashboard.format_labels.tsv'}}
</Button>
<Button local-class='download-option' {{on 'click' (queue this.downloadJsonTable dd.close)}}>
{{t 'institutions.dashboard.format_labels.json_table'}}
</Button>
<Button local-class='download-option' {{on 'click' (queue this.downloadJsonDirect dd.close)}}>
{{t 'institutions.dashboard.format_labels.json_direct'}}
</Button>
</dd.content>
</ResponsiveDropdown>
{{department}}
</PowerSelect>
</div>
<div local-class='flex right-button-group'>
<BasicDropdown
@renderInPlace={{true}}
@onClose={{this.onDropdownClose}}
@preventScroll={{true}}
@eventType='mousedown'
local-class='dropdown'
as |dd|
>
<Button local-class='dropdown-trigger' {{on 'click' dd.actions.toggle}}>
<FaIcon local-class='icon-columns' @icon='columns' />
{{t 'institutions.dashboard.users_list.select_columns'}}
</Button>
{{#if dd.isOpen}}
<div local-class='dropdown-panel {{if (is-mobile) 'mobile'}}'>
<div local-class='dropdown-content'>
{{#each this.columns as |column|}}
<label>
<input
type='checkbox'
value={{column.key}}
checked={{column.selected}}
{{on 'change' (fn this.toggleColumnSelection column.key)}}
/>
{{column.label}}
</label>
{{/each}}
</div>
<div local-class='dropdown-actions'>
<Button @type='secondary' {{on 'click' dd.actions.close}}>
{{t 'general.cancel'}}
</Button>
<Button @type='primary' {{on 'click' this.applyColumnSelection}} {{on 'click' dd.actions.close}}>
{{t 'general.apply'}}
</Button>
</div>
</div>
{{/if}}
</BasicDropdown>
<div local-class='download-button-group'>
{{#if @institution.linkToExternalReportsArchive}}
<OsfLink
data-test-link-to-reports-archive
data-analytics-name='Link to archived reports'
@target='_blank'
@fakeButton={{true}}
@href={{@institution.linkToExternalReportsArchive}}
>
<EmberTooltip @side='bottom'>
{{t 'institutions.dashboard.download_past_reports_label'}}
</EmberTooltip>
<FaIcon @icon='chart-pie'/>
</OsfLink>
{{/if}}
<div local-class='download-dropdown'>
<ResponsiveDropdown @renderInPlace={{true}} @buttonStyling={{true}} as |dd| >
<dd.trigger data-test-download-dropdown local-class='download-dropdown-trigger'>
<FaIcon @icon='download' />
</dd.trigger>
<dd.content local-class='download-dropdown-content'>
<Button local-class='download-option' {{on 'click' (queue this.downloadCsv dd.close)}}>
{{t 'institutions.dashboard.format_labels.csv'}}
</Button>
<Button local-class='download-option' {{on 'click' (queue this.downloadTsv dd.close)}}>
{{t 'institutions.dashboard.format_labels.tsv'}}
</Button>
<Button local-class='download-option' {{on 'click' (queue this.downloadJsonTable dd.close)}}>
{{t 'institutions.dashboard.format_labels.json_table'}}
</Button>
<Button local-class='download-option' {{on 'click' (queue this.downloadJsonDirect dd.close)}}>
{{t 'institutions.dashboard.format_labels.json_direct'}}
</Button>
</dd.content>
</ResponsiveDropdown>
</div>
</div>
</div>
</div>
</div>
Expand Down
Loading