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: 89 inserted, 44 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

Gemfile.lock ¶ +3

                     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)
                 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

@@ -7,12 +7,20
7	// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the	7	// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8	// the compiled file.	8	// the compiled file.
9	//	9	//
10	// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD	10	// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
11	// GO AFTER THE REQUIRES BELOW.	11	// GO AFTER THE REQUIRES BELOW.
12	//	12	//
13	- //= require ~~prototype~~	13	+ //= require jquery
14	- //= require ~~prototype~~_ujs	14	+ //= require jquery_ujs
15	- //= require effects	15	+ //= require jquery.ui.all
16	- //= require dragdrop
17	- //= require controls
18	//= require bootstrap-sprockets	16	//= require bootstrap-sprockets
		17	+ //= require custom
		18	+ //= require select2
		19	+
		20	+
		21	+ // since this is after blank line, it is not downloaded
		22	+ //x= require prototype
		23	+ //x= require prototype_ujs
		24	+ //x= require effects
		25	+ //x= require dragdrop
		26	+ //x= require controls

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

                *
                * 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 .
+            +  // bootstrap says that we should not do this, but @import each file instead
-            -  *= require_self
+            +  #   *= 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-sprockets"
+            + @import bootstrap
-            - @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-size: 13px
-            -   font-family: Tahoma, "sans-serif"
+            +   //font-family: Tahoma, "sans-serif"
                 margin: 10px
                 padding: 10px
                 padding-top: 100px
               input

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?

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

                     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}

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

@@ -6,25 +6,10
6	= javascript_include_tag "application"	6	= javascript_include_tag "application"
7	= csrf_meta_tags	7	= csrf_meta_tags
8	= content_for :header	8	= content_for :header
9	= yield :head	9	= yield :head
10		10
11	%body	11	%body
12	- %nav.navbar.navbar-default.navbar-fixed-top	12	+ = render 'layouts/header'
13	- .container-fluid
14	- .navbar-header
15	- %a.navbar-brand{href: main_list_path} หน้าหลัก
16	- .collapse.navbar-collapse
17	- = navbar_user_header #call helper function
18	- %nav.navbar.navbar-default.navbar-fixed-top.navbar-inverse.secondnavbar
19	- .container-fluid
20	- .collapse.navbar-collapse
21	- %ul.nav.navbar-nav
22	- %li
23	- %a{href:'#'}hahaha
24	-
25	- %div.userbar
26	- = user_header
27		13
28	= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil	14	= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil
29	= yield	15	= yield
30	-

app/views/main/list.html.haml ¶ +4 -2

               - 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
+            +     %table.table.table-striped
+            +       %thead
                       %tr.info-head
-            -         %th
+            +           %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'}"

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: 89 inserted, 44 deleted

Sign in to your account

Commit r554:50143f71e61a public

Author

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

Commit `r554:50143f71e61a` public