Merge pull request #1370 from ONLYOFFICE/feature/action-buttons-hints
Feature/action buttons hints
This commit is contained in:
GitHub
commit
1f51ac13f2
@ -115,5 +115,8 @@
|
||||
"ViewOnlyRooms": "View-only",
|
||||
"ViewTiles": "Tiles",
|
||||
"WithSubfolders": "With subfolders",
|
||||
"MarkAsVersion": "Mark as version",
|
||||
"MarkAsRevision": "Mark as revision",
|
||||
"TableSettingsTitle": "Manage displayed columns",
|
||||
"DocumentEdited": "Cannot perform the action because the document is being edited."
|
||||
}
|
||||
|
||||
@ -115,5 +115,7 @@
|
||||
"ViewOnlyRooms": "Просмотр",
|
||||
"ViewTiles": "Плитки",
|
||||
"WithSubfolders": "С подпапками",
|
||||
"MarkAsVersion": "Отметить как версию",
|
||||
"MarkAsRevision": "Отметить как ревизию",
|
||||
"DocumentEdited": "Невозможно выполнить действие, так как документ редактируется."
|
||||
}
|
||||
|
||||
@ -133,6 +133,7 @@ const Item = ({
|
||||
labelBadge={labelBadge}
|
||||
onClickBadge={onBadgeClick}
|
||||
iconBadge={iconBadge}
|
||||
badgeTitle={t("RecycleBinAction")}
|
||||
/>
|
||||
</StyledDragAndDrop>
|
||||
);
|
||||
|
||||
@ -493,6 +493,7 @@ const ArticleMainButtonContent = (props) => {
|
||||
size="small"
|
||||
primary
|
||||
scale
|
||||
title={t("Files:NewRoom")}
|
||||
/>
|
||||
) : (
|
||||
<MainButton
|
||||
@ -505,6 +506,7 @@ const ArticleMainButtonContent = (props) => {
|
||||
isDropdown={isDropdownMainButton}
|
||||
text={mainButtonText}
|
||||
model={model}
|
||||
title={mainButtonText}
|
||||
/>
|
||||
)}
|
||||
|
||||
|
||||
@ -184,6 +184,7 @@ const Badges = ({
|
||||
{...onShowVersionHistoryProp}
|
||||
noHover={true}
|
||||
isVersionBadge={true}
|
||||
title={t("ShowVersionHistory")}
|
||||
/>
|
||||
</BadgeWrapper>
|
||||
)}
|
||||
|
||||
@ -17,6 +17,7 @@ export const StyledIcon = styled(IconButton)`
|
||||
|
||||
const QuickButtons = (props) => {
|
||||
const {
|
||||
t,
|
||||
item,
|
||||
theme,
|
||||
sectionWidth,
|
||||
@ -75,6 +76,7 @@ const QuickButtons = (props) => {
|
||||
color={colorLock}
|
||||
isDisabled={isDisabled}
|
||||
hoverColor={theme.filesQuickButtons.sharedColor}
|
||||
title={t("UnblockVersion")}
|
||||
/>
|
||||
)}
|
||||
{/* {fileExst && !isTrashFolder && displayBadges && (
|
||||
|
||||
@ -71,6 +71,7 @@ const SectionHeaderContent = (props) => {
|
||||
size="16"
|
||||
isFill={true}
|
||||
onClick={toggleInfoPanel}
|
||||
title={t("Common:InfoPanel")}
|
||||
/>
|
||||
</div>
|
||||
</StyledInfoPanelToggleWrapper>
|
||||
|
||||
@ -115,6 +115,7 @@ const InfoPanelHeaderContent = (props) => {
|
||||
size="16"
|
||||
isFill={true}
|
||||
onClick={closeInfoPanel}
|
||||
title={t("Common:InfoPanel")}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@ -373,6 +373,7 @@ class FilesTableHeader extends React.Component {
|
||||
|
||||
render() {
|
||||
const {
|
||||
t,
|
||||
containerRef,
|
||||
isHeaderChecked,
|
||||
filter,
|
||||
@ -415,6 +416,7 @@ class FilesTableHeader extends React.Component {
|
||||
useReactWindow={!withPaging}
|
||||
tagRef={tagRef}
|
||||
setHideColumns={setHideColumns}
|
||||
settingsTitle={t("Files:TableSettingsTitle")}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@ -732,6 +732,11 @@ const SectionHeaderContent = (props) => {
|
||||
titles={{
|
||||
trash: t("EmptyRecycleBin"),
|
||||
trashWarning: t("TrashErasureWarning"),
|
||||
actions: isRoomsFolder
|
||||
? t("Files:NewRoom")
|
||||
: t("Common:Actions"),
|
||||
contextMenu: t("Translations:TitleShowFolderActions"),
|
||||
infoPanel: t("Common:InfoPanel"),
|
||||
}}
|
||||
withMenu={!isRoomsFolder}
|
||||
onPlusClick={onCreateRoom}
|
||||
|
||||
@ -128,6 +128,7 @@ const VersionRow = (props) => {
|
||||
isTabletView={isTabletView}
|
||||
isSavingComment={isSavingComment}
|
||||
isEditing={isEditing}
|
||||
contextTitle={t("Common:Actions")}
|
||||
>
|
||||
<div className={`version-row_${index}`}>
|
||||
<Box displayProp="flex" className="row-header">
|
||||
@ -141,6 +142,13 @@ const VersionRow = (props) => {
|
||||
versionGroup={info.versionGroup}
|
||||
{...onClickProp}
|
||||
t={t}
|
||||
title={
|
||||
index > 0
|
||||
? isVersion
|
||||
? t("Files:MarkAsRevision")
|
||||
: t("Files:MarkAsVersion")
|
||||
: ""
|
||||
}
|
||||
/>
|
||||
<Link
|
||||
onClick={onOpenFile}
|
||||
|
||||
@ -212,6 +212,7 @@ const Navigation = ({
|
||||
isRootFolder={isRootFolder}
|
||||
toggleInfoPanel={toggleInfoPanel}
|
||||
isInfoPanelVisible={isInfoPanelVisible}
|
||||
titles={titles}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
|
||||
@ -121,6 +121,7 @@ const ControlButtons = ({
|
||||
getData={getContextOptionsPlus}
|
||||
withMenu={withMenu}
|
||||
onPlusClick={onPlusClick}
|
||||
title={titles?.actions}
|
||||
/>
|
||||
)}
|
||||
|
||||
@ -134,6 +135,7 @@ const ControlButtons = ({
|
||||
isFill
|
||||
getData={getContextOptionsFolder}
|
||||
isDisabled={false}
|
||||
title={titles?.contextMenu}
|
||||
/>
|
||||
|
||||
{!isDesktop && (
|
||||
@ -153,6 +155,7 @@ const ControlButtons = ({
|
||||
getData={getContextOptionsPlus}
|
||||
withMenu={withMenu}
|
||||
onPlusClick={onPlusClick}
|
||||
title={titles?.actions}
|
||||
/>
|
||||
)}
|
||||
{!isDesktop && (
|
||||
|
||||
@ -11,7 +11,7 @@ const PlusButton = (props) => {
|
||||
const ref = useRef(null);
|
||||
const menuRef = useRef(null);
|
||||
|
||||
const { className, getData, withMenu, onPlusClick } = props;
|
||||
const { className, getData, withMenu, onPlusClick, ...rest } = props;
|
||||
|
||||
const toggle = (e, isOpen) => {
|
||||
isOpen ? menuRef.current.show(e) : menuRef.current.hide(e);
|
||||
@ -30,7 +30,7 @@ const PlusButton = (props) => {
|
||||
const model = getData();
|
||||
|
||||
return (
|
||||
<div ref={ref} className={className}>
|
||||
<div ref={ref} className={className} {...rest}>
|
||||
<IconButton
|
||||
onClick={onClick}
|
||||
iconName={PlusReactSvgUrl}
|
||||
|
||||
@ -26,6 +26,7 @@ const ToggleInfoPanelButton = ({
|
||||
isInfoPanelVisible,
|
||||
toggleInfoPanel,
|
||||
id,
|
||||
titles,
|
||||
}) => {
|
||||
return (
|
||||
<StyledInfoPanelToggleColorThemeWrapper
|
||||
@ -41,6 +42,7 @@ const ToggleInfoPanelButton = ({
|
||||
size="16"
|
||||
isFill={true}
|
||||
onClick={toggleInfoPanel}
|
||||
title={titles?.infoPanel}
|
||||
/>
|
||||
</div>
|
||||
</StyledInfoPanelToggleColorThemeWrapper>
|
||||
|
||||
@ -41,6 +41,7 @@ const CatalogItem = (props) => {
|
||||
isHeader,
|
||||
isFirstHeader,
|
||||
folderId,
|
||||
badgeTitle,
|
||||
} = props;
|
||||
|
||||
const onClickAction = () => {
|
||||
@ -48,7 +49,6 @@ const CatalogItem = (props) => {
|
||||
};
|
||||
|
||||
const onClickBadgeAction = (e) => {
|
||||
console.log("PRO", onClickBadge);
|
||||
e.stopPropagation();
|
||||
onClickBadge && onClickBadge(id);
|
||||
};
|
||||
@ -118,6 +118,7 @@ const CatalogItem = (props) => {
|
||||
<StyledCatalogItemBadgeWrapper
|
||||
showText={showText}
|
||||
onClick={onClickBadgeAction}
|
||||
title={badgeTitle}
|
||||
>
|
||||
{!iconBadge ? (
|
||||
<Badge className="catalog-item__badge" label={labelBadge} />
|
||||
|
||||
@ -40,6 +40,7 @@ class Row extends React.Component {
|
||||
getContextModel,
|
||||
isRoom,
|
||||
withoutBorder,
|
||||
contextTitle,
|
||||
} = this.props;
|
||||
|
||||
const renderCheckbox = Object.prototype.hasOwnProperty.call(
|
||||
@ -168,6 +169,7 @@ class Row extends React.Component {
|
||||
directionX="right"
|
||||
displayType="toggle"
|
||||
onClick={onContextMenu}
|
||||
title={contextTitle}
|
||||
/>
|
||||
) : (
|
||||
<div className="expandButton"> </div>
|
||||
|
||||
@ -668,6 +668,7 @@ class TableHeader extends React.Component {
|
||||
infoPanelVisible,
|
||||
showSettings,
|
||||
tagRef,
|
||||
settingsTitle,
|
||||
...rest
|
||||
} = this.props;
|
||||
|
||||
@ -704,7 +705,10 @@ class TableHeader extends React.Component {
|
||||
})}
|
||||
|
||||
{showSettings && (
|
||||
<div className="table-container_header-settings">
|
||||
<div
|
||||
className="table-container_header-settings"
|
||||
title={settingsTitle}
|
||||
>
|
||||
<TableSettings
|
||||
columns={columns}
|
||||
infoPanelVisible={infoPanelVisible}
|
||||
|
||||
@ -252,5 +252,6 @@
|
||||
"WantToContinue": "Are you sure you want to continue?",
|
||||
"Warning": "Warning",
|
||||
"Website": "Website",
|
||||
"Yesterday": "Yesterday"
|
||||
"Yesterday": "Yesterday",
|
||||
"InfoPanel": "Info panel"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user