Skip to content

fix: Show new folder creation on top and pagination sticky, fix basic design issues #4682

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

Open
jancborchardt wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −46
Open

fix: Show new folder creation on top and pagination sticky, fix basic design issues #4682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 17 additions & 16 deletions src/settings/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
#groupfolders-wrapper {
padding: 30px;
padding: calc(var(--default-grid-baseline) * 10) calc(var(--default-grid-baseline) * 10) calc(var(--default-grid-baseline) * 20);
}

#groupfolders-react-root, #groupfolders-root {
Expand All @@ -22,12 +22,12 @@
}

th {
border-bottom: 1px #ddd solid;
border-bottom: 2px solid var(--color-border);
cursor: pointer;

.sort_arrow {
padding-left: 10px;
color: #888;
color: var(--color-text-maxcontrast);
}
}

Expand Down Expand Up @@ -126,6 +126,10 @@
max-width: calc(100% - 40px);
}

.newgroup-permissions-default {
padding: calc(var(--default-grid-baseline) * 2);
}

thead {
tr {
th {
Expand All @@ -141,11 +145,9 @@
tbody {
tr {
&:not(:last-child) {
td {
border-bottom: var(--color-border) 1px solid;
}
border-bottom: 1px solid var(--color-border);
}
&:not(:last-child):hover {
&:hover {
td {
background-color: var(--color-background-dark);
&:first-child {
Expand All @@ -156,14 +158,6 @@
}
}
}
&:last-child {
td {
padding: 35px 0;
}
}
&:last-child:hover {
background-color: transparent;
}
td {
a {
color: var(--color-text-lighter);
Expand All @@ -181,16 +175,23 @@
.groupfolders-pagination {
display: flex;
align-items: center;
position: absolute;
bottom: calc(var(--default-grid-baseline) * 2);
right: calc(var(--default-grid-baseline) * 2);

.groupfolders-pagination__list {
display: flex;
gap: var(--default-grid-baseline);
justify-content: center;
background-color: var(--color-main-background);
border-radius: var(--border-radius-container);
padding: var(--default-grid-baseline);
}

.groupfolders-pagination__button {
.groupfolders-pagination__list button {
height: var(--default-clickable-area);
line-height: var(--default-clickable-area);
margin: var(--default-grid-baseline);
}

.groupfolders-pagination__goto-page {
Expand Down
55 changes: 25 additions & 30 deletions src/settings/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,31 @@ export class App extends Component<unknown, AppState> implements OC.Plugin<OC.Se
this.setState({ editingGroup: 0, editingMountPoint: 0 })
}}>
{this.showAdminDelegationForms()}

<form action="#" onSubmit={this.createRow}>
<input
className="newgroup-name"
value={this.state.newMountPoint}
placeholder={t('groupfolders', 'Folder name')}
onChange={(event) => {
this.setState({ newMountPoint: event.target.value })
}}/>
<input type="submit"
value={t('groupfolders', 'Create')}/>
<label className="newgroup-permissions-default">
<input
type="checkbox"
style={{ 'vertical-align': 'middle' } as React.CSSProperties}
value={this.state.newACLDefaultNoPermission ? 'true' : 'false'}
onChange={(event) => {
this.setState({ newACLDefaultNoPermission: event.target.checked })
}}/>
<span
style={{ 'vertical-align': 'middle' } as React.CSSProperties}
>{t('groupfolders', 'Do not grant any advanced permissions by default')}</span>
</label>
</form>

<table>
<thead>
<tr>
Expand Down Expand Up @@ -406,36 +431,6 @@ export class App extends Component<unknown, AppState> implements OC.Plugin<OC.Se
</thead>
<FlipMove typeName='tbody' enterAnimation="accordionVertical" leaveAnimation="accordionVertical">
{rows}
<tr>
<td>
<form action="#" onSubmit={this.createRow}>
<input
className="newgroup-name"
value={this.state.newMountPoint}
placeholder={t('groupfolders', 'Folder name')}
onChange={(event) => {
this.setState({ newMountPoint: event.target.value })
}}/>
<br/>
<label>
<input
type="checkbox"
style={{ 'vertical-align': 'middle' } as React.CSSProperties}
value={this.state.newACLDefaultNoPermission ? 'true' : 'false'}
onChange={(event) => {
this.setState({ newACLDefaultNoPermission: event.target.checked })
}}/>
<span
style={{ 'vertical-align': 'middle' } as React.CSSProperties}
>{t('groupfolders', 'Do not grant any advanced permissions by default')}</span>
</label>
<br/>
<input type="submit"
value={t('groupfolders', 'Create')}/>
</form>
</td>
<td colSpan={3}/>
</tr>
</FlipMove>
</table>
<nav className="groupfolders-pagination" style={{ display: 'flex', alignItems: 'center' }} aria-label={t('groupfolders', 'Pagination of team folders')}>
Expand Down
Loading