Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

12.0 change wiki style #6152

Merged
merged 2 commits into from
May 31, 2024
Merged

12.0 change wiki style #6152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0ec49d
01 change delete Wiki tip
Michael18811380328 May 31, 2024
a5ba6e5
02 remove modify time when wiki init
Michael18811380328 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions frontend/src/components/dialog/wiki-delete-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,24 @@ import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
const propTypes = {
toggleCancel: PropTypes.func.isRequired,
handleSubmit: PropTypes.func.isRequired,
title: PropTypes.string.isRequired,
content: PropTypes.string.isRequired,
footer: PropTypes.string.isRequired,
};

class WikiDeleteDialog extends React.Component {

toggle = () => {
this.props.toggleCancel();
};

render() {
return (
<Modal isOpen={true} toggle={this.toggle}>
<ModalHeader toggle={this.toggle}>{gettext('Unpublish Library')}</ModalHeader>
<ModalBody>
<p>{gettext('Are you sure you want to unpublish this library?')}</p>
</ModalBody>
<ModalFooter>
<Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
<Button color="primary" onClick={this.props.handleSubmit}>{gettext('Unpublish')}</Button>
</ModalFooter>
</Modal>
);
}
function WikiDeleteDialog({ handleSubmit, toggleCancel, title, content, footer }) {
return (
<Modal isOpen={true} toggle={toggleCancel}>
<ModalHeader toggle={toggleCancel}>{title}</ModalHeader>
<ModalBody>
<p>{content}</p>
</ModalBody>
<ModalFooter>
<Button color="secondary" onClick={toggleCancel}>{gettext('Cancel')}</Button>
<Button color="primary" onClick={handleSubmit}>{footer}</Button>
</ModalFooter>
</Modal>
);
}

WikiDeleteDialog.propTypes = propTypes;
Expand Down
27 changes: 22 additions & 5 deletions frontend/src/components/wiki-card-view/wiki-card-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ class WikiCardItem extends Component {
/>
<DropdownMenu right={true} className="dtable-dropdown-menu">
<DropdownItem onClick={this.onRenameToggle}>{gettext('Rename')}</DropdownItem>
<DropdownItem onClick={this.onDeleteToggle}>{gettext('Unpublish')}</DropdownItem>
{isOldVersion ?
<DropdownItem onClick={this.onDeleteToggle}>{gettext('Unpublish')}</DropdownItem>
:
<DropdownItem onClick={this.onDeleteToggle}>{gettext('Delete')}</DropdownItem>
}
</DropdownMenu>
</Dropdown>
</div>
Expand All @@ -145,10 +149,23 @@ class WikiCardItem extends Component {
</div>
{this.state.isShowDeleteDialog &&
<ModalPortal>
<WikiDeleteDialog
toggleCancel={this.onDeleteCancel}
handleSubmit={this.deleteWiki}
/>
{isOldVersion ?
<WikiDeleteDialog
toggleCancel={this.onDeleteCancel}
handleSubmit={this.deleteWiki}
title={gettext('Unpublish Wiki')}
content={gettext('Are you sure you want to unpublish this Wiki?')}
footer={gettext('Unpublish')}
/>
:
<WikiDeleteDialog
toggleCancel={this.onDeleteCancel}
handleSubmit={this.deleteWiki}
title={gettext('Delete Wiki')}
content={gettext('Are you sure you want to delete this Wiki?')}
footer={gettext('Delete')}
/>
}
</ModalPortal>
}
{this.state.isShowRenameDialog &&
Expand Down
11 changes: 0 additions & 11 deletions frontend/src/pages/wiki2/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ class Wiki extends Component {
seadoc_access_token: '',
assets_url: '',
};

this.pythonWrapper = null;
}

UNSAFE_componentWillMount() {
Expand Down Expand Up @@ -123,13 +121,6 @@ class Wiki extends Component {
});
};

removePythonWrapper = () => {
if (this.pythonWrapper) {
document.body.removeChild(this.pythonWrapper);
this.pythonWrapper = null;
}
};

onCloseSide = () => {
this.setState({ closeSideBar: !this.state.closeSideBar });
};
Expand All @@ -138,8 +129,6 @@ class Wiki extends Component {
this.setState({
isDataLoading: true,
});

this.removePythonWrapper();
wikiAPI.getWiki2Page(wikiId, pageId).then(res => {
const { permission, seadoc_access_token, assets_url } = res.data;
this.setState({
Expand Down
2 changes: 1 addition & 1 deletion seahub/templates/base_for_react.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<body>
<div id="wrapper" class="{{ LANGUAGE_CODE }}"></div>
<div id="modal-wrapper" class="{{ LANGUAGE_CODE }}"></div>
{%block extra_content %}{% endblock %}
{% block wiki-v1-extra_content %}{% endblock %}

<script type="text/javascript">
window.app = {
Expand Down
2 changes: 1 addition & 1 deletion seahub/templates/wiki/wiki.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

{% block wiki_title %} {{h1_head_content}} - {{repo_name}}{% endblock %}

{% block extra_content %}
{% block wiki-v1-extra_content %}
{% if not is_dir %}
<div id="wiki-file-content" class="{{ LANGUAGE_CODE }}">
<div class="article">
Expand Down
89 changes: 0 additions & 89 deletions seahub/templates/wiki/wiki_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,6 @@

{% block wiki_title %} {{h1_head_content}} - {{repo_name}}{% endblock %}

{% block extra_content %}
{% if not is_dir %}
<div id="wiki-file-content" class="{{ LANGUAGE_CODE }}">
<div class="article">
{{ file_content }}
<p id="wiki-page-last-modified">{% translate "Last modified by" %} {{modifier|email2nickname}},
<span>{{modify_time|translate_seahub_time_str}}</span>
</p>
</div>
<div class="seafile-markdown-outline">
<div id="seafile-editor-outline" class="seafile-editor-outline">
{% for outline in outlines %}
{{ outline }}
{% endfor %}
</div>
</div>
</div>
{% endif %}
{% endblock %}

{% block extra_script %}
<script type="text/javascript">
window.wiki = {
Expand All @@ -52,74 +32,5 @@
}
};
</script>
<script type="text/javascript">
// titles info
let titlesInfo = [];
let headingList = document.querySelectorAll('h2[id^="user-content"], h3[id^="user-content"]');
for (let i = 0; i < headingList.length; i++) {
titlesInfo.push(headingList[i].offsetTop);
}

// outline infos
const outlineInfos = document.querySelectorAll('.outline-h2, .outline-h3');
const addActiveClass = (item) => {
const className = item.className;
if (className.indexOf('active') > -1) return;
item.className += ' active';
};
const removeActiveClass = (item) => {
const className = item.className;
if (className.indexOf('active') === -1) return;
item.className = className.replace(/(?:^|\s)active(?!\S)/g, '');
};
const updateOutline = (activeIndex) => {
for (let i = 0; i < outlineInfos.length; i++) {
const item = outlineInfos[i];
if (activeIndex !== i) {
removeActiveClass(item);
continue;
}
addActiveClass(item);
}
};
const outlineContainer = document.getElementById('seafile-editor-outline');
outlineContainer && outlineContainer.addEventListener('click', (event) => {
const text = event.target.innerText;
let url = new URL(window.location.href);
url.hash = '#user-content-' + text;
window.location.href = url.toString();
});

// scroll event handle
const container = document.getElementById('wiki-file-content');
if (container) {
container.style.left = '24%';
}
container && container.addEventListener('scroll', () => {
const titlesLength = titlesInfo.length;
const contentScrollTop = container.scrollTop + 180;
let activeTitleIndex;
if (contentScrollTop <= titlesInfo[0]) {
activeTitleIndex = 0;
} else if (contentScrollTop > titlesInfo[titlesLength - 1]) {
activeTitleIndex = titlesInfo.length - 1;
} else {
for (let i = 0; i < titlesLength; i++) {
if (contentScrollTop > titlesInfo[i]) {
continue;
} else {
activeTitleIndex = i - 1;
break;
}
}
}

updateOutline(activeTitleIndex);
});

// set first outline to active
updateOutline(0);
</script>

{% render_bundle 'wiki2' 'js' %}
{% endblock %}
Loading