Parcourir la source

Merge pull request #2773 from weseek/imprv/gw3804-move-recent-changes-content-new

Imprv/gw3804 move recent changes content new
Yuki Takei il y a 5 ans
Parent
commit
d2ed3766e2

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

@@ -23,6 +23,7 @@ import TrashPageAlert from './components/Page/TrashPageAlert';
 import PageAttachment from './components/PageAttachment';
 import PageAttachment from './components/PageAttachment';
 import PageStatusAlert from './components/PageStatusAlert';
 import PageStatusAlert from './components/PageStatusAlert';
 import RecentCreated from './components/RecentCreated/RecentCreated';
 import RecentCreated from './components/RecentCreated/RecentCreated';
+import RecentlyCreatedIcon from './components/Icons/RecentlyCreatedIcon';
 import MyDraftList from './components/MyDraftList/MyDraftList';
 import MyDraftList from './components/MyDraftList/MyDraftList';
 import SeenUserList from './components/User/SeenUserList';
 import SeenUserList from './components/User/SeenUserList';
 import LikerList from './components/User/LikerList';
 import LikerList from './components/User/LikerList';
@@ -95,6 +96,7 @@ if (pageContainer.state.pageId != null) {
     'liker-list': <LikerList />,
     'liker-list': <LikerList />,
 
 
     'user-created-list': <RecentCreated />,
     'user-created-list': <RecentCreated />,
+    'recent-created-icon': <RecentlyCreatedIcon />,
     'user-draft-list': <MyDraftList />,
     'user-draft-list': <MyDraftList />,
   });
   });
 }
 }

+ 9 - 0
src/client/styles/scss/_layout_growi.scss

@@ -35,3 +35,12 @@
     }
     }
   }
   }
 }
 }
+
+.grw-recently-created {
+  .recently-created-title {
+    svg {
+      width: 35px;
+      height: 35px;
+    }
+  }
+}

+ 11 - 0
src/client/styles/scss/theme/_apply-colors-dark.scss

@@ -276,3 +276,14 @@ body.on-edit {
     background-color: $bgcolor-tags;
     background-color: $bgcolor-tags;
   }
   }
 }
 }
+
+/*
+ * GROWI user page
+ */
+.grw-recently-created {
+  .recently-created-title {
+    svg {
+      fill: $color-global;
+    }
+  }
+}

+ 13 - 0
src/server/views/layout-growi/user_page.html

@@ -49,6 +49,19 @@
 {% block content_main_after %}
 {% block content_main_after %}
   {% include 'widget/comments.html' %}
   {% include 'widget/comments.html' %}
 
 
+  {% if page %}
+    <div class="grw-recently-created">
+      <h1 class="recently-created-title border-bottom pb-2">
+        <i id="recent-created-icon"></i>
+        Recently Created
+      </h2>
+      <div class="user-created-list page-list" id="user-created-list">
+        <div class="page-list-container">
+        </div>
+      </div>
+    </div>
+  {% endif %}
+
   {% if page %}
   {% if page %}
     {% include '../widget/page_attachments.html' %}
     {% include '../widget/page_attachments.html' %}
   {% endif %}
   {% endif %}

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

@@ -40,11 +40,6 @@
       {% endif %}
       {% endif %}
     </div>
     </div>
 
 
-    <div class="tab-pane user-created-list page-list" id="user-created-list">
-      <div class="page-list-container">
-      </div>
-    </div>
-
     {% if user._id.toString() == pageUser._id.toString() %}
     {% if user._id.toString() == pageUser._id.toString() %}
     <div class="tab-pane user-draft-list page-list" id="user-draft-list">
     <div class="tab-pane user-draft-list page-list" id="user-draft-list">
       <div class="page-list-container">
       <div class="page-list-container">