cafe-grader-web Commit - r78:822d6c35aada

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

               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
+            +
+            +   def user_title_bar(user)
+            +     <<TITLEBAR
+            + <div class="title">
+            + <table>
+            + <tr>
+            + <td class="left-col">
+            + #{user.full_name}<br/>
+            + Current time is #{format_short_time(Time.new)}<br/>
+            + </td>
+            + <td class="right-col">APIO'08</td>
+            + </tr>
+            + </table>
+            + </div>
+            + TITLEBAR
+            +   end
+            +
               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
-            -   Hello
-            -   =h @user.full_name
+            -
-            - Current time is
-            - = format_short_time(Time.new)
-            - %br/
+            + = user_title_bar(@user)
               .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

                   text-align: right;
                   font-size: 12px;
               }
               /* This is the top bar, displaying user's full name */
               div.title {
-            -     font-size: 20px;
-            -     font-weight: bold;
-            -     background: lightgreen;
+            +     font-size: 12px;
+            +     background: #ddffdd;
+            +     border: 1px solid black;
                   padding: 2px;
+            +     margin-top: 3px;
+            +     margin-bottom: 5px;
+            + }
+            +
+            + div.title table {
+            +     width: 100%;
+            + }
+            +
+            + div.title td.left-col {
+            +     text-align: left;
+            +     vertical-align: top;
+            + }
+            +
+            + div.title td.right-col {
+            +     text-align: right;
+            +     vertical-align: top;
               }
               /* Standard table with header and rows with alternating background */
               table.info {
                   border: 1px solid black;
                   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

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