Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore

2019-12-26 12:24:00 +03:00 · 2019-12-26 12:24:00 +03:00 · 1870e125f9
commit 1870e125f9
parent a45db44549 c117db74da
15 changed files with 49 additions and 28 deletions
--- a/products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js
+++ b/products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js
@ -18,7 +18,7 @@ const textStyle = {
 };

 class SectionHeaderContent extends React.Component {
-  onBackClick = () => {
+  onClickBack = () => {
    const { history, settings, resetGroup } = this.props;

    resetGroup();
@ -38,7 +38,7 @@ class SectionHeaderContent extends React.Component {
          color="#A3A9AE"
          hoverColor="#657077"
          isFill={true}
-          onClick={this.onBackClick}
+          onClick={this.onClickBack}
        />
        <Headline type="content" style={textStyle}>{headerText}</Headline>
      </div>
--- a/products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
+++ b/products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
@ -247,6 +247,7 @@ class SectionFilterContent extends React.Component {
        onFilter={this.onFilter}
        directionAscLabel={t("DirectionAscLabel")}
        directionDescLabel={t("DirectionDescLabel")}
+        placeholder={t("FilterPlaceholder")}
      />
    );
  }
--- a/products/ASC.People/Client/src/components/pages/Home/locales/en/translation.json
+++ b/products/ASC.People/Client/src/components/pages/Home/locales/en/translation.json
@ -53,5 +53,7 @@
  "DirectionAscLabel":"A-Z",
  "DirectionDescLabel":"Z-A",

-  "DefaultSelectLabel": "Select"
+  "DefaultSelectLabel": "Select",
+
+  "FilterPlaceholder": "Search"
 }
--- a/products/ASC.People/Client/src/components/pages/Home/locales/ru/translation.json
+++ b/products/ASC.People/Client/src/components/pages/Home/locales/ru/translation.json
@ -53,5 +53,7 @@
  "DirectionAscLabel":"А-Я",
  "DirectionDescLabel":"Я-А",

-  "DefaultSelectLabel": "Выберите"
+  "DefaultSelectLabel": "Выберите",
+
+  "FilterPlaceholder": "Поиск"
 }
--- a/products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js
+++ b/products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js
@ -1,9 +1,9 @@
-import React from "react";
+import React, { useCallback } from "react";
 import { connect } from "react-redux";
 import { IconButton } from "asc-web-components";
 import { Headline } from 'asc-web-common';
 import { withRouter } from "react-router";
-import { useTranslation } from 'react-i18next';
+// import { useTranslation } from 'react-i18next';

 const wrapperStyle = {
  display: "flex",
@ -19,6 +19,10 @@ const SectionHeaderContent = props => {
  const { history, settings } = props;
  //const { t } = useTranslation();

+  const onClickBack = useCallback(() => {
+    history.push(settings.homepage);
+  }, [history, settings]);
+
  return (
    <div style={wrapperStyle}>
      <div style={{ width: "16px" }}>
@ -28,7 +32,7 @@ const SectionHeaderContent = props => {
          size="16"
          hoverColor="#657077"
          isFill={true}
-          onClick={() => history.push(settings.homepage)}
+          onClick={onClickBack}
        />
      </div>
      <Headline type="content" truncate={true} style={textStyle}>
--- a/products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
+++ b/products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
@ -358,8 +358,10 @@ class SectionHeaderContent extends React.PureComponent {
    }
  };

-  goBack = () => {
-    this.props.history.goBack();
+  onClickBack = () => {
+    const { history, settings } = this.props;
+
+    history.push(settings.homepage);
  };

  render() {
@ -375,7 +377,7 @@ class SectionHeaderContent extends React.PureComponent {
          size="16"
          hoverColor="#657077"
          isFill={true}
-          onClick={this.goBack}
+          onClick={this.onClickBack}
        />
        <HeaderContainer type='content' truncate={true}>
          {profile.displayName}
--- a/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Header/index.js
+++ b/products/ASC.People/Client/src/components/pages/ProfileAction/Section/Header/index.js
@ -22,7 +22,7 @@ const HeaderContainer = styled(Headline)`
 `;

 const SectionHeaderContent = (props) => {
-  const { profile, history, settings, match } = props;
+  const { profile, history, match } = props;
  const { type } = match.params;
  const { t } = useTranslation();

@ -34,7 +34,7 @@ const SectionHeaderContent = (props) => {
      ? profile.displayName
      : "";

-  const onClick = useCallback(() => {
+  const onClickBack = useCallback(() => {
    history.goBack();
  }, [history]);

@ -46,7 +46,7 @@ const SectionHeaderContent = (props) => {
        size="16"
        hoverColor="#657077"
        isFill={true}
-        onClick={onClick}
+        onClick={onClickBack}
      />
      <HeaderContainer
        type='content'
--- a/products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
+++ b/products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
@ -1,4 +1,4 @@
-import React from "react";
+import React, { useCallback } from "react";
 import { connect } from "react-redux";
 import { IconButton } from "asc-web-components";
 import { Headline } from 'asc-web-common';
@ -19,6 +19,10 @@ const SectionHeaderContent = props => {
  const { history, settings } = props;
  const { t } = useTranslation();

+  const onClickBack = useCallback(() => {
+    history.push(settings.homepage);
+  }, [history, settings]);
+
  return (
    <div style={wrapperStyle}>
      <div style={{ width: "16px" }}>
@ -28,7 +32,7 @@ const SectionHeaderContent = props => {
          size="16"
          hoverColor="#657077"
          isFill={true}
-          onClick={() => history.push(settings.homepage)}
+          onClick={onClickBack}
        />
      </div>
      <Headline type="content" truncate={true} style={textStyle}>
--- a/web/ASC.Web.Components/package.json
+++ b/web/ASC.Web.Components/package.json
@ -1,6 +1,6 @@
 {
  "name": "asc-web-components",
-  "version": "1.0.267",
+  "version": "1.0.270",
  "description": "Ascensio System SIA component library",
  "license": "AGPL-3.0",
  "main": "dist/asc-web-components.js",
--- a/web/ASC.Web.Components/src/components/filter-input/index.js
+++ b/web/ASC.Web.Components/src/components/filter-input/index.js
@ -428,7 +428,7 @@ class FilterInput extends React.Component {
        let iconSize = 32;
        switch (this.props.size) {
            case 'base':
-                iconSize = 32;
+                iconSize = 33;
                break;
            case 'middle':
            case 'big':
--- a/web/ASC.Web.Components/src/components/group-buttons-menu/index.js
+++ b/web/ASC.Web.Components/src/components/group-buttons-menu/index.js
@ -36,6 +36,10 @@ const CloseButton = styled.div`

    &:hover{
        cursor: pointer;
+
+        &:before, &:after {
+          background-color: #555F65;
+        }
    }

    &:before, &:after {
@ -45,10 +49,6 @@ const CloseButton = styled.div`
        height: 20px;
        width: 1px;
        background-color: #D0D5DA;
-
-        :hover{
-          background-color: #555F65;
-      }
    }

    &:before {
--- a/web/ASC.Web.Components/src/components/input-block/index.js
+++ b/web/ASC.Web.Components/src/components/input-block/index.js
@ -15,7 +15,8 @@ const StyledIconBlock = styled.div`
  cursor: ${props =>
    props.isDisabled || !props.isClickable ? "default" : "pointer"};
  height: 100%;
-  padding-right: 7px;
+  padding-right: 8px;
+  padding-left: 1px;
  -webkit-tap-highlight-color: rgba(0,0,0,0);
 `;

@ -83,6 +84,7 @@ class InputBlock extends React.Component {
      keepCharPositions,
      iconName,
      iconColor,
+      hoverColor,
      isIconFill,
      onIconClick,
      iconSize
@ -155,6 +157,7 @@ class InputBlock extends React.Component {
                <IconButton
                  size={iconButtonSize}
                  color={iconColor}
+                  hoverColor={hoverColor}
                  iconName={iconName}
                  isFill={isIconFill}
                  isDisabled={isDisabled}
@ -195,6 +198,7 @@ InputBlock.propTypes = {
  value: PropTypes.string,
  iconName: PropTypes.string,
  iconColor: PropTypes.string,
+  hoverColor: PropTypes.string,
  iconSize: PropTypes.number,
  isIconFill: PropTypes.bool,
  onIconClick: PropTypes.func,
@ -222,6 +226,7 @@ InputBlock.defaultProps = {
  value: '',
  iconName: "",
  iconColor: "#ffffff",
+  hoverColor: "#ffffff",
  isIconFill: false,
  isDisabled: false,
  keepCharPositions: false
--- a/web/ASC.Web.Components/src/components/main-button/index.js
+++ b/web/ASC.Web.Components/src/components/main-button/index.js
@ -70,7 +70,7 @@ const StyledMainButton = styled.div`
  box-sizing: border-box;
  background-color: ${props =>
    props.isDisabled ? disableBackgroundColor : backgroundColor};
-  padding: 5px 11px;
+  padding: 5px 10px;
  border-radius: 3px;
  -moz-border-radius: 3px;
  -webkit-border-radius: 3px;
--- a/web/ASC.Web.Components/src/components/search-input/index.js
+++ b/web/ASC.Web.Components/src/components/search-input/index.js
@ -83,7 +83,8 @@ class SearchInput extends React.Component {
          iconName={!!this.state.inputValue || this.props.showClearButton ? "CrossIcon" : "SearchIcon"}
          isIconFill={true}
          iconSize={clearButtonSize}
-          iconColor={"#A3A9AE"}
+          iconColor={"#D0D5DA"}
+          hoverColor={"#555F65"}
          onIconClick={!!this.state.inputValue || this.props.showClearButton ? this.clearSearch : undefined}
          size={this.props.size}
          scale={true}
--- a/web/ASC.Web.Components/src/components/text-input/index.js
+++ b/web/ASC.Web.Components/src/components/text-input/index.js
@ -57,22 +57,22 @@ const StyledInput = styled(Input).attrs((props) => ({
    transition: all 0.2s ease 0s;

    ::-webkit-input-placeholder {
-        color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
+        color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
        font-family: 'Open Sans',sans-serif
    }

    :-moz-placeholder {
-        color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
+        color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
        font-family: 'Open Sans',sans-serif
    }

    ::-moz-placeholder {
-        color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
+        color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
        font-family: 'Open Sans',sans-serif
    }

    :-ms-input-placeholder {
-        color: ${props => props.isDisabled ? '#D0D5DA' : '#A3A9AE'};
+        color: ${props => props.isDisabled ? '#D0D5DA' : '#D0D5DA'};
        font-family: 'Open Sans',sans-serif
    }