From 3851513cad3e9d7ce4a1035a567da2bb32fad1f6 Mon Sep 17 00:00:00 2001
From: Menci <HuangHaoRui301@Gmail.com>
Date: Mon, 5 Dec 2016 18:50:38 +0800
Subject: [PATCH] Show nameplate after user name

---
 views/article.ejs          | 5 ++---
 views/contest_ranklist.ejs | 6 +-----
 views/discussion.ejs       | 2 +-
 views/header.ejs           | 2 +-
 views/index.ejs            | 6 +-----
 views/judge_detail.ejs     | 2 +-
 views/judge_state.ejs      | 2 +-
 views/ranklist.ejs         | 6 +-----
 views/user.ejs             | 4 ++--
 9 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/views/article.ejs b/views/article.ejs
index 4d6a7e9..a974e8e 100644
--- a/views/article.ejs
+++ b/views/article.ejs
@@ -8,8 +8,7 @@
 <div class="padding">
   <h1><%= article.title %></h1>
  	<p style="font_size: 0.7em"><img style="vertical-align: middle;" src="<%= syzoj.utils.gravatar(article.user.email, 64) %>" width="32" height="32">
- 		<a href="<%= syzoj.utils.makeUrl(['user', article.user_id]) %>"><%= article.user.username %></a>
-        <% if (article.user.nameplate) { %><%- article.user.nameplate %><% } %> 于 <%= syzoj.utils.formatDate(article.public_time) %> 发表，<%= syzoj.utils.formatDate(article.update_time) %> 最后更新
+ 		<a href="<%= syzoj.utils.makeUrl(['user', article.user_id]) %>"><%= article.user.username %></a><% if (article.user.nameplate) { %><%- article.user.nameplate %><% } %> 于 <%= syzoj.utils.formatDate(article.public_time) %> 发表，<%= syzoj.utils.formatDate(article.update_time) %> 最后更新
         <% if (article.allowedEdit) { %>
         <a class="ui mini red button" href="<%= syzoj.utils.makeUrl(['article', article.id, 'delete']) %>">删除文章</a>
         <a class="ui mini button" href="<%= syzoj.utils.makeUrl(['article', article.id, 'edit']) %>">编辑文章</a>
@@ -27,7 +26,7 @@
           <img src="<%= syzoj.utils.gravatar(comment.user.email, 120) %>">
         </a>
         <div class="content">
-          <a class="author" href="<%= syzoj.utils.makeUrl(['user', comment.user_id]) %>"><%= comment.user.username %></a>
+          <a class="author" href="<%= syzoj.utils.makeUrl(['user', comment.user_id]) %>"><%= comment.user.username %></a><% if (comment.user.nameplate) { %><%- comment.user.nameplate %><% } %>
           <div class="metadata">
             <span class="date"><%= syzoj.utils.formatDate(comment.public_time) %></span>
           </div>
diff --git a/views/contest_ranklist.ejs b/views/contest_ranklist.ejs
index 954eeac..4f349f8 100644
--- a/views/contest_ranklist.ejs
+++ b/views/contest_ranklist.ejs
@@ -40,11 +40,7 @@
                   <%= i %>
                   </div>
                 </td>
-                <td><a href="<%= syzoj.utils.makeUrl(['user', item.user.id]) %>"><%= item.user.username %></a>
-                <% if (item.user.nameplate) { %>
-                  <%= item.user.nameplate %>
-                <% } %>
-                </td>
+                <td><a href="<%= syzoj.utils.makeUrl(['user', item.user.id]) %>"><%= item.user.username %></a><% if (item.user.nameplate) { %><%- item.user.nameplate %><% } %></td>
                 <% for (let problem of problems) { %>
                 <% if (item.player.score_details[problem.id]) { %>
                 <td><a href="<%= syzoj.utils.makeUrl(['judge_detail', item.player.score_details[problem.id].judge_id]) %>">
diff --git a/views/discussion.ejs b/views/discussion.ejs
index 184d103..f2bcf45 100644
--- a/views/discussion.ejs
+++ b/views/discussion.ejs
@@ -20,7 +20,7 @@
     <% for (let article of articles) { %>
         <tr>
             <td><a href="<%= syzoj.utils.makeUrl(['article', article.id]) %>"><%= article.title %></a></td>
-            <td><a href="<%= syzoj.utils.makeUrl(['user', article.user_id]) %>"><%= article.user.username %></a></td>
+            <td><a href="<%= syzoj.utils.makeUrl(['user', article.user_id]) %>"><%= article.user.username %></a><% if (article.user.nameplate) { %><%- article.user.nameplate %><% } %></td>
             <td><%= syzoj.utils.formatDate(article.public_time) %></td>
         </tr>
     <% } %>
diff --git a/views/header.ejs b/views/header.ejs
index a51b4d0..aae1cdf 100644
--- a/views/header.ejs
+++ b/views/header.ejs
@@ -26,7 +26,7 @@
               <% if (user) { %>
               <a href="<%= syzoj.utils.makeUrl(['user', user.id]) %>" style="color: inherit; ">
               <div class="ui simple dropdown item">
-                <%= user.username %> <i class="dropdown icon"></i>
+                <%= user.username %><% if (user.nameplate) { %><%- user.nameplate %><% } %> <i class="dropdown icon"></i>
                 <div class="menu">
                   <a class="item" href="<%= syzoj.utils.makeUrl(['user', user.id, 'edit']) %>"><i class="edit icon"></i>修改资料</a>
                   <a class="item" href="#" id="logout"><i class="power icon"></i>注销</a>
diff --git a/views/index.ejs b/views/index.ejs
index e16d708..e286d9f 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -40,11 +40,7 @@
             %>
                 <tr>
                     <td><%= i %></td>
-                    <td><a href="<%= syzoj.utils.makeUrl(['user', user.id]) %>"><%= user.username %></a>
-                  <% if (user.nameplate) { %>
-                  <%- user.nameplate %>
-                  <% } %>
-                </td>
+                    <td><a href="<%= syzoj.utils.makeUrl(['user', user.id]) %>"><%= user.username %></a><% if (user.nameplate) { %><%- user.nameplate %><% } %></td>
                     <td><%- user.information %></td>
                 </tr>
              <%
diff --git a/views/judge_detail.ejs b/views/judge_detail.ejs
index 97b720e..c9cc75b 100644
--- a/views/judge_detail.ejs
+++ b/views/judge_detail.ejs
@@ -26,7 +26,7 @@
           <td>隐藏</td>
           <td>隐藏</td>
         <% } %>
-        <td><a href="<%= syzoj.utils.makeUrl(['user', judge.user_id]) %>"><%= judge.user.username %></a></td>
+        <td><a href="<%= syzoj.utils.makeUrl(['user', judge.user_id]) %>"><%= judge.user.username %></a><% if (judge.user.nameplate) { %><%- judge.user.nameplate %><% } %></td>
         <td><%= syzoj.utils.formatDate(judge.submit_time) %></td>
        </tr>
      </tbody>
diff --git a/views/judge_state.ejs b/views/judge_state.ejs
index 675cfde..9d93ded 100644
--- a/views/judge_state.ejs
+++ b/views/judge_state.ejs
@@ -60,7 +60,7 @@
             <td>隐藏</td>
             <td>隐藏</td>
         <% } %>
-        <td><a href="<%= syzoj.utils.makeUrl(['user', judge.user_id]) %>"><%= judge.user.username %></a></td>
+        <td><a href="<%= syzoj.utils.makeUrl(['user', judge.user_id]) %>"><%= judge.user.username %></a><% if (judge.user.nameplate) { %><%- judge.user.nameplate %><% } %></td>
         <td><%= syzoj.utils.formatDate(judge.submit_time) %></td>
         <td><a href="<%= syzoj.utils.makeUrl(['judge_detail', judge.id]) %>"><i style="color: #000;" class="code icon"></i></a></td>
       </tr>
diff --git a/views/ranklist.ejs b/views/ranklist.ejs
index 5c61efd..87fa158 100644
--- a/views/ranklist.ejs
+++ b/views/ranklist.ejs
@@ -24,11 +24,7 @@
             %>
 		        <tr>
 		        	<td><%= i %></td>
-		        	<td><a href="<%= syzoj.utils.makeUrl(['user', user.id]) %>"><%= user.username %></a>
-            <% if (user.nameplate) { %>
-            <%- user.nameplate %>
-            <% } %>
-              </td>
+		        	<td><a href="<%= syzoj.utils.makeUrl(['user', user.id]) %>"><%= user.username %></a><% if (user.nameplate) { %><%- user.nameplate %><% } %></td>
 		        	<td><%- user.information %></td>
 		        	<td><%= user.ac_num %></td>
 		        </tr>
diff --git a/views/user.ejs b/views/user.ejs
index ea756b6..0e35750 100644
--- a/views/user.ejs
+++ b/views/user.ejs
@@ -18,7 +18,7 @@
                     <img src="<%= syzoj.utils.gravatar(show_user.email, 1000) %>">
                 </div>
                 <div class="content">
-                    <div class="header"><%= show_user.username %> <% if (show_user.sex == 1) { %><i class="man icon"></i><% } else if (show_user.sex == -1) { %><i class="woman icon"></i><% } %></div>
+                    <div class="header"><%= show_user.username %><% if (show_user.nameplate) { %><%- show_user.nameplate %><% } %> <% if (show_user.sex == 1) { %><i class="man icon"></i><% } else if (show_user.sex == -1) { %><i class="woman icon"></i><% } %></div>
                     <div class="meta">
                         <a class="group"><%= show_user.is_admin ? '管理员' : '普通用户' %></a>
                     </div>
@@ -39,7 +39,7 @@
                                     <div class="row">
                                         <div class="column">
                                             <h4 class="ui top attached block header">用户名</h4>
-                                            <div class="ui bottom attached segment"><%= show_user.username %></div>
+                                            <div class="ui bottom attached segment"><%= show_user.username %><% if (show_user.nameplate) { %><%- show_user.nameplate %><% } %></div>
                                         </div>
                                     </div>
                                     <div class="row">