cafe-grader-web Commit - r190:27e07d862fff

cafe-grader-web

Commit `r190:27e07d862fff` public

parent | child

Description:

MERGED change set 372:399 from ytopc08-2 branch git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@401 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

r190:27e07d862fff - Wed, 20 May 2009 19:07:05 - 9 files changed: 181 inserted, 57 deleted

app/views/user_admin/active.html.haml created 644 ¶ +19

			@@ -0,0 +1,19
		1	+ %h1 Active users
		2	+
		3	+ %i
		4	+ I.e., those users that interacts with the system with in the last 60 minutes.
		5	+ %br/
		6	+
		7	+ = link_to '[go back to index]', :action => 'index'
		8	+
		9	+ %table
		10	+ %tr
		11	+ %th #
		12	+ %th login
		13	+ %th full name
		14	+ - counter = 0
		15	+ - for user in @users
		16	+ %tr
		17	+ %td= counter += 1
		18	+ %td= user.login
		19	+ %td= user.full_name

app/controllers/user_admin_controller.rb ¶ +10

                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                 end
+            +   def active
+            +     sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
+            +     @users = []
+            +     sessions.each do |session|
+            +       if session.data[:user_id]
+            +         @users << User.find(session.data[:user_id])
+            +       end
+            +     end
+            +   end
+            +
                 def show
                   @user = User.find(params[:id])
                 end

app/models/user.rb ¶ +3

                     begin
                       if self.site==nil
                         self.site = Site.find_by_name('default')
+            +           if self.site==nil
+            +             self.site = Site.find(1)  # when 'default has be renamed'
+            +           end
                       end
                     rescue
                     end

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

                   %b= flash[:notice]
                   %hr/
-            -   %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
+            +   %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
                   - form_tag :controller => 'login', :action => 'login' do
                     %table
                       %tr

app/views/test/_test_request.html.haml ¶ +4 -1

                   - else
                     (n/a)
                 %td{:align => "center"}
-            -     = test_request.submission.number
+            +     - if test_request.submission
+            +       = test_request.submission.number
+            +     - else
+            +       n/a
                 %td{:align => "center"}
                   = test_request.status_str
                 %td{:align => "center"}

app/views/user_admin/list.rhtml ¶ +6

               <% form_tag({:action => 'import'}, :multipart => true) do %>
                 File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
               <% end %>
+            + <br/>
+            + <b>What else: </b>
+            + <%= link_to '[New user]', :action => 'new' %>
+            + <%= link_to '[New list of users]', :action => 'new_list' %>
+            + <%= link_to '[View active users]', :action => 'active' %>
               </div>
+            +
               <table>
                 <tr>
                 <% for column in User.content_columns %>

config/locales/th.rb ¶ +20

+            + # Thai translation for Ruby on Rails
+            + # original by Prem Sichanugrist (s@sikachu.com/sikandsak@gmail.com)
+            + # activerecord keys fixed by Jittat Fakcharoenphol (jittat@gmail.com)
+            +
               {
                 :'th' => {
                   :date => {
                         :format => '%n %u'
                       }
                     },
+            +       :human => {
+            +         :format => {
+            +           :precision => 1,
+            +           :delimiter => ''
+            +         },
+            +        :storage_units => {
+            +          :format => "%n %u",
+            +          :units => {
+            +            :byte => "B",
+            +            :kb   => "KB",
+            +            :mb   => "MB",
+            +            :gb   => "GB",
+            +            :tb   => "TB",
+            +          }
+            +        }
+            +       },
                   },
                   # Active Record

db/migrate/20081215012843_change_user_login_string_limit.rb ¶ +1 -1

                 end
                 def self.down
-            -     execute "ALTER TABLE `users` CHANGE `login` `login` VARCHAR( 10 )"
+            +     # don't have to revert
                 end
               end

public/stylesheets/application.css ¶ +117 -54

