diff --git a/Project/php/templates/navBar.html b/Project/php/templates/navBar.html index 6faa02c..8b6aed2 100755 --- a/Project/php/templates/navBar.html +++ b/Project/php/templates/navBar.html @@ -1,33 +1,43 @@ - - - Logo - + + + + + + + In English Please ! + + + + + + + + + + + + + Logo + - Menu - - - - - {% if userRole == 'admin' %} - Groups - Users - {% elseif userRole == 'student' %} - Learn a lesson - Play - Create flashcards - {% elseif userRole == 'teacher' %} - Learn a lesson - Play - Create flashcards - {% else %} - Login - {% endif %} - + Menu + + + + + Game + Download + My account + + - - - + + + diff --git a/Project/php/templates/navBar.twig b/Project/php/templates/navBar.twig index af7a3f3..9f1343c 100755 --- a/Project/php/templates/navBar.twig +++ b/Project/php/templates/navBar.twig @@ -9,20 +9,27 @@ - {% if userRole == 'admin' %} - Groups - Users - {% elseif userRole == 'student' %} - Learn a lesson - Play - Create flashcards - {% elseif userRole == 'teacher' %} - Learn a lesson - Play - Create flashcards - {% else %} - Login + {% if 'admin' in userRole %} + Groups + Users + My account {% endif %} + {% if 'student' in userRole%} + Learn a lesson + Play + Create flashcards + My account + {% endif %} + {% if 'teacher' in userRole%} + Vocabulary + Play + Create flashcards + My account + {% endif %} + {% if userRole is empty %} + Login + {% endif %} + Log out