Merge branch 'develop' into feature/modify-appsettings-test-json
This commit is contained in:
Sergey Kirichenko
GitHub
commit
d6a4381c35
@ -79,6 +79,7 @@ const SimpleFilesRowContent = styled(RowContent)`
|
||||
|
||||
.favorite {
|
||||
cursor: pointer;
|
||||
margin-right: 6px;
|
||||
}
|
||||
|
||||
.share-icon {
|
||||
@ -544,7 +545,6 @@ class FilesRowContent extends React.PureComponent {
|
||||
: { onClick: this.onFilesClick };
|
||||
const showNew = !!newItems;
|
||||
|
||||
//console.log(fileStatus);
|
||||
return isEdit ? (
|
||||
<EditingWrapperComponent
|
||||
itemTitle={itemTitle}
|
||||
@ -628,7 +628,18 @@ class FilesRowContent extends React.PureComponent {
|
||||
hoverColor="#3B72A7"
|
||||
/>
|
||||
)}
|
||||
{fileStatus === 96 && !isTrashFolder && (
|
||||
{locked && (
|
||||
<Icons.FileActionsLockedIcon
|
||||
className="badge lock-file"
|
||||
size="small"
|
||||
isfill={true}
|
||||
color="#3B72A7"
|
||||
data-id={item.id}
|
||||
data-locked={true}
|
||||
onClick={this.props.onClickLock}
|
||||
/>
|
||||
)}
|
||||
{fileStatus === 32 && !isTrashFolder && (
|
||||
<Icons.FavoriteIcon
|
||||
className="favorite"
|
||||
size="small"
|
||||
@ -646,17 +657,6 @@ class FilesRowContent extends React.PureComponent {
|
||||
color="#3B72A7"
|
||||
/>
|
||||
)}
|
||||
{locked && (
|
||||
<Icons.FileActionsLockedIcon
|
||||
className="badge lock-file"
|
||||
size="small"
|
||||
isfill={true}
|
||||
color="#3B72A7"
|
||||
data-id={item.id}
|
||||
data-locked={true}
|
||||
onClick={this.props.onClickLock}
|
||||
/>
|
||||
)}
|
||||
{versionGroup > 1 && (
|
||||
<Badge
|
||||
className="badge-version"
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
"ConnectAccountsSubTitle": "No connected accounts",
|
||||
"AddAccount": "Add account",
|
||||
"ConnectingAccount": "Connecting account",
|
||||
"ConnectDescription": "You can connect the following accounts to the ONLYOFFICE Documents. They will be displayed in 'My Documents' folder and you will be able to edit and save them right on the portal all in one place.",
|
||||
"ConnectDescription": "You can connect the following accounts to the ONLYOFFICE Documents. They will be displayed in 'My Documents' folder and you will be able to edit and save them right on the portal all in one place. ",
|
||||
"ConnectAdminDescription": "For successful connection enter the necessary data at <1>this page</1>.",
|
||||
"ConnextOtherAccount": "Other account",
|
||||
"ConnectedCloud": "Connected cloud",
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
"ConnectAccountsSubTitle": "Вы еще не подключили сторонние облачные сервисы",
|
||||
"AddAccount": "Подключить",
|
||||
"ConnectingAccount": "Подключение аккаунта",
|
||||
"ConnectDescription": "Вы можете подключить следующие сервисы к вашему аккаунту ONLYOFFICE. Они будут отображаться в папке 'Мои документы' и Вы сможете редактировать и сохранять все свои документы в едином рабочем пространстве.",
|
||||
"ConnectDescription": "Вы можете подключить следующие сервисы к вашему аккаунту ONLYOFFICE. Они будут отображаться в папке 'Мои документы' и Вы сможете редактировать и сохранять все свои документы в едином рабочем пространстве. ",
|
||||
"ConnectAdminDescription": "Для успешного подключения введите нужные данные на <1>этой странице</1>.",
|
||||
"ConnextOtherAccount": "Другой аккаунт",
|
||||
"ConnectedCloud": "Подключить облако",
|
||||
|
||||
@ -42,7 +42,7 @@ const StyledVersionRow = styled(Row)`
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
margin-left: 9px;
|
||||
|
||||
margin-right: 16px;
|
||||
@media ${tablet} {
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
@ -85,7 +85,6 @@ const VersionRow = (props) => {
|
||||
];
|
||||
|
||||
const onClickProp = canEdit ? { onClick: onVersionClick } : {};
|
||||
|
||||
return (
|
||||
<StyledVersionRow
|
||||
showEditPanel={showEditPanel}
|
||||
@ -107,6 +106,7 @@ const VersionRow = (props) => {
|
||||
fontWeight={600}
|
||||
fontSize="14px"
|
||||
title={title}
|
||||
isTextOverflow={true}
|
||||
className="version-link-file"
|
||||
>
|
||||
{title}
|
||||
|
||||
@ -712,7 +712,7 @@ const getFilesContextOptions = (
|
||||
const options = [];
|
||||
|
||||
const isFile = !!item.fileExst;
|
||||
const isFavorite = item.fileStatus === 96;
|
||||
const isFavorite = item.fileStatus === 32;
|
||||
const isFullAccess = item.access < 2;
|
||||
const isThirdPartyFolder = item.providerKey && isRootFolder;
|
||||
|
||||
|
||||
@ -791,8 +791,8 @@ namespace ASC.Web.Files.Utils
|
||||
{
|
||||
if (!t.Key.Equals(file.ID)) continue;
|
||||
|
||||
file.IsFavorite = t.Value.Any(r=> r.TagType == TagType.Favorite);
|
||||
file.IsTemplate = t.Value.Any(r => r.TagType == TagType.Template);
|
||||
if(t.Value.Any(r => r.TagType == TagType.Favorite)) file.IsFavorite = true;
|
||||
if(t.Value.Any(r => r.TagType == TagType.Template)) file.IsTemplate = true;
|
||||
|
||||
var lockedTag = t.Value.FirstOrDefault(r => r.TagType == TagType.Locked);
|
||||
if (lockedTag != null)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-common",
|
||||
"version": "1.0.322",
|
||||
"version": "1.0.324",
|
||||
"description": "Ascensio System SIA common components and solutions library",
|
||||
"license": "AGPL-3.0",
|
||||
"files": [
|
||||
|
||||
@ -15,7 +15,7 @@ const weight = {
|
||||
|
||||
const StyledHeading = styled(Heading)`
|
||||
margin: 0;
|
||||
line-height: 56px;
|
||||
line-height: 65px;
|
||||
font-size: ${(props) => size[props.headlineType]};
|
||||
font-weight: ${(props) => weight[props.headlineType]};
|
||||
`;
|
||||
|
||||
@ -6,7 +6,7 @@ const { tablet } = utils.device;
|
||||
|
||||
const StyledArticleHeader = styled.div`
|
||||
border-bottom: 1px solid #eceef1;
|
||||
height: 56px;
|
||||
height: 64px;
|
||||
|
||||
@media ${tablet} {
|
||||
display: none;
|
||||
|
||||
@ -14,6 +14,7 @@ const StyledSectionHeader = styled.div`
|
||||
height: 55px;
|
||||
margin-right: 24px;
|
||||
margin-top: -1px;
|
||||
padding-bottom: 9px;
|
||||
${isMobile &&
|
||||
css`
|
||||
height: 49px;
|
||||
@ -23,19 +24,13 @@ const StyledSectionHeader = styled.div`
|
||||
margin-top: 64px;
|
||||
@media ${tablet} {
|
||||
margin-top: 55px;
|
||||
padding-bottom: 18px;
|
||||
}
|
||||
`}
|
||||
|
||||
@media ${tablet} {
|
||||
margin-right: 16px;
|
||||
border-bottom: none;
|
||||
|
||||
${(props) =>
|
||||
props.borderBottom &&
|
||||
`
|
||||
border-bottom: 1px solid #eceef1;
|
||||
padding-bottom: 16px
|
||||
`};
|
||||
border-bottom: 1px solid #eceef1;
|
||||
}
|
||||
|
||||
.section-header {
|
||||
@ -110,12 +105,7 @@ class SectionHeader extends React.Component {
|
||||
//console.log("PageLayout SectionHeader render");
|
||||
// eslint-disable-next-line react/prop-types
|
||||
|
||||
const {
|
||||
isArticlePinned,
|
||||
borderBottom,
|
||||
isHeaderVisible,
|
||||
...rest
|
||||
} = this.props;
|
||||
const { isArticlePinned, isHeaderVisible, ...rest } = this.props;
|
||||
|
||||
return (
|
||||
<LayoutContextConsumer>
|
||||
@ -123,7 +113,6 @@ class SectionHeader extends React.Component {
|
||||
<StyledSectionHeader
|
||||
isHeaderVisible={isHeaderVisible}
|
||||
isArticlePinned={isArticlePinned}
|
||||
borderBottom={borderBottom}
|
||||
isSectionHeaderVisible={value.isVisible}
|
||||
>
|
||||
<div
|
||||
|
||||
Loading…
Reference in New Issue
Block a user