add user page markup

views/common/topnav.etlua

@@ -7,7 +7,7 @@
     <% if me:is_logged_in() then -%>
       Welcome, <a href="<%= url_for("user", {username = me.username}) %>"><%= me.username %></a>
     <% else -%>
-      Welcome, guest. Please <a href="<%= url_for("user_login") %>">log in</a>
+      Welcome, guest. Please <a href="<%= url_for("user_signup") %>">sign up</a> or <a href="<%= url_for("user_login") %>">log in</a>
     <% end -%>
   </span>
 </nav>

views/threads/thread.etlua

@@ -1,6 +1,6 @@
 <% render("views.common.topnav") -%>
 <main>
-  <nav id="threadnav">
+  <nav class="darkbg">
     <h1 class="thread-title"><%= thread.title %></h1>
     <span>Posted in <a href="<%= url_for("topic", {slug = topic.slug}) %>"><%= topic.name %></a></span>
   </nav>

views/user/user.etlua

@@ -1,41 +1,74 @@
 <% if just_logged_in then %>
   <h1>Logged in successfully.</h1>
 <% end %>
-<img src="<%= avatar_url(user) %>">
-<h1><%= user.username %></h1>
-<h2><%= PermissionLevelString[user.permission] %></h2>
-<% if user:is_guest() and user_is_me then %>
-  <h2>You are a guest. An Moderator needs to approve your account before you will be able to post.</h2>
+<% render("views.common.topnav") -%>
+<div class="darkbg">
+  <h1 class="thread-title">Latest posts by <i><%= user.username %></i></h1>
+  <div>
+  User permission: <i><%= PermissionLevelString[user.permission] %></i>
+  </div>
+  <% if user_is_me then -%>
+  <div class="user-actions">
+    <a class="linkbutton" href="<%= url_for("user_settings", {username = user.username}) %>">Settings</a>
+    <form method="post" action="<%= url_for("user_logout", {user_id = me.id}) %>">
+      <input class="warn" type="submit" value="Log out">
+    </form>
+  </div>
+  <% end %>
+</div>
+<% --[[ duplicating code, maybe i'll refactor the post subview later to work anywhere <clown emoji>]] %>
+<% for i, post in ipairs(latest_posts) do %>
+  <div class="user-posts">
+    <div class="user-page-usercard">
+      <img class="avatar" src="<%= avatar_url(user) %>">
+      <b class="big"><%= user.username %></b>
+      <em class="user-status"><%= user.status %></em>
+    </div>
+    <div class="user-posts-container">
+      <div class="post-info">
+        <div><a href="<%= url_for("thread", {slug = post.thread_slug}, {after = post.id}) .. "#post-" .. post.id %>" title="Permalink"><i>
+        <% if tonumber(post.edited_at) > tonumber(post.created_at) then -%>
+            Edited in <%= post.thread_title %> at <%= os.date("%c", post.edited_at) %>
+          <% else -%>
+            Posted in <%= post.thread_title %> at <%= os.date("%c", post.created_at) %>
+          <% end -%>
+      </i></a></div>
+      </div>
+      <div class="post-content">
+        <%- post.content %>
+      </div>
+    </div>
+  </div>
 <% end %>
-<% if user_is_me then %>
-  <a class="linkbutton" href="<%= url_for("user_settings", {username = user.username}) %>">Settings</a>
-  <form method="post" action="<%= url_for("user_logout", {user_id = me.id}) %>">
-    <input class="warn" type="submit" value="Log out">
-  </form>
+
+<% if user:is_guest() and user_is_me then %>
+  <h2>You are a guest. A Moderator needs to approve your account before you will be able to post.</h2>
 <% end %>
 
 <% if me:is_mod() and not user:is_system() then %>
-  <h1>Moderator controls</h2>
-  <% if user:is_guest() then %>
-    <p>This user is a guest. They signed up on <%= os.date("%c", user.created_at) %>.</p>
-    <form class="modform" method="post" action="<%= url_for("confirm_user", {user_id = user.id}) %>">
-      <input type="submit" value="Confirm user">
-    </form>
-  <% else %> <% --[[ user is not guest ]] %>
-    <p>This user signed up on <%= os.date("%c", user.created_at) %> and was confirmed on <%= os.date("%c", user.confirmed_on) %>.</p>
-    <% if user.permission < me.permission then %>
-    <form class="modform" method="post" action="<%= url_for("guest_user", {user_id = user.id}) %>">
-      <input class="warn" type="submit" value="Demote user to guest (soft ban)">
-    </form>
-    <% end %>
-    <% if me:is_admin() and not user:is_mod() then %>
-      <form class="modform" method="post" action="<%= url_for("mod_user", {user_id = user.id}) %>">
-        <input class="warn" type="submit" value="Promote user to moderator">
+  <div class="darkbg">
+    <h1>Moderator controls</h2>
+    <% if user:is_guest() then %>
+      <p>This user is a guest. They signed up on <%= os.date("%c", user.created_at) %>.</p>
+      <form class="modform" method="post" action="<%= url_for("confirm_user", {user_id = user.id}) %>">
+        <input type="submit" value="Confirm user">
       </form>
-    <% elseif user:is_mod() and user.permission < me.permission then %>
-      <form class="modform" method="post" action="<%= url_for("demod_user", {user_id = user.id}) %>">
-        <input class="critical" type="submit" value="Demote user to regular user">
+    <% else %> <% --[[ user is not guest ]] %>
+      <p>This user signed up on <%= os.date("%c", user.created_at) %> and was confirmed on <%= os.date("%c", user.confirmed_on) %>.</p>
+      <% if user.permission < me.permission then %>
+      <form class="modform" method="post" action="<%= url_for("guest_user", {user_id = user.id}) %>">
+        <input class="warn" type="submit" value="Demote user to guest (soft ban)">
       </form>
+      <% end %>
+      <% if me:is_admin() and not user:is_mod() then %>
+        <form class="modform" method="post" action="<%= url_for("mod_user", {user_id = user.id}) %>">
+          <input class="warn" type="submit" value="Promote user to moderator">
+        </form>
+      <% elseif user:is_mod() and user.permission < me.permission then %>
+        <form class="modform" method="post" action="<%= url_for("demod_user", {user_id = user.id}) %>">
+          <input class="critical" type="submit" value="Demote user to regular user">
+        </form>
+      <% end %>
     <% end %>
-  <% end %>
+  </div>
 <% end %>