ryohek 6 лет назад
Родитель
Сommit
8f8af8dcf7

+ 6 - 18
src/client/js/components/Navbar/PageCreator.jsx

@@ -7,28 +7,16 @@ import { userPageRoot } from '../../../../lib/util/path-utils';
 const PageCreator = (props) => {
 const PageCreator = (props) => {
   const { creator, createdAt } = props;
   const { creator, createdAt } = props;
   const isCompactMode = true;
   const isCompactMode = true;
-
-  if (isCompactMode) {
-    return (
-      <div className="d-flex align-items-center">
-        <div className="mr-2" href={userPageRoot(creator)} data-toggle="tooltip" data-placement="bottom" title={creator.name}>
-          <UserPicture user={creator} size="xs" />
-        </div>
-        <div>
-          Created in <span className="text-muted">{createdAt}</span>
-        </div>
-      </div>
-    );
-  }
+  const creatInfo = isCompactMode
+    ? (<div>Created in <span className="text-muted">{createdAt}</span></div>)
+    : (<div><div>Created by <a href={userPageRoot(creator)}>{creator.name}</a></div><div className="text-muted">{createdAt}</div></div>);
+  const pictureSize = isCompactMode ? 'xs' : 'sm';
   return (
   return (
     <div className="d-flex align-items-center">
     <div className="d-flex align-items-center">
       <div className="mr-2" href={userPageRoot(creator)} data-toggle="tooltip" data-placement="bottom" title={creator.name}>
       <div className="mr-2" href={userPageRoot(creator)} data-toggle="tooltip" data-placement="bottom" title={creator.name}>
-        <UserPicture user={creator} size="sm" />
-      </div>
-      <div>
-        <div>Created by <a href={userPageRoot(creator)}>{creator.name}</a></div>
-        <div className="text-muted">{createdAt}</div>
+        <UserPicture user={creator} size={pictureSize} />
       </div>
       </div>
+      {creatInfo}
     </div>
     </div>
   );
   );
 };
 };

+ 6 - 17
src/client/js/components/Navbar/RevisionAuthor.jsx

@@ -7,27 +7,16 @@ import { userPageRoot } from '../../../../lib/util/path-utils';
 const RevisionAuthor = (props) => {
 const RevisionAuthor = (props) => {
   const { revisionAuthor, updatedAt } = props;
   const { revisionAuthor, updatedAt } = props;
   const isCompactMode = true;
   const isCompactMode = true;
-  if (isCompactMode) {
-    return (
-      <div className="d-flex align-items-center">
-        <div className="mr-2" href={userPageRoot(revisionAuthor)} data-toggle="tooltip" data-placement="bottom" title={revisionAuthor.name}>
-          <UserPicture user={revisionAuthor} size="xs" />
-        </div>
-        <div>
-          Updated in <span className="text-muted">{updatedAt}</span>
-        </div>
-      </div>
-    );
-  }
+  const updateInfo = isCompactMode
+    ? (<div>Updated in <span className="text-muted">{updatedAt}</span></div>)
+    : (<div><div>Updated in  <a href={userPageRoot(revisionAuthor)}>{revisionAuthor.name}</a></div><div className="text-muted">{updatedAt}</div></div>);
+  const pictureSize = isCompactMode ? 'xs' : 'sm';
   return (
   return (
     <div className="d-flex align-items-center">
     <div className="d-flex align-items-center">
       <div className="mr-2" href={userPageRoot(revisionAuthor)} data-toggle="tooltip" data-placement="bottom" title={revisionAuthor.name}>
       <div className="mr-2" href={userPageRoot(revisionAuthor)} data-toggle="tooltip" data-placement="bottom" title={revisionAuthor.name}>
-        <UserPicture user={revisionAuthor} size="sm" />
-      </div>
-      <div>
-        <div>Updated by  <a href={userPageRoot(revisionAuthor)}>{revisionAuthor.name}</a></div>
-        <div className="text-muted">{updatedAt}</div>
+        <UserPicture user={revisionAuthor} size={pictureSize} />
       </div>
       </div>
+      {updateInfo}
     </div>
     </div>
   );
   );
 };
 };