haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Code Issues Releases Wiki Activity

merge 7.0

Browse Source
This commit is contained in:
shanshuirenjia
2020-04-01 18:03:46 +08:00
parent 2ecb8de414 07e9013c26
commit 7e50035773
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/components/dialog/about-dialog.js
View File

@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Modal, ModalBody } from 'reactstrap';
import { gettext, lang, mediaUrl, logoPath, logoWidth, logoHeight, siteTitle, seafileVersion, extraAboutDialogLinks } from '../../utils/constants';
import { gettext, lang, mediaUrl, logoPath, logoWidth, logoHeight, siteTitle, seafileVersion, additionalAboutDialogLinks } from '../../utils/constants';
const propTypes = {
onCloseAboutDialog: PropTypes.func.isRequired,
@@ -14,10 +14,10 @@ class AboutDialog extends React.Component {
}
renderExternalAboutLinks = () => {
if (extraAboutDialogLinks && (typeof extraAboutDialogLinks) === 'object') {
let keys = Object.keys(extraAboutDialogLinks);
if (additionalAboutDialogLinks && (typeof additionalAboutDialogLinks) === 'object') {
let keys = Object.keys(additionalAboutDialogLinks);
return keys.map((key, index) => {
return <a key={index} className="d-block" href={extraAboutDialogLinks[key]}>{key}</a>;
return <a key={index} className="d-block" href={additionalAboutDialogLinks[key]}>{key}</a>;
});
}
return null;

8
frontend/src/components/dialog/share-dialog.js
View File

@@ -1,7 +1,7 @@
import React, { Fragment } from 'react';
import PropTypes from 'prop-types';
import { Modal, ModalHeader, ModalBody, TabContent, TabPane, Nav, NavItem, NavLink } from 'reactstrap';
import { gettext, username, canGenerateShareLink, canGenerateUploadLink, canInvitePeople, extraShareDialogNote } from '../../utils/constants';
import { gettext, username, canGenerateShareLink, canGenerateUploadLink, canInvitePeople, additionalShareDialogNote } from '../../utils/constants';
import ShareToUser from './share-to-user';
import ShareToGroup from './share-to-group';
import ShareToInvitePeople from './share-to-invite-people';
@@ -227,11 +227,11 @@ class ShareDialog extends React.Component {
}
renderExternalShareMessage = () => {
if (extraShareDialogNote && (typeof extraShareDialogNote) === 'object') {
if (additionalShareDialogNote && (typeof additionalShareDialogNote) === 'object') {
return (
<div className="external-share-message mt-2">
<h6>{extraShareDialogNote.title}</h6>
<div style={{fontSize: '14px', color: '#666'}}>{extraShareDialogNote.content}</div>
<h6>{additionalShareDialogNote.title}</h6>
<div style={{fontSize: '14px', color: '#666'}}>{additionalShareDialogNote.content}</div>
</div>
);
}

10
frontend/src/components/side-nav-footer.js
View File

@@ -1,5 +1,5 @@
import React, { Fragment } from 'react';
import { gettext, siteRoot, sideNavFooterCustomHtml, extraAppBottomLinks } from '../utils/constants';
import { gettext, siteRoot, sideNavFooterCustomHtml, additionalAppBottomLinks } from '../utils/constants';
import ModalPortal from './modal-portal';
import AboutDialog from './dialog/about-dialog';
@@ -17,10 +17,10 @@ class SideNavFooter extends React.Component {
}
renderExternalAppLinks = () => {
if (extraAppBottomLinks && (typeof extraAppBottomLinks) === 'object') {
let keys = Object.keys(extraAppBottomLinks);
if (additionalAppBottomLinks && (typeof additionalAppBottomLinks) === 'object') {
let keys = Object.keys(additionalAppBottomLinks);
return keys.map((key, index) => {
return <a key={index} className="item" href={extraAppBottomLinks[key]}>{key}</a>;
return <a key={index} className="item" href={additionalAppBottomLinks[key]}>{key}</a>;
});
}
return null;
@@ -37,7 +37,7 @@ class SideNavFooter extends React.Component {
<a href={siteRoot + 'help/'} target="_blank" rel="noopener noreferrer" className="item">{gettext('Help')}</a>
<a className="item cursor-pointer" onClick={this.onAboutDialogToggle}>{gettext('About')}</a>
{this.renderExternalAppLinks()}
<a href={siteRoot + 'download_client_program/'} className={`item ${extraAppBottomLinks ? '' : 'last-item'}`}>
<a href={siteRoot + 'download_client_program/'} className={`item ${additionalAppBottomLinks ? '' : 'last-item'}`}>
<span aria-hidden="true" className="sf2-icon-monitor vam"></span>{' '}
<span className="vam">{gettext('Clients')}</span>
</a>

6
frontend/src/utils/constants.js
View File

@@ -68,9 +68,9 @@ export const curNoteID = window.app.pageOptions.curNoteID;
// dtable
export const workspaceID = window.app.pageOptions.workspaceID;
export const showLogoutIcon = window.app.pageOptions.showLogoutIcon;
export const extraShareDialogNote = window.app.pageOptions.extraShareDialogNote;
export const extraAppBottomLinks = window.app.pageOptions.extraAppBottomLinks;
export const extraAboutDialogLinks = window.app.pageOptions.extraAboutDialogLinks;
export const additionalShareDialogNote = window.app.pageOptions.additionalShareDialogNote;
export const additionalAppBottomLinks = window.app.pageOptions.additionalAppBottomLinks;
export const additionalAboutDialogLinks = window.app.pageOptions.additionalAboutDialogLinks;
// wiki
export const slug = window.wiki ? window.wiki.config.slug : '';