-            - /* Normal text */
+            + /* Main Default */
               body {
+            +     background: white url(../images/topbg.jpg) repeat-x top center;
                   font-size: 13px;
-            -     font-family: "Sans Serif";
+            +     font-family: Tahoma, "sans-serif";
+            +     margin: 10px;
+            +     padding: 10px;
+            + }
+            +
+            + /* Form Font */
+            + input {
+            +     font-family: Tahoma, "sans-serif";
+            + }
+            +
+            + /* Heading 1/2 */
+            + h1 {
+            +     font-size: 24px;
+            +     color: #334488;
+            +     line-height: 2em;
+            + }
+            +
+            + h2 {
+            +     font-size: 18px;
+            +     color: #5566bb;
+            +     line-height: 1.5em;
+            + }
+            +
+            + /* Bar Line Color and Thickness */
+            + hr {
+            +     border-top: 1px solid #dddddd;
+            +     border-bottom: 1px solid #eeeeee;
+            + }
+            +
+            + /* Link + Anchor Color */
+            + a, a:link, a:visited {
+            +     color: #6666cc;
+            +     text-decoration: none;
+            + }
+            +
+            + a:hover, a:focus {
+            +     color: #111166;
+            +     text-decoration: none;
               }
               /* This is the main menu bad*/
               div.userbar {
-            -     border-top: thin solid grey;
-            -     border-bottom: thin solid grey;
+            +     line-height: 1.5em;
                   text-align: right;
                   font-size: 12px;
               }
               /* This is the top bar, displaying user's full name */
               div.title {
-            -     font-size: 12px;
-            -     background: #ddffdd;
-            -     border: 1px solid black;
-            -     padding: 2px;
-            -     margin-top: 3px;
-            -     margin-bottom: 5px;
+            +     // background: #ddddff;
+            +     // border: 1px dashed blue;
+            +     padding: 10px 0px;
+            +     line-height: 1.5em;
+            +     font-size: 13px;
               }
               div.title span.contest-over-msg {
                   font-size: 15px;
                   color: red;
-            -     font-weight: bold;
               }
               div.title table {
               div.title td.left-col {
                   text-align: left;
                   vertical-align: top;
+            +     color: #444444;
               }
               div.title td.right-col {
                   text-align: right;
                   vertical-align: top;
+            +     font-size: 14px;
+            +     font-weight: bold;
+            +     color: #116699;
               }
               /* Standard table with header and rows with alternating background */
               table.info {
-            -     border: 1px solid black;
+            +     margin: 10px 0;
+            +     border: 1px solid #666666;
                   border-collapse: collapse;
                   font-size: 12px;
               }
               table.info th {
-            -     border: 1px solid black;
+            +     border: 1px solid #666666;
+            +     line-height: 1.5em;
+            +     padding: 0 0.5em;
               }
               table.info td {
-            -     border-left: 1px solid black;
-            -     border-right: 1px solid black;
+            +     border-left: 1px solid #666666;
+            +     border-right: 1px solid #666666;
+            +     line-height: 1.5em;
+            +     padding: 0 0.5em;
               }
               tr.info-head {
               }
               tr.info-odd {
-            -     background: #dddddd;
+            +     background: #eeeeee;
               }
               tr.info-even {
-            -     background: #f0f0f0;
+            +     background: #f9f9f9;
               }
               /*******************************
                [Main]
               ********************************/
               div.submitbox {
-            -     border: thin solid black;
+            +     background: #eeeeff;
+            +     border: 1px dotted #99aaee;
                   padding: 5px;
-            -     color: white;
-            -     background-color: #777777;
+            +     margin: 10px 0px;
+            +     color: black;
                   font-weight: bold;
                   font-size: 13px;
               }
               div.errorExplanation {
-            -     border: 1px dashed black;
-            -     color: black;
-            -     padding: 5px;
+            +     border: 1px dotted gray;
+            +     color: #bb2222;
+            +     padding: 5px 15px 5px 15px;
                   margin-bottom: 5px;
                   background-color: white;
               }
               div.task-menu {
                   text-align: center;
                   font-size: 13px;
+            +     line-height: 1.75em;
                   font-weight: bold;
-            -     border-top: 1px solid black;
-            -     border-bottom: 1px solid black;
+            +     border-top: 1px dashed gray;
+            +     border-bottom: 1px dashed gray;
                   margin-top: 2px;
                   margin-bottom: 4px;
               }
                [Submission]
               ********************************/
               table.taskdesc {
-            -     border: 1px solid black;
+            +     border: 2px solid #dddddd;
                   border-collapse: collapse;
-            -     width: 95%;
+            +     margin: 10px auto;
+            +     width: 90%;
                   font-size: 13px;
               }
               }
               table.taskdesc tr.name {
-            -     border: 1px solid black;
-            -     background: #aaaaaa;
-            -     color: white;
+            +     border: 2px solid #dddddd;
+            +     background: #dddddd;
+            +     color: #333333;
                   font-weight: bold;
                   font-size: 14px;
+            +     line-height: 1.5em;
                   text-align: center;
               }
               }
               /**********************
-            -  [Announcement]
+            +    Announcement
               ***********************/
               div.announcementbox {
-            -     margin-top: 10px;
-            -     margin-bottom: 10px;
-            -     background: green;
+            +     margin: 10px 0px;
+            +     background: #bbddee;
                   padding: 1px;
               }
               div.announcementbox span.title {
                   font-weight: bold;
-            -     color: white;
+            +     color: #224455;
                   padding-left: 10px;
+            +     line-height: 1.6em;
               }
               div.announcement {
               }
               /******************
-            -   [Messages
+            +    Messages
               ******************/
               div.message {
-            -     padding-top: 5px;
-            -     padding-left: 10px;
+            +     margin: 10px 0 0;
+            + }
+            +
+            + div.message div.message {
+            +     margin: 0 0 0 30px;
               }
               div.message div.body {
-            -     border: 1px solid green;
-            -     background: #eeffee;
+            +     border: 2px solid #dddddd;
+            +     background: #fff8f8;
                   padding-left: 5px;
               }
               div.message div.reply-body {
-            -     border: 1px solid black;
-            -     background: #ffeeee;
+            +     border: 2px solid #bbbbbb;
+            +     background: #fffff8;
                   padding-left: 5px;
               }
               div.message div.stat {
                   font-size: 10px;
-            -     color: white;
-            -     background: green;
+            +     line-height: 1.75em;
+            +     padding: 0 5px;
+            +     color: #333333;
+            +     background: #dddddd;
+            +     font-weight: bold;
+            + }
+            +
+            + div.message div.message div.stat {
+            +     font-size: 10px;
+            +     line-height: 1.75em;
+            +     padding: 0 5px;
+            +     color: #444444;
+            +     background: #bbbbbb;
                   font-weight: bold;
               }
               ********************/
               div.contest-title {
                   color: white;
-            -     background: #007700;
                   text-align: center;
-            -     padding: 5px;
+            +     line-height: 2em;
               }
               div.registration-desc {
-            -     margin-top: 5px;
-            -     margin-bottom: 5px;
-            -     border: solid 1px gray;
-            -     padding: 10px;
-            -     background: #f0f0f0;
+            +     border: 1px dotted gray;
+            +     background: #f5f5f5;
+            +     padding: 5px;
+            +     margin: 10px 0;
+            +     font-size: 12px;
+            +     line-height: 1.5em;
               }
               /********************
               ********************/
               div.test-desc {
-            -     border: solid 1px gray;
-            -     background: #f0f0f0;
+            +     border: 1px dotted gray;
+            +     background: #f5f5f5;
                   padding: 5px;
+            +     margin: 10px 0;
                   font-size: 12px;
-            -     margin-bottom: 5px;
+            +     line-height: 1.5em;
               }

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

r190:27e07d862fff - Wed, 20 May 2009 19:07:05 - 9 files changed: 181 inserted, 57 deleted

Sign in to your account

Commit r190:27e07d862fff public

Author

r190:27e07d862fff - Wed, 20 May 2009 19:07:05 - 9 files changed: 181 inserted, 57 deleted

Commit `r190:27e07d862fff` public