merge

4 files changed, 49 insertions, 33 deletions

diff --git a/views/staff/users/index.ejs b/views/staff/users/index.ejs
index f14d666..1795dde 100644
--- a/views/staff/users/index.ejs
+++ b/views/staff/users/index.ejs
@@ -2,12 +2,7 @@
 
 	<h1>Users</h1>
 
-  <nav>
-    <a href="/staff">home</a>
-    <a href="/staff/users">users</a>
-    <a href="/staff/projects">projects</a>
-    <a href="/staff/media">media</a>
-  </nav>
+[[ include ../_nav ]]
   
   <hr>
 
diff --git a/views/staff/users/media.ejs b/views/staff/users/media.ejs
index b13e5fb..8927c00 100644
--- a/views/staff/users/media.ejs
+++ b/views/staff/users/media.ejs
@@ -1,18 +1,13 @@
 [[ include ../_header ]]
 
-	<h1>Users</h1>
+<h1>User Media: [[- profile.username ]]</h1>
 
-  <nav>
-    <a href="/staff">home</a>
-    <a href="/staff/users">users</a>
-    <a href="/staff/projects">projects</a>
-    <a href="/staff/media">media</a>
-  </nav>
-  
-  <hr>
+[[ include ../_nav ]]
+
+<hr>
 
 [[ include ../_pagination ]]
-[[ include ../_media ]]
+[[ include ../_gallery ]]
 [[ include ../_pagination ]]
 
 [[ include ../_footer ]]
diff --git a/views/staff/users/show.ejs b/views/staff/users/show.ejs
index 8e9b447..a434b57 100644
--- a/views/staff/users/show.ejs
+++ b/views/staff/users/show.ejs
@@ -1,12 +1,7 @@
 [[ include ../_header ]]
 	<h1>User: [[- profile.username ]]</h1>
 
-  <nav>
-    <a href="/staff">home</a>
-    <a href="/staff/users">users</a>
-    <a href="/staff/projects">projects</a>
-    <a href="/staff/media">media</a>
-  </nav>
+[[ include ../_nav ]]
   
   <hr>
 
@@ -22,12 +17,38 @@
         [[- profile.displayName ]]
       </td>
       <td class="editLinks">
-        <a href="/profile/[[- profile.username ]]">[view profile]</a>
-        <a href="/staff/users/[[- profile.username ]]/media">[view media]</a>
+        <a href="/profile/[[- profile.username ]]">[profile]</a>
+        <a href="/staff/users/[[- profile.username ]]/media">[media]</a>
+				[[ if (profile.subscription) { ]]
+					<a href="https://vvalls.recurly.com/accounts/[[- profile._id ]]">[recurly]</a>
+				[[ } ]]
       </td>
     </tr>
   </table>
+
+  [[ if (profile.subscription) { ]]
+  <h2>Subscription</h2>
   
+  <table>
+    <tr>
+      <th>
+        plan
+      </th>
+      <td>
+        [[- profile.plan_code ]]
+      </td>
+    </tr>
+    <tr>
+    	<th>
+    		last charged
+    	</th>
+    	<td>
+    		[[- profile.last_charged ]]
+    	</td>
+    </tr>
+	</table>
+	[[ } ]]
+	  
   <h2>Profile</h2>
   
   <table>
@@ -80,12 +101,21 @@
         [[- profile.isStaff ? "yes" : "no" ]]
       </td>
     </tr>
+    <tr>
+      <th>
+        is artist?
+      </th>
+      <td id="is-artist">
+        [[- profile.isArtist ? "yes" : "no" ]]
+      </td>
+    </tr>
   </table>
 
   <br><br>
   <div id="actions">
   [[ if (String(user._id) != String(profile._id)) { ]]
     <button id="toggle-staff" data-isStaff="[[- !! profile.isStaff ]]">Make Staff</button>
+    <button id="toggle-artist" data-isArtist="[[- !! profile.isArtist ]]">Make Artist</button>
   [[ } ]]
   </div>
   
diff --git a/views/staff/users/show_404.ejs b/views/staff/users/show_404.ejs
index bcd0271..11663fa 100644
--- a/views/staff/users/show_404.ejs
+++ b/views/staff/users/show_404.ejs
@@ -1,13 +1,9 @@
 [[ include ../_header ]]
-	<h1>User not found</h1>
 
-  <nav>
-    <a href="/staff">home</a>
-    <a href="/staff/users">users</a>
-    <a href="/staff/projects">projects</a>
-    <a href="/staff/media">media</a>
-  </nav>
-  
-  <hr>
+<h1>User not found</h1>
+
+[[ include ../_nav ]]
+
+<hr>
 
 [[ include ../_footer ]]