diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index f823c095..8fbb8823 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -46,19 +46,6 @@ <%= group_view_by_menu_entry %> -
  • - - -
    • diff --git a/config/locales/en.yml b/config/locales/en.yml index f6907f02..98f7969f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -428,6 +428,7 @@ en: show_empty_containers_project: "Show empty projects" show_empty_containers_context: "Show empty contexts" show_empty_containers_title: "Show or hide the empty projects or contexts" + options: Options footer: send_feedback: Send feedback on %{version} sidebar: diff --git a/features/logging_in.feature b/features/logging_in.feature index 1962bf0e..ef74a8f7 100644 --- a/features/logging_in.feature +++ b/features/logging_in.feature @@ -31,24 +31,24 @@ Feature: Existing user logging in Examples: | page | next page | logout | - | home page | home page | Logout (Test User) | - | contexts page | contexts page | Logout (Test User) | - | projects page | projects page | Logout (Test User) | - | notes page | notes page | Logout (Test User) | - | recurring todos page | recurring todos page | Logout (Test User) | - | statistics page | statistics page | Logout (Test User) | - | manage users page | manage users page | 401 Unauthorized | - | integrations page | integrations page | Logout (Test User) | - | starred page | starred page | Logout (Test User) | - | tickler page | tickler page | Logout (Test User) | - | calendar page | calendar page | Logout (Test User) | - | feeds page | feeds page | Logout (Test User) | - | preference page | preference page | Logout (Test User) | - | export page | export page | Logout (Test User) | - | rest api docs page | rest api docs page | Logout (Test User) | - | search page | search page | Logout (Test User) | - | "top secret" project for user "testuser" | "top secret" project for user "testuser" | Logout (Test User) | - | context page for "@secret location" for user "testuser" | context page for "@secret location" for user "testuser" | Logout (Test User) | + | home page | home page | Logout | + | contexts page | contexts page | Logout | + | projects page | projects page | Logout | + | notes page | notes page | Logout | + | recurring todos page | recurring todos page | Logout | + | statistics page | statistics page | Logout | + | manage users page | manage users page | 401 Unauthorized | + | integrations page | integrations page | Logout | + | starred page | starred page | Logout | + | tickler page | tickler page | Logout | + | calendar page | calendar page | Logout | + | feeds page | feeds page | Logout | + | preference page | preference page | Logout | + | export page | export page | Logout | + | rest api docs page | rest api docs page | Logout | + | search page | search page | Logout | + | "top secret" project for user "testuser" | "top secret" project for user "testuser" | Logout | + | context page for "@secret location" for user "testuser" | context page for "@secret location" for user "testuser" | Logout | @javascript Scenario: When session expires, you should be logged out @@ -56,4 +56,4 @@ Feature: Existing user logging in And I submit the login form as user "testuser" with password "secret" Then I should be on the home page When my session expires - Then I should be on the login page \ No newline at end of file + Then I should be on the login page diff --git a/features/preferences.feature b/features/preferences.feature index 801b9b47..dddc2c0b 100644 --- a/features/preferences.feature +++ b/features/preferences.feature @@ -36,6 +36,6 @@ Feature: Manage preferences Scenario: I can edit preferences When I go to the preferences page - Then I should see "Logout (testuser)" + Then I should see "testuser Preferences" When I edit my last name to "Tester" - Then I should see "Logout (Tester)" \ No newline at end of file + Then I should see "Tester Preferences"