IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ui' of github.com:ONLYOFFICE/DocSpace-client into bugfix/ui

Browse Source
This commit is contained in:
Timofey Boyko 2023-10-06 13:21:18 +03:00
commit f814fc758c
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
packages/client/src/pages/Profile/Section/Body/sub-components/file-management/index.js
View File

@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
import ToggleButton from "@docspace/components/toggle-button"; import ToggleButton from "@docspace/components/toggle-button";
import Box from "@docspace/components/box"; import Box from "@docspace/components/box";
import Text from "@docspace/components/text";
import Loaders from "@docspace/common/components/Loaders"; import Loaders from "@docspace/common/components/Loaders";
import StyledWrapper from "./styled-file-management"; import StyledWrapper from "./styled-file-management";
@ -105,34 +106,42 @@ const FileManagement = ({
style={{ display: "none" }} style={{ display: "none" }}
/> />
{!isVisitor && ( {!isVisitor && (
<ToggleButton <div className="toggle-btn-wrapper">
className="ask-again toggle-btn" <ToggleButton
label={t("Common:DontAskAgain")} className="ask-again toggle-btn"
onChange={onChangeKeepNewFileName} onChange={onChangeKeepNewFileName}
isChecked={keepNewFileName} isChecked={keepNewFileName}
/> />
<Text>{t("Common:DontAskAgain")}</Text>
</div>
)} )}
<ToggleButton <div className="toggle-btn-wrapper">
className="save-copy-original toggle-btn"
label={t("OriginalCopy")}
onChange={onChangeOriginalCopy}
isChecked={storeOriginalFiles}
/>
{!isVisitor && (
<ToggleButton <ToggleButton
className="display-notification toggle-btn" className="save-copy-original toggle-btn"
label={t("DisplayNotification")} onChange={onChangeOriginalCopy}
onChange={onChangeDeleteConfirm} isChecked={storeOriginalFiles}
isChecked={confirmDelete}
/> />
<Text>{t("OriginalCopy")}</Text>
</div>
{!isVisitor && (
<div className="toggle-btn-wrapper">
<ToggleButton
className="display-notification toggle-btn"
onChange={onChangeDeleteConfirm}
isChecked={confirmDelete}
/>
<Text>{t("DisplayNotification")}</Text>
</div>
)} )}
{!isVisitor && ( {!isVisitor && (
<ToggleButton <div className="toggle-btn-wrapper">
className="toggle-btn" <ToggleButton
label={t("UpdateOrCreate")} className="toggle-btn"
onChange={onChangeUpdateIfExist} onChange={onChangeUpdateIfExist}
isChecked={updateIfExist} isChecked={updateIfExist}
/> />
<Text>{t("UpdateOrCreate")}</Text>
</div>
)} )}
</Box> </Box>

5
packages/client/src/pages/Profile/Section/Body/sub-components/file-management/styled-file-management.js
View File

@ -10,6 +10,11 @@ const StyledWrapper = styled.div`
display: grid; display: grid;
grid-gap: 32px; grid-gap: 32px;
.toggle-btn-wrapper {
display: flex;
//gap: 8px;
}
.toggle-btn { .toggle-btn {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;