cafe-grader-web Commit - r554:50143f71e61a

cafe-grader-web

Commit `r554:50143f71e61a` public

parent | child

Description:

use jquery by default

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r554:50143f71e61a - Sat, 27 Feb 2016 16:23:49 - 12 files changed: 95 inserted, 50 deleted

app/assets/javascripts/custom.js.coffee created 644 ¶ +2

			@@ -0,0 +1,2
		1	+ $ ->
		2	+ $(".select2").select2()

app/views/layouts/_header.html.haml created 644 ¶ +35

			@@ -0,0 +1,35
		1	+ %header.navbar.navbar-default.navbar-fixed-top
		2	+ %nav
		3	+ .container-fluid
		4	+ .navbar-header
		5	+ %a.navbar-brand{href: main_list_path} หน้าหลัก
		6	+ .collapse.navbar-collapse
		7	+ %ul.nav.navbar-nav
		8	+ - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
		9	+ = add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
		10	+ = add_menu("#{I18n.t 'menu.submissions'}", 'main', 'submission')
		11	+ = add_menu("#{I18n.t 'menu.test'}", 'test', 'index')
		12	+ - if GraderConfiguration['right.user_hall_of_fame']
		13	+ = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
		14	+ %ul.nav.navbar-nav.navbar-right
		15	+ = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
		16	+ = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
		17	+ - if GraderConfiguration['system.user_setting_enabled']
		18	+ = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
		19	+ = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
		20	+
		21	+ - if (@current_user!=nil) and (session[:admin])
		22	+ %nav.navbar.navbar-default.navbar-fixed-top.navbar-inverse.secondnavbar
		23	+ .container-fluid
		24	+ .collapse.navbar-collapse
		25	+ %ul.nav.navbar-nav
		26	+ = add_menu( '[Announcements]', 'announcements', 'index')
		27	+ = add_menu( '[Msg console]', 'messages', 'console')
		28	+ = add_menu( '[Problems]', 'problems', 'index')
		29	+ = add_menu( '[Users]', 'user_admin', 'index')
		30	+ = add_menu( '[Results]', 'user_admin', 'user_stat')
		31	+ = add_menu( '[Report]', 'report', 'multiple_login')
		32	+ = add_menu( '[Graders]', 'graders', 'list')
		33	+ = add_menu( '[Contests]', 'contest_management', 'index')
		34	+ = add_menu( '[Sites]', 'sites', 'index')
		35	+ = add_menu( '[System config]', 'configurations', 'index')

app/views/main/_submission_box.html.haml created 644 ¶ +6

			@@ -0,0 +1,6
		1	+ = form_tag({:action => 'submit'}, :multipart => true) do
		2	+ %b Problem:
		3	+ = select 'submission', 'problem_id', [[(t 'main.specified_in_header'),'-1']] + @problems.collect {\|p\| [p.full_name, p.id]}, {:selected => '-1'}, { class: 'select2' }
		4	+ %b File:
		5	+ = file_field_tag 'file'
		6	+ = submit_tag 'Submit'

Gemfile ¶ +2

               source 'https://rubygems.org'
               gem 'rails', '3.2.21'
+            + gem 'select2-rails'
+            +
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails',   '~> 3.2.6'
                 gem 'coffee-rails', '~> 3.2.2'
                 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
                 # gem 'therubyracer', :platforms => :ruby
                 gem 'uglifier'
               end
               gem 'prototype-rails'
               # To use ActiveModel has_secure_password
               # gem 'bcrypt-ruby', '~> 3.0.0'
               # To use Jbuilder templates for JSON
               # gem 'jbuilder'
               # Use unicorn as the app server
               # gem 'unicorn'
               # Deploy with Capistrano
               # gem 'capistrano'
               # To use debugger
               # gem 'debugger'
               #
               #in-place editor
               gem 'best_in_place', '~> 3.0.1'
               # jquery addition
               gem 'jquery-rails'
               gem 'jquery-ui-sass-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               #syntax highlighter
               gem 'rouge'
               #add bootstrap

Gemfile.lock ¶ +3

                     rails (~> 3.2)
                   rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
                   rack-test (0.6.3)
                     rack (>= 1.0)
                   rails (3.2.21)
                     actionmailer (= 3.2.21)
                     actionpack (= 3.2.21)
                     activerecord (= 3.2.21)
                     activeresource (= 3.2.21)
                     activesupport (= 3.2.21)
                     bundler (~> 1.0)
                     railties (= 3.2.21)
                   railties (3.2.21)
                     actionpack (= 3.2.21)
                     activesupport (= 3.2.21)
                     rack-ssl (~> 1.3.2)
                     rake (>= 0.8.7)
                     rdoc (~> 3.4)
                     thor (>= 0.14.6, < 2.0)
                   rake (10.4.2)
                   rdiscount (2.1.8)
                   rdoc (3.12.2)
                     json (~> 1.4)
                   rouge (1.8.0)
                   rspec-collection_matchers (1.1.2)
                     rspec-expectations (>= 2.99.0.beta1)
                   rspec-core (2.99.2)
                   rspec-expectations (2.99.2)
                     diff-lcs (>= 1.1.3, < 2.0)
                   rspec-mocks (2.99.3)
                   rspec-rails (2.99.0)
                     actionpack (>= 3.0)
                     activemodel (>= 3.0)
                     activesupport (>= 3.0)
                     railties (>= 3.0)
                     rspec-collection_matchers
                     rspec-core (~> 2.99.0)
                     rspec-expectations (~> 2.99.0)
                     rspec-mocks (~> 2.99.0)
                   sass (3.4.11)
                   sass-rails (3.2.6)
                     railties (~> 3.2.0)
                     sass (>= 3.1.10)
                     tilt (~> 1.3)
