Description:
disabled unused menu items
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r231:4f0fc6ead86a - - 1 file changed: 3 inserted, 3 deleted
@@ -5,52 +5,52 | |||||
|
5 | menu_items = '' |
|
5 | menu_items = '' |
|
6 | user = User.find(session[:user_id]) |
|
6 | user = User.find(session[:user_id]) |
|
7 |
|
7 | ||
|
8 | if (user!=nil) and (session[:admin]) |
|
8 | if (user!=nil) and (session[:admin]) |
|
9 | # admin menu |
|
9 | # admin menu |
|
10 | menu_items << "<b>Administrative task:</b> " |
|
10 | menu_items << "<b>Administrative task:</b> " |
|
11 | append_to menu_items, '[Announcements]', 'announcements', 'index' |
|
11 | append_to menu_items, '[Announcements]', 'announcements', 'index' |
|
12 | append_to menu_items, '[Msg console]', 'messages', 'console' |
|
12 | append_to menu_items, '[Msg console]', 'messages', 'console' |
|
13 | append_to menu_items, '[Problems]', 'problems', 'index' |
|
13 | append_to menu_items, '[Problems]', 'problems', 'index' |
|
14 | append_to menu_items, '[Users]', 'user_admin', 'index' |
|
14 | append_to menu_items, '[Users]', 'user_admin', 'index' |
|
15 | append_to menu_items, '[Results]', 'user_admin', 'user_stat' |
|
15 | append_to menu_items, '[Results]', 'user_admin', 'user_stat' |
|
16 | append_to menu_items, '[Graders]', 'graders', 'list' |
|
16 | append_to menu_items, '[Graders]', 'graders', 'list' |
|
17 | append_to menu_items, '[Contests]', 'contests', 'index' |
|
17 | append_to menu_items, '[Contests]', 'contests', 'index' |
|
18 | append_to menu_items, '[Sites]', 'sites', 'index' |
|
18 | append_to menu_items, '[Sites]', 'sites', 'index' |
|
19 | append_to menu_items, '[System config]', 'configurations', 'index' |
|
19 | append_to menu_items, '[System config]', 'configurations', 'index' |
|
20 | menu_items << "<br/>" |
|
20 | menu_items << "<br/>" |
|
21 | end |
|
21 | end |
|
22 |
|
22 | ||
|
23 | # main page |
|
23 | # main page |
|
24 | append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list' |
|
24 | append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list' |
|
25 | append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list' |
|
25 | append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list' |
|
26 |
|
26 | ||
|
27 | if (user!=nil) and (Configuration.show_tasks_to?(user)) |
|
27 | if (user!=nil) and (Configuration.show_tasks_to?(user)) |
|
28 | append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list' |
|
28 | append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list' |
|
29 | - append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission' |
|
29 | + #append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission' |
|
30 | - append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index' |
|
30 | + #append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index' |
|
31 | end |
|
31 | end |
|
32 | - append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help' |
|
32 | + #append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help' |
|
33 |
|
33 | ||
|
34 | if Configuration['system.user_setting_enabled'] |
|
34 | if Configuration['system.user_setting_enabled'] |
|
35 | append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index' |
|
35 | append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index' |
|
36 | end |
|
36 | end |
|
37 | append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login' |
|
37 | append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login' |
|
38 |
|
38 | ||
|
39 | menu_items |
|
39 | menu_items |
|
40 | end |
|
40 | end |
|
41 |
|
41 | ||
|
42 | def append_to(option,label, controller, action) |
|
42 | def append_to(option,label, controller, action) |
|
43 | option << ' ' if option!='' |
|
43 | option << ' ' if option!='' |
|
44 | option << link_to_unless_current(label, |
|
44 | option << link_to_unless_current(label, |
|
45 | :controller => controller, |
|
45 | :controller => controller, |
|
46 | :action => action) |
|
46 | :action => action) |
|
47 | end |
|
47 | end |
|
48 |
|
48 | ||
|
49 | def format_short_time(time) |
|
49 | def format_short_time(time) |
|
50 | now = Time.now.gmtime |
|
50 | now = Time.now.gmtime |
|
51 | st = '' |
|
51 | st = '' |
|
52 | if (time.yday != now.yday) or |
|
52 | if (time.yday != now.yday) or |
|
53 | (time.year != now.year) |
|
53 | (time.year != now.year) |
|
54 | st = time.strftime("%x ") |
|
54 | st = time.strftime("%x ") |
|
55 | end |
|
55 | end |
|
56 | st + time.strftime("%X") |
|
56 | st + time.strftime("%X") |
You need to be logged in to leave comments.
Login now