cafe-grader-web Commit - r78:822d6c35aada

r78:822d6c35aada - Wed, 02 Apr 2008 15:42:27 - 12 files changed: 68 inserted, 45 deleted

app/views/main/list.html.haml created 644 ¶ +22

@@ -0,0 +1,22
	1	+ = user_title_bar(@user)
	2	+
	3	+ .submitbox
	4	+ = error_messages_for 'submission'
	5	+ = render :partial => 'submission_box'
	6	+
	7	+
	8	+ %hr/
	9	+
	10	+ %table.info
	11	+ %tr.info-head
	12	+ %th
	13	+ %th Tasks
	14	+ %th # of sub(s)
	15	+ %th Results
	16	+ = render :partial => 'problem', :collection => @problems
	17	+
	18	+ %hr
	19	+
	20	+ .submitbox
	21	+ = render :partial => 'submission_box'
	22	+

app/controllers/main_controller.rb ¶ -3

                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash[:notice] = saved_notice
-            -     @title = Configuration['ui.front.title']
-            -     @welcome = Configuration['ui.front.welcome_message']
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end

app/helpers/application_helper.rb ¶ +17

@@ -40,7 +40,24
40	(time.year != now.year)	40	(time.year != now.year)
41	st = time.strftime("%x ")	41	st = time.strftime("%x ")
42	end	42	end
43	st + time.strftime("%X")	43	st + time.strftime("%X")
44	end	44	end
45		45
		46	+
		47	+ def user_title_bar(user)
		48	+ <<TITLEBAR
		49	+ <div class="title">
		50	+ <table>
		51	+ <tr>
		52	+ <td class="left-col">
		53	+ #{user.full_name}<br/>
		54	+ Current time is #{format_short_time(Time.new)}<br/>
		55	+ </td>
		56	+ <td class="right-col">APIO'08</td>
		57	+ </tr>
		58	+ </table>
		59	+ </div>
		60	+ TITLEBAR
		61	+ end
		62	+
46	end	63	end

app/views/layouts/application.html.erb ¶ +1 -1

               <body>
               <div class="userbar">
               <%= user_header %>
               </div>
-            - <p style="color: green"><%= flash[:notice] %></p>
+            + <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
               <%= yield  %>
               </body>
               </html>

app/views/main/_submission.html.haml ¶ +1 -1

                 %td.info{:align => "center"}
                   = link_to('[load]',{:action => 'source', :id => submission.id})
                 %td.info
                   - if submission.graded_at!=nil
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
-            -       = "Score: #{submission.points} "
+            +       = "Score: #{submission.points} " if Configuration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td.info
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }

app/views/main/_submission_short.html.haml ¶ +1 -1

               - else
                 - if submission.graded_at==nil
                   Submitted at
                   = format_short_time(submission.submitted_at)
                 - else
                   = "Graded at #{format_short_time(submission.graded_at)}, "
-            -     = "score: #{submission.points} "
+            +     = "score: #{submission.points} " if Configuration['ui.show_score']
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   = " | "
                   = link_to('[msg]', {:action => 'compiler_msg', :id => submission.id}, {:popup => true})

app/views/main/login.rhtml ¶ +2 -2

-            - <h1><%= @title %></h1>
+            + <h1><%= Configuration['ui.front.title'] %></h1>
-            - <b><%= @welcome %></b><br/>
+            + <b><%= Configuration['ui.front.welcome_message'] %></b><br/>
               Please login to see the problem list.<br/><br/>
               <% if flash[:notice] %>
               <hr>
               <b><%= flash[:notice] %></b>
               <hr>

app/views/main/submission.html.haml ¶ +1 -7

-            - .title
+            + = user_title_bar(@user)
-            -   Hello
-            -   =h @user.full_name
-            - Current time is
-            - = format_short_time(Time.new)
-            - %br/
               .task-menu
                 Task List
                 %br/
                 - @problems.each do |problem|
                   = link_to problem.name, :action => 'submission', :id => problem.name

app/views/test/index.html.erb ¶ +2

+            + <%= user_title_bar(@user) %>
+            +
               <h2>Test Interface</h2>
               <% if @problems.length==0 %>
                 There is no submission
               <% else %>

app/views/users/index.html.haml ¶ +2 -1

               - content_for :head do
                 = javascript_include_tag :defaults
+            + = user_title_bar(@user)
+            +
               %h1 Your account settings
               %p
                 You can edit your alias and e-mails.  Just click on the text and edit it.

public/stylesheets/application.css ¶ +19 -3

@@ -10,16 +10,32
10	text-align: right;	10	text-align: right;
11	font-size: 12px;	11	font-size: 12px;
12	}	12	}
13		13
14	/* This is the top bar, displaying user's full name */	14	/* This is the top bar, displaying user's full name */
15	div.title {	15	div.title {
16	- font-size: 20px;	16	+ font-size: 12px;
17	- font-weight: bold;	17	+ background: #ddffdd;
18	- background: lightgreen;	18	+ border: 1px solid black;
19	padding: 2px;	19	padding: 2px;
		20	+ margin-top: 3px;
		21	+ margin-bottom: 5px;
		22	+ }
		23	+
		24	+ div.title table {
		25	+ width: 100%;
		26	+ }
		27	+
		28	+ div.title td.left-col {
		29	+ text-align: left;
		30	+ vertical-align: top;
		31	+ }
		32	+
		33	+ div.title td.right-col {
		34	+ text-align: right;
		35	+ vertical-align: top;
20	}	36	}
21		37
22	/* Standard table with header and rows with alternating background */	38	/* Standard table with header and rows with alternating background */
23	table.info {	39	table.info {
24	border: 1px solid black;	40	border: 1px solid black;
25	border-collapse: collapse;	41	border-collapse: collapse;

app/views/main/list.rhtml removed ¶ -26

deleted file

	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