+            +     select2-rails (4.0.1)
+            +       thor (~> 0.14)
                   sprockets (2.2.3)
                     hike (~> 1.2)
                     multi_json (~> 1.0)
                     rack (~> 1.0)
                     tilt (~> 1.1, != 1.3.0)
                   test-unit (3.0.9)
                     power_assert
                   thor (0.19.1)
                   tilt (1.4.1)
                   treetop (1.4.15)
                     polyglot
                     polyglot (>= 0.3.1)
                   tzinfo (0.3.43)
                   uglifier (2.7.0)
                     execjs (>= 0.3.0)
                     json (>= 1.8.0)
                   will_paginate (3.0.7)
               PLATFORMS
                 ruby
               DEPENDENCIES
                 autoprefixer-rails
                 best_in_place (~> 3.0.1)
                 bootstrap-sass (~> 3.2.0)
                 coffee-rails (~> 3.2.2)
                 dynamic_form
                 haml
                 in_place_editing
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
                 jquery-ui-sass-rails
                 mail
                 mysql2
                 prototype-rails
                 rails (= 3.2.21)
                 rdiscount
                 rouge
                 rspec-rails (~> 2.99.0)
                 sass-rails (~> 3.2.6)
+            +   select2-rails
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)

app/assets/javascripts/application.js ¶ +13 -5

               // This is a manifest file that'll be compiled into application.js, which will include all the files
               // listed below.
               //
               // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
               // or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
               //
               // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
               // the compiled file.
               //
               // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
               // GO AFTER THE REQUIRES BELOW.
               //
-            - //= require prototype
-            - //= require prototype_ujs
-            - //= require effects
-            - //= require dragdrop
-            - //= require controls
+            + //= require jquery
+            + //= require jquery_ujs
+            + //= require jquery.ui.all
               //= require bootstrap-sprockets
+            + //= require custom
+            + //= require select2
+            +
+            +
+            + // since this is after blank line, it is not downloaded
+            + //x= require prototype
+            + //x= require prototype_ujs
+            + //x= require effects
+            + //x= require dragdrop
+            + //x= require controls

app/assets/stylesheets/application.css.sass ¶ +11 -8

               /*
                * This is a manifest file that'll be compiled into application.css, which will include all the files
                * listed below.
                *
                * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
                * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
                *
                * You're free to add application-wide styles to this file and they'll appear at the bottom of the
                * compiled file so the styles you add here take precedence over styles defined in any styles
                * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
                * file per style scope.
                *
-            -  *= require_tree .
-            -  *= require_self
+            +  // bootstrap says that we should not do this, but @import each file instead
+            +  #   *= require_tree .
+            +  #   *= require_self
                */
+            -
+            + @import jquery.ui.all
+            + @import jquery.ui.core
               @import jquery.ui.core
               @import jquery.ui.theme
               @import jquery.ui.datepicker
               @import jquery.ui.slider
               @import jquery-ui-timepicker-addon
               @import jquery-tablesorter/theme.metro-dark
               @import tablesorter-theme.cafe
+            -
-            - @import "bootstrap-sprockets"
-            - @import "bootstrap"
+            + @import bootstrap-sprockets
+            + @import bootstrap
+            + @import select2
+            + @import select2-bootstrap
               .secondnavbar
                 top: 50px
               body
                 background: white image-url("topbg.jpg") repeat-x top center
-            -   font-size: 13px
-            -   font-family: Tahoma, "sans-serif"
+            +   //font-size: 13px
+            +   //font-family: Tahoma, "sans-serif"
                 margin: 10px
                 padding: 10px
                 padding-top: 100px
               input
                 font-family: Tahoma, "sans-serif"
               h1
                 font-size: 24px
                 color: #334488
                 line-height: 2em
               h2
                 font-size: 18px
                 color: #5566bb
                 line-height: 1.5em
               hr
                 border-top: 1px solid #dddddd
                 border-bottom: 1px solid #eeeeee
               a
                 color: #6666cc
                 text-decoration: none
                 &:link, &:visited
                   color: #6666cc
                   text-decoration: none
                 &:hover, &:focus
                   color: #111166
                   text-decoration: none
               div
                 &.userbar
                   line-height: 1.5em
                   text-align: right
                   font-size: 12px
                 &.title
                   padding: 10px 0px
                   line-height: 1.5em

app/controllers/application_controller.rb ¶ +7

               class ApplicationController < ActionController::Base
                 protect_from_forgery
