Description:
front page OK
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r747:c37b8f654c0b - - 2 files changed: 58 inserted, 15 deleted
| @@ -7,7 +7,7 | |||
|
|
7 | 7 | %span.icon-bar |
|
|
8 | 8 | %span.icon-bar |
|
|
9 | 9 | %span.icon-bar |
|
|
10 |
- %a.navbar-brand{href: |
|
|
|
10 | + %a.navbar-brand{href: list_main_path} | |
|
|
11 | 11 | %span.glyphicon.glyphicon-home |
|
|
12 | 12 | MAIN |
|
|
13 | 13 | .collapse.navbar-collapse#navbar-collapse |
| @@ -72,7 +72,7 | |||
|
|
72 | 72 | |
|
|
73 | 73 | %ul.nav.navbar-nav.navbar-right |
|
|
74 | 74 | = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help') |
|
|
75 |
- = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', ' |
|
|
|
75 | + = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}}) | |
|
|
76 | 76 | - if GraderConfiguration['system.user_setting_enabled'] |
|
|
77 | 77 | = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}}) |
|
|
78 | 78 | = 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'}}) |
| @@ -12,6 +12,14 | |||
|
|
12 | 12 | |
|
|
13 | 13 | resources :sites |
|
|
14 | 14 | |
|
|
15 | + resources :test | |
|
|
16 | + | |
|
|
17 | + resources :messages do | |
|
|
18 | + collection do | |
|
|
19 | + get 'console' | |
|
|
20 | + end | |
|
|
21 | + end | |
|
|
22 | + | |
|
|
15 | 23 | resources :announcements do |
|
|
16 | 24 | member do |
|
|
17 | 25 | get 'toggle','toggle_front' |
| @@ -80,22 +88,57 | |||
|
|
80 | 88 | end |
|
|
81 | 89 | |
|
|
82 | 90 | |
|
|
91 | + #user admin | |
|
|
92 | + resources :user_admin do | |
|
|
93 | + collection do | |
|
|
94 | + get 'bulk_manage', as: 'bulk_manage_user_admin' | |
|
|
95 | + delete ':id', to: 'user_admin#destroy', as: 'user_admin_destroy' | |
|
|
96 | + get 'user_stat' | |
|
|
97 | + end | |
|
|
98 | + end | |
|
|
83 | 99 | |
|
|
84 | - #main | |
|
|
85 | - get "main/list" | |
|
|
86 | - get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission' | |
|
|
100 | + resources :contest_management, only: [:index] do | |
|
|
101 | + collection do | |
|
|
102 | + get 'user_stat' | |
|
|
103 | + get 'clear_stat' | |
|
|
104 | + get 'clear_all_stat' | |
|
|
105 | + end | |
|
|
106 | + end | |
|
|
107 | + | |
|
|
108 | + #get 'user_admin', to: 'user_admin#index' | |
|
|
109 | + #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin' | |
|
|
110 | + #post 'user_admin', to: 'user_admin#create' | |
|
|
111 | + #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy' | |
|
|
87 | 112 | |
|
|
88 | - #user admin | |
|
|
89 | - get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin' | |
|
|
90 | - post 'user_admin', to: 'user_admin#create' | |
|
|
91 | - delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy' | |
|
|
92 | - | |
|
|
113 | + #singular resource | |
|
|
114 | + #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly | |
|
|
93 | 115 | #report |
|
|
94 | - get 'report/current_score', to: 'report#current_score', as: 'report_current_score' | |
|
|
95 | - get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof' | |
|
|
96 | - get "report/login" | |
|
|
97 | - get 'report/max_score', to: 'report#max_score', as: 'report_max_score' | |
|
|
98 | - post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score' | |
|
|
116 | + resource :report, only: [], controller: 'report' do | |
|
|
117 | + get 'login' | |
|
|
118 | + get 'multiple_login' | |
|
|
119 | + get 'problem_hof/:id', action: 'problem_hof' | |
|
|
120 | + get 'current_score' | |
|
|
121 | + get 'max_score' | |
|
|
122 | + post 'show_max_score' | |
|
|
123 | + end | |
|
|
124 | + #get 'report/current_score', to: 'report#current_score', as: 'report_current_score' | |
|
|
125 | + #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof' | |
|
|
126 | + #get "report/login" | |
|
|
127 | + #get 'report/max_score', to: 'report#max_score', as: 'report_max_score' | |
|
|
128 | + #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score' | |
|
|
129 | + | |
|
|
130 | + resource :main, only: [], controller: 'main' do | |
|
|
131 | + get 'list' | |
|
|
132 | + get 'submission(/:id)', action: 'submission', as: 'main_submission' | |
|
|
133 | + post 'submit' | |
|
|
134 | + get 'announcements' | |
|
|
135 | + get 'help' | |
|
|
136 | + end | |
|
|
137 | + #main | |
|
|
138 | + #get "main/list" | |
|
|
139 | + #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission' | |
|
|
140 | + #post 'main/submit', to: 'main#submit' | |
|
|
141 | + #get 'main/announcements', to: 'main#announcements' | |
|
|
99 | 142 | |
|
|
100 | 143 | |
|
|
101 | 144 | # |
You need to be logged in to leave comments.
Login now