Просмотр исходного кода

Merge pull request #2840 from weseek/feat/gw-3979-adjust-flow-for-draft-page

Feat/gw 3979 adjust flow for draft page
Yuki Takei 5 лет назад
Родитель
Сommit
76862d9d14

+ 0 - 1
src/client/js/app.jsx

@@ -99,7 +99,6 @@ if (pageContainer.state.pageId != null) {
 
     'recent-created-icon': <RecentlyCreatedIcon />,
     'user-created-list': <RecentCreated userId={pageContainer.state.creator._id} />,
-    'user-draft-list': <MyDraftList />,
   });
 }
 if (pageContainer.state.path != null) {

+ 1 - 1
src/client/js/components/Sidebar/SidebarNav.jsx

@@ -71,7 +71,7 @@ class SidebarNav extends React.Component {
         </div>
         <div className="grw-sidebar-nav-secondary-container">
           {isAdmin && <SecondaryItem label="Admin" iconName="settings" href="/admin" />}
-          {isLoggedIn && <SecondaryItem label="Draft" iconName="file_copy" href={`/user/${currentUsername}#user-draft-list`} />}
+          {isLoggedIn && <SecondaryItem label="Draft" iconName="file_copy" href="/me/drafts" />}
           <SecondaryItem label="Help" iconName="help" href="https://docs.growi.org" isBlank />
           {isLoggedIn && <SecondaryItem label="Trash" iconName="delete" href="/trash" />}
         </div>

+ 0 - 28
src/server/views/widget/user_page_content.html

@@ -13,12 +13,6 @@
       </a>
     </li>
     {% if user._id.toString() == pageUser._id.toString() %}
-    <li class="nav-item">
-      <a class="nav-link" href="#user-draft-list" role="tab" data-toggle="tab">
-        <i class="icon-docs"></i>
-        <span class="d-none d-sm-inline">My Drafts</span>
-      </a>
-    </li>
     <li class="nav-item">
       <a class="nav-link" href="/me" role="tab">
         <i class="icon-wrench"></i>
@@ -39,27 +33,5 @@
         </div>
       {% endif %}
     </div>
-
-    {% if user._id.toString() == pageUser._id.toString() %}
-    <div class="tab-pane user-draft-list page-list" id="user-draft-list">
-      <div class="page-list-container">
-      </div>
-    </div>
-    {% endif %}
   </div>
 </div>
-
-<script>
-  function activateTab(tab){
-    $('.nav-tabs a[href="#' + tab + '"]').tab('show');
-  };
-
-  window.addEventListener('load', function(e) {
-    // hash on page
-    if (location.hash) {
-      if (location.hash == '#user-draft-list') {
-        activateTab('user-draft-list');
-      }
-    }
-  });
-</script>