cafe-grader-web Commit - r57:45a526b9fbd3

cafe-grader-web

Commit `r57:45a526b9fbd3` public

parent | child

Description:

[web] better css styling git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@129 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r57:45a526b9fbd3 - Mon, 17 Mar 2008 18:48:17 - 9 files changed: 45 inserted, 54 deleted

app/views/main/_problem.html.erb ¶ +4 -4

               <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
-            -   <td class="info">
+            +   <td>
                   <%= "#{problem_counter + 1}" %>
                 </td>
-            -   <td class="info">
+            +   <td>
                   <%= "#{problem.full_name} (#{problem.name})" %>
                   <%= link_to '[desc]', problem.url, :popup => true if (problem.url!=nil) and (problem.url!='') %>
                 </td>
-            -   <td class="info" align="center">
+            +   <td align="center">
                   <%= @prob_submissions[problem_counter][:count] %>
                 </td>
-            -   <td class="info">
+            +   <td>
                   <%= render :partial => 'submission_short',
                              :locals => { :submission => @prob_submissions[problem_counter][:submission]} %>
                 </td>
               </tr>

app/views/main/list.rhtml ¶ +4 -4

               </div>
               <hr/>
               <table class="info">
                 <tr class="info-head">
-            -     <th class="info"></th>
+            +     <th></th>
-            -     <th class="info">Tasks</th>
+            +     <th>Tasks</th>
-            -     <th class="info"># of sub(s)</th>
+            +     <th># of sub(s)</th>
-            -     <th class="info">Results</th>
+            +     <th>Results</th>
                 </tr>
                 <%= render :partial => 'problem', :collection => @problems %>
               </table>
               <hr />

app/views/problems/list.rhtml ¶ -4

                 <%= stylesheet_link_tag 'problems' %>
                 <%= javascript_include_tag :defaults %>
               <% end %>
               <h1>Listing problems</h1>
-            - <div class="usermenu">
-            - <%= link_to 'Main', :controller => 'main', :action => 'list' %>
-            - </div>
               <%= link_to 'New problem', :action => 'new' %>
               <%= link_to 'Turn off all problems', :action => 'turn_all_off' %><br/>
               <table>
                 <tr>
                   <th>Name</th>

app/views/problems/stat.rhtml ¶ +10 -7

               <h1>Problem stat: <%= @problem.name %></h1>
-            - <div class="usermenu">
-            - <%= link_to 'Main', :controller => 'main', :action => 'list' %>
-            - </div>
               <i>This is just a hack.  Really not efficient.</i><br/><br/>
               <% if @submissions!=nil %>
-            -   <table border="1">
+            +   <table class="info">
-            -   <tr><td>user_id</td><td>submitted_at</td><td>points</td><td>comment</td></tr>
+            +   <tr class="info-head">
+            +     <th>user_id</th>
+            +     <th>submitted_at</th>
+            +     <th>points</th>
+            +     <th>comment</th>
+            +   </tr>
+            +   <% count = 0 %>
                 <% @submissions.each do |sub| %>
-            -     <tr>
+            +     <tr class="<%= (count % 2 ==0) ? "info-even" : "info-odd" %>">
                   <td><%= sub.user_id %></td>
                   <td><%= sub.submitted_at.to_s %></td>
                   <td><%= sub.points %></td>
                   <td><div style="font-family: monospace"><%= sub.grader_comment %></div></td>
                   </tr>
+            +     <% count += 1 %>
                 <% end %>
                 </table>
               <% else %>
               No submission
               <% end %>

app/views/test/_test_request.html.haml ¶ +8 -8

