From 1c0689d187b7ad5edeba8d1745d7618ae9997afe Mon Sep 17 00:00:00 2001 From: Michael An <2331806369@qq.com> Date: Tue, 10 Jun 2025 18:02:01 +0800 Subject: [PATCH] change error page tip (#7915) --- frontend/src/css/system-stat.css | 4 -- frontend/src/pages/groups/group-view.js | 46 +++++++++--------- .../src/pages/invitations/invitations-view.js | 9 +++- .../src/pages/org-admin/org-group-info.js | 9 +++- .../src/pages/org-admin/org-group-members.js | 9 +++- .../src/pages/org-admin/org-group-repos.js | 9 +++- media/css/seahub.css | 20 +------- media/css/seahub_react.css | 2 +- media/img/error-tip.png | Bin 6917 -> 6932 bytes media/img/failed-to-view-file.png | Bin 6932 -> 0 bytes seahub/templates/404.html | 5 +- seahub/templates/error.html | 10 ++-- seahub/utils/__init__.py | 5 -- 13 files changed, 61 insertions(+), 67 deletions(-) delete mode 100644 media/img/failed-to-view-file.png diff --git a/frontend/src/css/system-stat.css b/frontend/src/css/system-stat.css index fd9ece677f..3f4e22f0bc 100644 --- a/frontend/src/css/system-stat.css +++ b/frontend/src/css/system-stat.css @@ -25,10 +25,6 @@ width: 120px; } -.error-tip { - color: red; -} - .statistic-traffic-tab { display: flex; font-size: 13px; diff --git a/frontend/src/pages/groups/group-view.js b/frontend/src/pages/groups/group-view.js index 2e023ec14d..430a3278ff 100644 --- a/frontend/src/pages/groups/group-view.js +++ b/frontend/src/pages/groups/group-view.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import cookie from 'react-cookies'; import classnames from 'classnames'; import { navigate } from '@gatsbyjs/reach-router'; -import { gettext, siteRoot, username } from '../../utils/constants'; +import { gettext, siteRoot, username, mediaUrl } from '../../utils/constants'; import { seafileAPI } from '../../utils/seafile-api'; import { Utils } from '../../utils/utils'; import Loading from '../../components/loading'; @@ -335,28 +335,28 @@ class GroupView extends React.Component { className={classnames('cur-view-content', 'd-block', 'repos-container', { 'pt-3': currentViewMode != LIST_MODE })} onScroll={this.handleScroll} > - {isLoading - ? - : errMessage - ?

{errMessage}

- : repoList.length == 0 - ? emptyTip - : ( - - ) + {isLoading ? : errMessage ? +
+ +

{errMessage}

+
+ : repoList.length == 0 + ? emptyTip + : + } diff --git a/frontend/src/pages/invitations/invitations-view.js b/frontend/src/pages/invitations/invitations-view.js index 9c7131a63b..229daa86c3 100644 --- a/frontend/src/pages/invitations/invitations-view.js +++ b/frontend/src/pages/invitations/invitations-view.js @@ -3,7 +3,7 @@ import { DropdownItem } from 'reactstrap'; import PropTypes from 'prop-types'; import dayjs from 'dayjs'; import classnames from 'classnames'; -import { gettext } from '../../utils/constants'; +import { gettext, mediaUrl } from '../../utils/constants'; import { Utils } from '../../utils/utils'; import { seafileAPI } from '../../utils/seafile-api'; import SingleDropdownToolbar from '../../components/toolbar/single-dropdown-toolbar'; @@ -172,7 +172,12 @@ class Content extends Component { } if (errorMsg) { - return

{errorMsg}

; + return ( +
+ +

{errorMsg}

+
+ ); } if (!invitationsList.length) { diff --git a/frontend/src/pages/org-admin/org-group-info.js b/frontend/src/pages/org-admin/org-group-info.js index bc88c26393..8cb008832d 100644 --- a/frontend/src/pages/org-admin/org-group-info.js +++ b/frontend/src/pages/org-admin/org-group-info.js @@ -2,7 +2,7 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { Link } from '@gatsbyjs/reach-router'; import { orgAdminAPI } from '../../utils/org-admin-api'; -import { gettext, siteRoot } from '../../utils/constants'; +import { gettext, siteRoot, mediaUrl } from '../../utils/constants'; import { Utils } from '../../utils/utils'; import Loading from '../../components/loading'; import OrgAdminGroupNav from '../../components/org-admin-group-nav'; @@ -65,7 +65,12 @@ class Content extends Component { return ; } if (errorMsg) { - return

{errorMsg}

; + return ( +
+ +

{errorMsg}

+
+ ); } return ( diff --git a/frontend/src/pages/org-admin/org-group-members.js b/frontend/src/pages/org-admin/org-group-members.js index 1b9e3ebc86..a04edc19d7 100644 --- a/frontend/src/pages/org-admin/org-group-members.js +++ b/frontend/src/pages/org-admin/org-group-members.js @@ -2,7 +2,7 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; import { Link } from '@gatsbyjs/reach-router'; import { orgAdminAPI } from '../../utils/org-admin-api'; -import { gettext, siteRoot } from '../../utils/constants'; +import { gettext, siteRoot, mediaUrl } from '../../utils/constants'; import { Utils } from '../../utils/utils'; import Loading from '../../components/loading'; import OrgAdminGroupNav from '../../components/org-admin-group-nav'; @@ -69,7 +69,12 @@ class Content extends Component { return ; } if (errorMsg) { - return

{errorMsg}

; + return ( +
+ +

{errorMsg}

+
+ ); } return ( diff --git a/frontend/src/pages/org-admin/org-group-repos.js b/frontend/src/pages/org-admin/org-group-repos.js index 4d62b84109..c360261e04 100644 --- a/frontend/src/pages/org-admin/org-group-repos.js +++ b/frontend/src/pages/org-admin/org-group-repos.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import classnames from 'classnames'; import { Link } from '@gatsbyjs/reach-router'; import { orgAdminAPI } from '../../utils/org-admin-api'; -import { gettext, siteRoot } from '../../utils/constants'; +import { gettext, siteRoot, mediaUrl } from '../../utils/constants'; import { Utils } from '../../utils/utils'; import Loading from '../../components/loading'; import toaster from '../../components/toast'; @@ -72,7 +72,12 @@ class Content extends Component { return ; } if (errorMsg) { - return

{errorMsg}

; + return ( +
+ +

{errorMsg}

+
+ ); } return ( diff --git a/media/css/seahub.css b/media/css/seahub.css index 86908f24f6..c9a18e8099 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -336,7 +336,6 @@ img { margin: 0; } -body, input, textarea, button, @@ -680,17 +679,7 @@ table img { } .error { - color: red; -} - -.errorlist { - color: red; - padding: 0; -} - -.error-tip { - text-align: center; - margin-top: 5em; + color: #212529; } .ovhd { @@ -1416,7 +1405,7 @@ textarea:-moz-placeholder { padding: 5px; background: #FDF; margin: 0; - color: #000; + color: #212529; } /**** narrow-panel ****/ @@ -3004,8 +2993,3 @@ a.sf-popover-item { margin-right: 2px; background-color: #DBDBDB; } - -.unable-view-file-tip { - margin-top: 20px; - font-size: 1.125rem; -} diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css index 30b0373241..7d31142263 100644 --- a/media/css/seahub_react.css +++ b/media/css/seahub_react.css @@ -309,7 +309,7 @@ a, a:hover { } .error { - color: red; + color: #212529; } .no-deco, diff --git a/media/img/error-tip.png b/media/img/error-tip.png index 982cbce628cfb917ded307f64a04490c85ccbe1d..5f5efbb8ee4e0cf5fbfd4de5f7af4747cc7eff25 100644 GIT binary patch literal 6932 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 KMNUMnLSTZfS~pYx diff --git a/media/img/failed-to-view-file.png b/media/img/failed-to-view-file.png deleted file mode 100644 index 5f5efbb8ee4e0cf5fbfd4de5f7af4747cc7eff25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6932 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 +{% block main_content %} +
+

{% trans "Sorry, but the requested page could not be found." %}

{% endblock %} diff --git a/seahub/templates/error.html b/seahub/templates/error.html index c93c2c546f..52012b768c 100644 --- a/seahub/templates/error.html +++ b/seahub/templates/error.html @@ -1,15 +1,13 @@ {% extends 'base.html' %} {% block main_content %} -
- {% if unable_view_file %} - -

{{ error_msg }}

- {% elif organization_inactive %} +
+ {% if organization_inactive %}

{{ error_msg }}

{% else %} -

{{ error_msg }}

+ +

{{ error_msg }}

{% endif %}
{% endblock %} diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index e0597cff7b..6b26546d83 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -157,10 +157,8 @@ FILEEXT_TYPE_MAP = gen_fileext_type_map() def render_permission_error(request, msg=None, extra_ctx=None): """ Return permisson error page. - """ ctx = {} - ctx['unable_view_file'] = msg == _('Unable to view file') ctx['error_msg'] = msg or _('permission error') if extra_ctx: @@ -172,10 +170,8 @@ def render_permission_error(request, msg=None, extra_ctx=None): def render_error(request, msg=None, extra_ctx=None): """ Return normal error page. - """ ctx = {} - ctx['unable_view_file'] = msg == _('Unable to view file') ctx['error_msg'] = msg or _('Internal Server Error') if extra_ctx: @@ -187,7 +183,6 @@ def render_error(request, msg=None, extra_ctx=None): def list_to_string(l): """ Return string of a list. - """ return ','.join(l)