From 0de207a3b331f1570fc72ee805d3167a00601a0e Mon Sep 17 00:00:00 2001
From: wangjianhui <wang@163.com>
Date: Sat, 8 Dec 2018 13:31:41 +0800
Subject: [PATCH] modify button

---
 frontend/src/pages/wikis/wiki-create.js | 4 ++--
 frontend/src/pages/wikis/wiki-delete.js | 4 ++--
 frontend/src/pages/wikis/wiki-select.js | 4 ++--
 seahub/wiki/urls.py                     | 3 ++-
 seahub/wiki/views.py                    | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/wikis/wiki-create.js b/frontend/src/pages/wikis/wiki-create.js
index a15d6c8a50..259cdc9fe8 100644
--- a/frontend/src/pages/wikis/wiki-create.js
+++ b/frontend/src/pages/wikis/wiki-create.js
@@ -56,8 +56,8 @@ class WikiDelete extends React.Component {
           <Input onKeyPress={this.handleKeyPress} innerRef={input => {this.newName = input}} value={this.state.name} onChange={this.inputNewName}/>
         </ModalBody>
         <ModalFooter>
-          <Button outline color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
-          <Button outline color="primary" onClick={this.handleSubmit}>{gettext('Submit')}</Button>
+          <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+          <Button color="primary" onClick={this.handleSubmit}>{gettext('Submit')}</Button>
         </ModalFooter>
       </Modal>
     );
diff --git a/frontend/src/pages/wikis/wiki-delete.js b/frontend/src/pages/wikis/wiki-delete.js
index 867ab5e12b..448add563e 100644
--- a/frontend/src/pages/wikis/wiki-delete.js
+++ b/frontend/src/pages/wikis/wiki-delete.js
@@ -22,8 +22,8 @@ class WikiDelete extends React.Component {
           <p>{gettext('Are you sure you want to delete this wiki?')}</p>
         </ModalBody>
         <ModalFooter>
-          <Button outline color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
-          <Button outline color="danger" onClick={this.props.handleSubmit}>{gettext('Submit')}</Button>
+          <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+          <Button color="danger" onClick={this.props.handleSubmit}>{gettext('Delete')}</Button>
         </ModalFooter>
       </Modal>
     );
diff --git a/frontend/src/pages/wikis/wiki-select.js b/frontend/src/pages/wikis/wiki-select.js
index 49fd3e6409..fa4dc386d1 100644
--- a/frontend/src/pages/wikis/wiki-select.js
+++ b/frontend/src/pages/wikis/wiki-select.js
@@ -76,8 +76,8 @@ class WikiSelect extends React.Component {
           </table>
         </ModalBody>
         <ModalFooter>
-          <Button outline color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
-          <Button outline color="primary" onClick={this.handleSubmit}>{gettext('Submit')}</Button>
+          <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
+          <Button color="primary" onClick={this.handleSubmit}>{gettext('Submit')}</Button>
         </ModalFooter>
       </Modal>
     );
diff --git a/seahub/wiki/urls.py b/seahub/wiki/urls.py
index 4f0a55305c..28631e3be6 100644
--- a/seahub/wiki/urls.py
+++ b/seahub/wiki/urls.py
@@ -2,9 +2,10 @@
 from django.conf.urls import url
 
 from .views import slug, wiki_list, edit_page
+from ..views import react_fake_view
 
 urlpatterns = [
-    url(r'^$', wiki_list, name='list'),
+    url(r'^$', react_fake_view, name='list'),
     url(r'^(?P<slug>[^/]+)/$', slug, name='slug'),
     url(r'^(?P<slug>[^/]+)/(?P<file_path>.+)$', slug, name='slug'),
     url(r'^(?P<slug>[^/]+)/(?P<page_name>[^/]+)/edit/$', edit_page, name='edit_page'),
diff --git a/seahub/wiki/views.py b/seahub/wiki/views.py
index 46e98d70c2..2ae81f0792 100644
--- a/seahub/wiki/views.py
+++ b/seahub/wiki/views.py
@@ -34,7 +34,7 @@ def wiki_list(request):
     if joined_groups:
         joined_groups.sort(lambda x, y: cmp(x.group_name.lower(), y.group_name.lower()))
 
-    return render(request, "react_app.html", {
+    return render(request, "wiki/wiki_list.html", {
         "grps": joined_groups,
     })