diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,25 +5,22 @@
menu_items = ''
user = User.find(session[:user_id])
+ if (user!=nil) and (user.admin?)
+ # admin menu
+ menu_items << "Administrative task: "
+ append_to menu_items, '[Problem admin]', 'problems', 'index'
+ append_to menu_items, '[User admin]', 'user_admin', 'index'
+ append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
+ #append_to menu_items, '[Graders]', 'graders', 'list'
+ append_to menu_items, '[Site config]', 'configurations', 'index'
+ menu_items << "
"
+ end
+
# main page
append_to menu_items, '[Main]', 'main', 'list'
append_to menu_items, '[Submissions]', 'main', 'submission'
append_to menu_items, '[Test]', 'test', 'index'
-
- # admin menu
- if (user!=nil) and (user.admin?)
- append_to menu_items, '[Problem admin]', 'problems', 'index'
- append_to menu_items, '[User admin]', 'user_admin', 'index'
- append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
- end
-
- # general options
append_to menu_items, '[Settings]', 'users', 'index'
-
- if (user!=nil) and (user.admin?)
- append_to menu_items, '[Site config]', 'configurations', 'index'
- end
-
append_to menu_items, '[Log out]', 'main', 'login'
menu_items