Skip to content
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

Improved Responsiveness of General Configuration Pages [Issue 1253] #1367

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
+47 −8
Open

Improved Responsiveness of General Configuration Pages [Issue 1253] #1367

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
19cc85f
fixed issue 1253
Bahati308 Jan 2, 2025
49caa2b
Removed accidental files from the PR
Bahati308 Jan 5, 2025
51184b9
added the accidentally deleted file
Bahati308 Jan 5, 2025
71a6c2c
Merge branch 'develop' into issue-1253
mozzy11 Jan 8, 2025
7e46560
Merge branch 'develop' into issue-1253
mozzy11 Jan 8, 2025
1b9fbde
Merge branch 'develop' into issue-1253
mozzy11 Jan 17, 2025
8eb3452
Merge branch 'develop' into issue-1253
mozzy11 Jan 20, 2025
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
31 changes: 28 additions & 3 deletions frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,38 @@ function ConfigMenuDisplay(props) {
<Section>
<Form onSubmit={handleModify}>
<Column lg={16} md={8} sm={4}>
<Button disabled={modifyButton} type="submit">
<Button
disabled={modifyButton}
type="submit"
style={{
Copy link
Collaborator

@mozzy11 mozzy11 Jan 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Bahati308 , we would better use carbon grid for adjusting size and layout.
And also , for a duplicated styling , you would use a separate css class.
But also what you have done doesnt look like it improves responsiveness . this only affects a given screen size

marginBottom: "5px",
fontSize: "20px",
padding: "8px 16px",
}}
>
<FormattedMessage id="admin.page.configuration.formEntryConfigMenu.button.modify" />
</Button>{" "}
<Button kind="tertiary" disabled={true} type="submit">
<Button
kind="tertiary"
disabled={true}
type="submit"
style={{
marginBottom: "5px",
fontSize: "20px",
padding: "8px 16px",
}}
>
<FormattedMessage id="admin.page.configuration.formEntryConfigMenu.button.deactivate" />
</Button>{" "}
<Button kind="tertiary" disabled={true} type="submit">
<Button
kind="tertiary"
disabled={true}
type="submit"
style={{
fontSize: "20px",
padding: "10px 16px",
}}
>
<FormattedMessage id="admin.page.configuration.formEntryConfigMenu.button.add" />
</Button>
</Column>
Expand Down
23 changes: 19 additions & 4 deletions frontend/src/components/admin/generalConfig/common/GenericConfigEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,13 +371,28 @@ const GenericConfigEdit = ({ menuType, ID }) => {
<br />
<br />
<Grid fullWidth={true}>
<Column lg={2}>
<Button onClick={handleSubmitButton} disabled={isLoading}>
<Column lg={2} sm={4}>
<Button
onClick={handleSubmitButton}
disabled={isLoading}
style={{
margin: "4px 1px",
fontSize: "20px",
padding: "8px 10px",
}}
>
<FormattedMessage id="admin.page.configuration.formEntryConfigMenu.button.save" />
</Button>
</Column>
<Column lg={2}>
<Button onClick={() => window.location.reload()}>
<Column lg={2} sm={4}>
<Button
onClick={() => window.location.reload()}
style={{
margin: "4px 1px",
fontSize: "20px",
padding: "8px 10px",
}}
>
<FormattedMessage id="admin.page.configuration.formEntryConfigMenu.button.exit" />
</Button>
</Column>
Expand Down
1 change: 0 additions & 1 deletion frontend/src/languages/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@
"banner.menu.createInitial": "Entrée initiale",
"banner.menu.createDouble": "Double entrée",
"banner.menu.patientEdit": "Modifier",
"notification.login.syntax.error": "Erreur de syntaxe dans le nom d'utilisateur ou le mot de passe",
"banner.menu.patientConsult": "Afficher",
"sidenav.label.admin.menu.study": "Configuration du menu d'étude",
"menu.study.title": "Configuration du menu d'étude",
Expand Down
Loading