cafe-grader-web Commit - r553:d50bf0fc7252

cafe-grader-web

Commit `r553:d50bf0fc7252` public

parent | child

Description:

bootstrap navbar

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

r553:d50bf0fc7252 - Sat, 06 Feb 2016 19:11:17 - 4 files changed: 74 inserted, 59 deleted

app/assets/stylesheets/application.css.sass ¶ +20

+            + /*
+            +  * 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
+            +  */
+            +
               @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"
+            + .secondnavbar
+            +   top: 50px
+            +
               body
                 background: white image-url("topbg.jpg") repeat-x top center
                 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
                   font-size: 13px
                   span.contest-over-msg
                     font-size: 15px
                     color: red
                   table
                     width: 100%
                     font-weight: bold
                   td
                     &.left-col
                       text-align: left
                       vertical-align: top
                       color: #444444
                     &.right-col
                       text-align: right
                       vertical-align: top
                       font-size: 18px
                       color: #116699
               table.info
                 margin: 10px 0
                 border: 1px solid #666666
                 border-collapse: collapse
                 font-size: 12px
                 th
                   border: 1px solid #666666
                   line-height: 1.5em
                   padding: 0 0.5em
                 td
                   border-left: 1px solid #666666
                   border-right: 1px solid #666666
                   line-height: 1.5em
                   padding: 0 0.5em
               tr
                 &.info-head
                   background: #777777
                   color: white
                 &.info-odd
                   background: #eeeeee
                 &.info-even
                   background: #fcfcfc
               =basicbox
                 background: #eeeeff
                 border: 1px dotted #99aaee
                 padding: 5px
                 margin: 10px 0px
                 color: black
                 font-size: 13px
               .infobox
                 +basicbox
               .submitbox
                 +basicbox
               .errorExplanation
                 border: 1px dotted gray
                 color: #bb2222
                 padding: 5px 15px 5px 15px
                 margin-bottom: 5px
                 background-color: white
                 font-weight: normal
                 h2
                   color: #cc1111
                   font-weight: bold
               table.uinfo
                 border-collapse: collapse
                 border: 1px solid black
                 font-size: 13px
               td.uinfo
                 vertical-align: top
                 border: 1px solid black
                 padding: 5px
               th.uinfo
                 background: lightgreen
                 vertical-align: top
                 text-align: right
                 border: 1px solid black
                 padding: 5px
               div
                 &.compilermsgbody
                   font-family: monospace
                 &.task-menu
                   text-align: center
                   font-size: 13px
                   line-height: 1.75em
                   font-weight: bold
                   border-top: 1px dashed gray
                   border-bottom: 1px dashed gray
                   margin-top: 2px
                   margin-bottom: 4px
               table.taskdesc
                 border: 2px solid #dddddd
                 border-collapse: collapse
                 margin: 10px auto
                 width: 90%
                 font-size: 13px
                 p
                   font-size: 13px
                 tr.name
                   border: 2px solid #dddddd
                   background: #dddddd
                   color: #333333
                   font-weight: bold
                   font-size: 14px
                   line-height: 1.5em
                   text-align: center
                 td
                   &.desc-odd
                     padding: 5px
                     padding-left: 20px
                     background: #fefeee
                   &.desc-even
                     padding: 5px
                     padding-left: 20px
                     background: #feeefe
               .announcementbox
                 margin: 10px 0px
                 background: #bbddee
                 padding: 1px
                 span.title
                   font-weight: bold
                   color: #224455
                   padding-left: 10px
                   line-height: 1.6em
               .announcement
                 margin: 2px
                 background: white
                 padding: 1px
                 padding-left: 10px
                 padding-right: 10px
                 padding-top: 5px
                 padding-bottom: 5px
               .announcement p
                 font-size: 12px
                 margin: 2px
               .pub-info
                 text-align: right
                 font-style: italic
                 font-size: 9px
                 p
                   text-align: right
                   font-style: italic
                   font-size: 9px
               .announcement
                 .toggles
                   font-weight: normal
                   float: right
                   font-size: 80%
                 .announcement-title
                   font-weight: bold
               div
                 &.message
                   margin: 10px 0 0
                   div
                     &.message
                       margin: 0 0 0 30px
                     &.body
                       border: 2px solid #dddddd
                       background: #fff8f8
                       padding-left: 5px
                     &.reply-body
                       border: 2px solid #bbbbbb
                       background: #fffff8
                       padding-left: 5px
                     &.stat
                       font-size: 10px
                       line-height: 1.75em
                       padding: 0 5px
                       color: #333333
                       background: #dddddd
                       font-weight: bold
                     &.message div.stat
                       font-size: 10px
                       line-height: 1.75em
                       padding: 0 5px
                       color: #444444
                       background: #bbbbbb
                       font-weight: bold
                 &.contest-title
                   color: white
                   text-align: center
                   line-height: 2em
                 &.registration-desc, &.test-desc
                   border: 1px dotted gray
                   background: #f5f5f5
                   padding: 5px
                   margin: 10px 0
                   font-size: 12px
                   line-height: 1.5em
               h2.contest-title
                 margin-top: 5px
                 margin-bottom: 5px