@@ -1,11 +1,11
1	%tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}	1	%tr{:class => (test_request_counter%2==0) ? "info-even" : "info-odd"}
2	- %td~~.info~~= test_request_counter +1	2	+ %td= test_request_counter +1
3	- %td~~.info~~= test_request.problem.full_name	3	+ %td= test_request.problem.full_name
4	- %td~~.info~~= test_request.submission.number	4	+ %td= test_request.submission.number
5	- %td~~.info~~= test_request.status_str	5	+ %td= test_request.status_str
6	- %td~~.info~~= test_request.running_stat or ''	6	+ %td= test_request.running_stat or ''
7	- %td~~.info~~	7	+ %td
8	- if test_request.output_file_name!=nil	8	- if test_request.output_file_name!=nil
9	= link_to '[output]', :action => 'read', :id => test_request.id	9	= link_to '[output]', :action => 'read', :id => test_request.id
10	- %td~~.info~~= test_request.grader_comment or ''	10	+ %td= test_request.grader_comment or ''
11	- %td~~.info~~= test_request.compiler_message or ''	11	+ %td= test_request.compiler_message or ''

app/views/test/index.html.erb ¶ +8 -8

               <% end %>
               <h3>Previous requests</h3>
               <table class="info">
                 <tr class="info-head">
-            -     <th class="info"></td>
+            +     <th></td>
-            -     <th class="info">problem</th>
+            +     <th>problem</th>
-            -     <th class="info">#</th>
+            +     <th>#</th>
-            -     <th class="info">status</th>
+            +     <th>status</th>
-            -     <th class="info">running stat</th>
+            +     <th>running stat</th>
-            -     <th class="info">output (first 2kb)</th>
+            +     <th>output (first 2kb)</th>
-            -     <th class="info">grading comment</th>
+            +     <th>grading comment</th>
-            -     <th class="info">compiler message</th>
+            +     <th>compiler message</th>
                 </tr>
                 <%= render :partial => 'test_request', :collection => @user.test_requests %>
               </table>
               <% end %>

app/views/user_admin/user_stat.rhtml ¶ +9 -11

-            - <h1>User stat</h1>
+            + <h1>User grading results</h1>
-            - <div class="usermenu">
-            - <%= link_to 'List', :action => 'list' %>
-            - <%= link_to 'Main', :controller => 'main', :action => 'list' %>
-            - </div>
-            - <table border="1">
+            + <table class="info">
-            - <tr><td>User</td>
+            + <tr class="info-head"><th>User</th>
               <% @problems.each do |p| %>
-            -   <td><%= p.name %></td>
+            +   <th><%= p.name %></th>
               <% end %>
-            - <td>Total</td>
+            + <th>Total</th>
+            + <th>Passed</th>
               </tr>
+            + <% counter = 0 %>
               <% @scorearray.each do |sc| %>
-            -   <tr>
+            +   <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
                   <% total = 0 %>
                   <% num_passed = 0 %>
                   <% sc.each_index do |i| %>
                     <% if i==0 %>
                       <td><%= sc[i] %></td>
                     <% else %>
                       <% num_passed += 1 if sc[i][1] %>
                     <% end %>
                   <% end %>
                   <td><%= total %></td>
                   <td><%= num_passed %></td>
                 </tr>
+            +   <% counter += 1 %>
               <% end %>
               </table>

public/stylesheets/application.css ¶ +2 -2

               table.info {
                   border: 1px solid black;
                   border-collapse: collapse;
                   font-size: 12px;
               }
-            - th.info {
+            + table.info th {
                   border: 1px solid black;
               }
-            - td.info {
+            + table.info td {
                   border-left: 1px solid black;
                   border-right: 1px solid black;
               }
               tr.info-head {
                   background: #777777;

public/stylesheets/scaffold.css ¶ -6

               body { background-color: #fff; color: #333; }
-            - div.usermenu {
-            -   border-top: thin solid grey;
-            -   border-bottom: thin solid grey;
-            -   text-align: right
-            - }
               body, p, ol, ul, td {
                 font-family: verdana, arial, helvetica, sans-serif;
                 font-size:   13px;
                 line-height: 18px;
               }

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r57:45a526b9fbd3 - Mon, 17 Mar 2008 18:48:17 - 9 files changed: 45 inserted, 54 deleted

Sign in to your account

Commit r57:45a526b9fbd3 public

Author

r57:45a526b9fbd3 - Mon, 17 Mar 2008 18:48:17 - 9 files changed: 45 inserted, 54 deleted

Commit `r57:45a526b9fbd3` public