Przeglądaj źródła

-Removed liker list from toc-container.
-Changed the look of the seen user list.

oshikishintaro 5 lat temu
rodzic
commit
618399264a

+ 43 - 5
src/client/js/components/User/SeenUserList.jsx

@@ -12,12 +12,12 @@ class SeenUserList extends React.Component {
   render() {
   render() {
     const { pageContainer } = this.props;
     const { pageContainer } = this.props;
     return (
     return (
-      <div className="user-list-content text-truncate text-muted text-right">
-        <span className="text-danger">
-          <span className="seen-user-count">{pageContainer.state.sumOfSeenUsers}</span>
+      <div className="dropdown text-right">
+        <button className="btn btn-link dropdown-toggle text-danger" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <i className="fa fa-fw fa-paw"></i>
           <i className="fa fa-fw fa-paw"></i>
-        </span>
-        <span className="mr-1">
+          <span className="seen-user-count">{pageContainer.state.sumOfSeenUsers}</span>
+        </button>
+        <span className="dropdown-menu dropdown-menu-right px-2 col user-list-content text-truncate text-muted">
           <UserPictureList users={pageContainer.state.seenUsers} />
           <UserPictureList users={pageContainer.state.seenUsers} />
         </span>
         </span>
       </div>
       </div>
@@ -26,6 +26,44 @@ class SeenUserList extends React.Component {
 
 
 }
 }
 
 
+
+// class SeenUserList extends React.Component {
+
+//   render() {
+//     const { pageContainer } = this.props;
+//     return (
+//       <div className="user-list-content text-truncate text-muted text-right">
+//         <button type="button" className="btn link" data-toggle="tooltip" data-placement="bottom" title="a">
+//           <span className="text-danger">
+//             <span className="seen-user-count">{pageContainer.state.sumOfSeenUsers}</span>
+//             <i className="fa fa-fw fa-paw"></i>
+//           </span>
+//         </button>
+//       </div>
+//     );
+//   }
+
+// }
+
+// class SeenUserList extends React.Component {
+
+//   render() {
+//     const { pageContainer } = this.props;
+//     return (
+//       <div className="user-list-content text-truncate text-muted text-right">
+//         <span className="text-danger">
+//           <span className="seen-user-count">{pageContainer.state.sumOfSeenUsers}</span>
+//           <i className="fa fa-fw fa-paw"></i>
+//         </span>
+//         <span className="mr-1">
+//           <UserPictureList users={pageContainer.state.seenUsers} />
+//         </span>
+//       </div>
+//     );
+//   }
+
+// }
+
 SeenUserList.propTypes = {
 SeenUserList.propTypes = {
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
   pageContainer: PropTypes.instanceOf(PageContainer).isRequired,
 };
 };

+ 2 - 5
src/server/views/layout-growi/widget/liker-and-seenusers.html

@@ -1,9 +1,6 @@
 <div class="liker-and-seenusers">
 <div class="liker-and-seenusers">
-  <div
-    id="liker-list"
-    data-user-ids-str="{{ page.liker|slice(-15)|default([])|reverse|join(',') }}"
-    data-sum-of-likers="{{ page.liker.length|default(0) }}"
-  ></div>
+
+
   <div
   <div
     id="seen-user-list"
     id="seen-user-list"
     data-user-ids-str="{{ page.seenUsers|slice(-15)|default([])|reverse|join(',') }}"
     data-user-ids-str="{{ page.seenUsers|slice(-15)|default([])|reverse|join(',') }}"