app/helpers/application_helper.rb ¶ +32

               # 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')
+            +     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')
+            +     end
+            +     right_menu << add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{I18n.t 'menu.log_out'}".html_safe, 'main', 'login',)
+            +
+            +     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
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if GraderConfiguration.time_limit_mode?
                     if user.contest_finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
                   if GraderConfiguration.analysis_mode?
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
                   contest_name = GraderConfiguration['contest.name']
                   #
                   # build real title bar
                   result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
               #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)
                   markdown.to_html.html_safe
                 end
               end

app/views/layouts/application.html.haml ¶ +17 -5

               <!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
-            - %div.userbar
+            +     .container-fluid
-            -   = user_header
+            +       .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
-            - = content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil
+            +   %div.userbar
-            - = yield
+            +     = user_header
+            +   = content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil
+            +   = yield
+            +

config/routes.rb ¶ +5 -54

@@ -1,74 +1,25
1	CafeGrader::Application.routes.draw do	1	CafeGrader::Application.routes.draw do
		2	+ root :to => 'main#login'
		3	+
2	get "report/login"	4	get "report/login"
3		5
4	resources :contests	6	resources :contests
5		7
6	resources :announcements	8	resources :announcements
7	resources :sites	9	resources :sites
8		10
9	resources :grader_configuration, controller: 'configurations'	11	resources :grader_configuration, controller: 'configurations'
10		12
11	- # The priority is based upon order of creation:
12	- # first created -> highest priority.
13	-
14	- # Sample of regular route:
15	- # match 'products/:id' => 'catalog#view'
16	- # Keep in mind you can assign values other than :controller and :action
17	-
18	- # Sample of named route:
19	- # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
20	- # This route can be invoked with purchase_url(:id => product.id)
21	-
22	- # Sample resource route (maps HTTP verbs to controller actions automatically):
23	- # resources :products
24	-
25	- # Sample resource route with options:
26	- # resources :products do
27	- # member do
28	- # get 'short'
29	- # post 'toggle'
30	- # end
31	- #
32	- # collection do
33	- # get 'sold'
34	- # end
35	- # end
36	-
37	- # Sample resource route with sub-resources:
38	- # resources :products do
39	- # resources :comments, :sales
40	- # resource :seller
41	- # end
42	-
43	- # Sample resource route with more complex sub-resources
44	- # resources :products do
45	- # resources :comments
46	- # resources :sales do
47	- # get 'recent', :on => :collection
48	- # end
49	- # end
50	-
51	- # Sample resource route within a namespace:
52	- # namespace :admin do
53	- # # Directs /admin/products/* to Admin::ProductsController
54	- # # (app/controllers/admin/products_controller.rb)
55	- # resources :products
56	- # end
57	-
58	- # You can have the root of your site routed with "root"
59	- # just remember to delete public/index.html.
60	- # root :to => 'welcome#index'
61	-
62	- root :to => 'main#login'
63	-
64	match 'tasks/view/:file.:ext' => 'tasks#view'	13	match 'tasks/view/:file.:ext' => 'tasks#view'
65	match 'tasks/download/:id/:file.:ext' => 'tasks#download'	14	match 'tasks/download/:id/:file.:ext' => 'tasks#download'
		15	+ match 'heartbeat/:id/edit' => 'heartbeat#edit'
66		16
67	- match 'heartbeat/:id/edit' => 'heartbeat#edit'	17	+ #main
		18	+ get "main/list"
68		19
69	# See how all your routes lay out with "rake routes"	20	# See how all your routes lay out with "rake routes"
70		21
71	# This is a legacy wild controller route that's not recommended for RESTful applications.	22	# This is a legacy wild controller route that's not recommended for RESTful applications.
72	# Note: This route will make all actions in every controller accessible via GET requests.	23	# Note: This route will make all actions in every controller accessible via GET requests.
73	match ':controller(/:action(/:id))(.:format)'	24	match ':controller(/:action(/:id))(.:format)'
74	end	25	end

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

r553:d50bf0fc7252 - Sat, 06 Feb 2016 19:11:17 - 4 files changed: 74 inserted, 59 deleted

Sign in to your account

Commit r553:d50bf0fc7252 public

Author

r553:d50bf0fc7252 - Sat, 06 Feb 2016 19:11:17 - 4 files changed: 74 inserted, 59 deleted

Commit `r553:d50bf0fc7252` public