+            +   before_filter :current_user
+            +
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
+            +   # Returns the current logged-in user (if any).
+            +   def current_user
+            +     @current_user ||= User.find(session[:user_id])
+            +   end
+            +
                 def admin_authorization
                   return false unless authenticate
                   user = User.find(session[:user_id], :include => ['roles'])
                   unless user.admin?
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login' unless user.admin?
                     return false
                   end
                   return true
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 protected
                 def authenticate
                   unless session[:user_id]
                     flash[:notice] = 'You need to login'
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       flash[:notice] = 'You need to login but you cannot log in at this time'
                     end
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find(session[:user_id])
                     if user==nil or (not user.admin?)
                       flash[:notice] = 'You cannot log in at this time'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     return true
                   end
                   if GraderConfiguration.multicontests?
                     user = User.find(session[:user_id])
                     return true if user.admin?
                     begin

app/helpers/application_helper.rb ¶ +5 -5

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def navbar_user_header
                   left_menu = ''
                   right_menu = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     left_menu << add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                     left_menu << add_menu("#{I18n.t 'menu.submissions'}", 'main', 'submission')
                     left_menu << add_menu("#{I18n.t 'menu.test'}", 'test', 'index')
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     left_menu << add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                   end
-            -     left_menu << add_menu("#{I18n.t 'menu.help'}", 'main', 'help')
+            -
-            -     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')} #{I18n.t 'menu.messages'}".html_safe, 'messages', 'list')
+            +     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
+            +     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                   if GraderConfiguration['system.user_setting_enabled']
-            -       right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')} #{I18n.t 'menu.settings'}".html_safe, 'users', 'index')
+            +       right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                   end
-            -     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{I18n.t 'menu.log_out'}".html_safe, 'main', 'login',)
+            +     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
+            +
                   result = content_tag(:ul,left_menu.html_safe,class: 'nav navbar-nav') + content_tag(:ul,right_menu.html_safe,class: 'nav navbar-nav navbar-right')
                 end
                 def add_menu(title, controller, action,html_option = {})
                   link_option = {controller: controller, action: action}
                   html_option[:class] = (html_option[:class] || '') + " active" if current_page?(link_option)
                   content_tag(:li, link_to(title,link_option),html_option)
                 end
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Report]', 'report', 'multiple_login'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end

app/views/layouts/application.html.haml ¶ +1 -16

               <!DOCTYPE html>
               %html
               %head
                 %title= GraderConfiguration['contest.name']
                 = stylesheet_link_tag "application", :media => "all"
                 = javascript_include_tag "application"
                 = csrf_meta_tags
                 = content_for :header
                 = yield :head
               %body
-            -   %nav.navbar.navbar-default.navbar-fixed-top
-            -     .container-fluid
-            -       .navbar-header
-            -         %a.navbar-brand{href: main_list_path} หน้าหลัก
-            -       .collapse.navbar-collapse
-            -         = navbar_user_header #call helper function
-            -   %nav.navbar.navbar-default.navbar-fixed-top.navbar-inverse.secondnavbar
-            -     .container-fluid
-            -       .collapse.navbar-collapse
-            -         %ul.nav.navbar-nav
-            -           %li
-            -             %a{href:'#'}hahaha
+            -
-            -   %div.userbar
-            -     = user_header
+            +   = render 'layouts/header'
                 = content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil
                 = yield
+            -

app/views/main/list.html.haml ¶ +10 -8

               - content_for :head do
                 = javascript_include_tag "announcement_refresh"
               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               - if GraderConfiguration.show_submitbox_to?(@user)
                 .submitbox
                   = error_messages_for 'submission'
                   = render :partial => 'submission_box'
               %hr/
               - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if GraderConfiguration.show_tasks_to?(@user)
                 - if not GraderConfiguration.multicontests?
-            -     %table.info
-            -       %tr.info-head
-            -         %th
-            -         %th Tasks name
-            -         %th Full name
-            -         %th # of sub(s)
-            -         %th Results
-            -       = render :partial => 'problem', :collection => @problems
+            +     %table.table.table-striped
+            +       %thead
+            +         %tr.info-head
+            +           %th #
+            +           %th Tasks name
+            +           %th Full name
+            +           %th # of sub(s)
+            +           %th Results
+            +       %tbody
+            +         = render :partial => 'problem', :collection => @problems
                 - else
                   - @contest_problems.each do |cp|
                     - if cp[:problems].length > 0
                       %h2{:class =>'contest-title'}
                         = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                       %table.info
                         %tr.info-head
                           %th
                           %th Tasks name
                           %th Full name
                           %th # of sub(s)
                           %th Results
                         = render :partial => 'problem', :collection => cp[:problems]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();

app/views/main/_submission_box.html.erb removed ¶ -8

deleted file

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

r554:50143f71e61a - Sat, 27 Feb 2016 16:23:49 - 12 files changed: 95 inserted, 50 deleted

Sign in to your account

Commit r554:50143f71e61a public

Author

r554:50143f71e61a - Sat, 27 Feb 2016 16:23:49 - 12 files changed: 95 inserted, 50 deleted

Commit `r554:50143f71e61a` public