From: Brendan Hansen <brendan.f.hansen@gmail.com>
Date: Thu, 3 Oct 2019 21:16:34 +0000 (-0500)
Subject: Rearranging tabs
X-Git-Url: https://git.brendanfh.com/?a=commitdiff_plain;h=cf57ab5449d8cc2b7255acf3d32c6f371afc44af;p=codebox.git

Rearranging tabs
---

diff --git a/codebox/views/admin/submission.moon b/codebox/views/admin/submission.moon
index 01cc558..0bd0db5 100644
--- a/codebox/views/admin/submission.moon
+++ b/codebox/views/admin/submission.moon
@@ -6,13 +6,12 @@ class AdminSubmission extends html.Widget
 		h1 'Submissions'
 
 		div class: 'content', ->
-			div class: 'bcolor-pd pad-12 pad-l-44 split-6', ->
-				span "User ID"
-				span "Problem ID"
+			div class: 'bcolor-pd pad-12 pad-l-44 split-5', ->
+				span "Username"
+				span "Problem"
 				span "Competition ID"
 				span "Status"
 				span "Language"
-				span "Options"
 
 			div class: 'box', ->
 				Users\include_in @jobs, 'id',
@@ -34,12 +33,11 @@ class AdminSubmission extends html.Widget
 
 					div class: "tabbed-split tab-32 #{color}", ->
 						span ""
-						div class: 'highlight pad-12 split-6', ->
-							span "#{job.user.username}"
-							span "#{job.problem.short_name}"
-							span "#{job.competition_id}"
-							span "#{Jobs.statuses\to_name job.status}"
-							span "#{job.lang}"
-							div class: 'button-list', ->
-								a href: (@url_for 'admin.submission.edit', {}, { submission_id: job.job_id }), 'View'
+						a href: (@url_for 'admin.submission.edit', {}, { submission_id: job.job_id }), ->
+							div class: 'highlight pad-12 split-5', ->
+								span "#{job.user.username}"
+								span "#{job.problem.short_name}"
+								span "#{job.competition_id}"
+								span "#{Jobs.statuses\to_name job.status}"
+								span "#{job.lang}"
 
diff --git a/codebox/views/admin/user.moon b/codebox/views/admin/user.moon
index 742ee4a..751ed12 100644
--- a/codebox/views/admin/user.moon
+++ b/codebox/views/admin/user.moon
@@ -6,8 +6,8 @@ class AdminUsers extends html.Widget
 
 		div class: 'content', ->
 			div class: 'bcolor-pd pad-12 split-6', ->
-				span "Username"
 				span "Id"
+				span "Username"
 				span "Nickname"
 				span "Email"
 				span "Options"
@@ -15,8 +15,8 @@ class AdminUsers extends html.Widget
 			div class: 'box', ->
 				for user in *@users
 					div class: 'highlight pad-12 split-6', ->
-						span "#{user.username}"
 						span "#{user.id}"
+						span "#{user.username}"
 						span "#{user.nickname}"
 						span "#{user.email}"
 						span class: 'button-list', ->