Commit 8b3f34df60c4581302733150aa11351abb89f6be
Exists in
colab
and in
2 other branches
Merge pull request #343 from mezuro/pluralize_menu
Pluralize menu items
Showing
7 changed files
with
16 additions
and
15 deletions
Show diff stats
CHANGELOG.rdoc
| ... | ... | @@ -10,6 +10,7 @@ Prezento is the web interface for Mezuro. |
| 10 | 10 | * Add latest repositories list to the homepage |
| 11 | 11 | * Add latest configurations list to the homepage |
| 12 | 12 | * Move tutorials to mezuro.github.io |
| 13 | +* Pluralize navigation menu links | |
| 13 | 14 | |
| 14 | 15 | == v0.11.3 - 01/04/2016 |
| 15 | 16 | ... | ... |
app/views/shared/_navbar.html.erb
| ... | ... | @@ -12,10 +12,10 @@ |
| 12 | 12 | <div class="collapse navbar-collapse" id="nav-collapse"> |
| 13 | 13 | <ul class="nav navbar-nav"> |
| 14 | 14 | <li><%= link_to t('home'), root_path %></li> |
| 15 | - <li><%= link_to Project.model_name.human, projects_path %></li> | |
| 16 | - <li><%= link_to Repository.model_name.human, repositories_path %></li> | |
| 17 | - <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li> | |
| 18 | - <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li> | |
| 15 | + <li><%= link_to Project.model_name.human.pluralize, projects_path %></li> | |
| 16 | + <li><%= link_to Repository.model_name.human.pluralize, repositories_path %></li> | |
| 17 | + <li><%= link_to KalibroConfiguration.model_name.human.pluralize, kalibro_configurations_path %></li> | |
| 18 | + <li><%= link_to ReadingGroup.model_name.human.pluralize, reading_groups_path %></li> | |
| 19 | 19 | </ul> |
| 20 | 20 | <ul class="nav navbar-nav navbar-right"> |
| 21 | 21 | <% if user_signed_in? %> | ... | ... |
features/homepage.feature
| ... | ... | @@ -8,10 +8,10 @@ Feature: Homepage |
| 8 | 8 | Given I have a project named "GCC" |
| 9 | 9 | Then I am at the homepage |
| 10 | 10 | And I should see "Home" |
| 11 | - And I should see "Project" | |
| 12 | - And I should see "Repository" | |
| 13 | - And I should see "Configuration" | |
| 14 | - And I should see "Reading Group" | |
| 11 | + And I should see "Projects" | |
| 12 | + And I should see "Repositories" | |
| 13 | + And I should see "Configurations" | |
| 14 | + And I should see "Reading Groups" | |
| 15 | 15 | And I should see "Sign In" |
| 16 | 16 | And I should see "Sign Up" |
| 17 | 17 | And I should see "Language" | ... | ... |
features/kalibro_configuration/listing.feature
| ... | ... | @@ -5,7 +5,7 @@ Feature: Configuration listing |
| 5 | 5 | |
| 6 | 6 | Scenario: Listing configurations |
| 7 | 7 | Given I am at the homepage |
| 8 | - When I click the Configuration link | |
| 8 | + When I click the Configurations link | |
| 9 | 9 | Then I should see "Configurations" |
| 10 | 10 | And I should see "Name" |
| 11 | 11 | And I should see "Description" | ... | ... |
features/project/listing.feature
features/reading_group/listing.feature
| ... | ... | @@ -3,14 +3,14 @@ Feature: Reading Group |
| 3 | 3 | As a regular user |
| 4 | 4 | I should be able to see the public and my own reading groups |
| 5 | 5 | |
| 6 | - Scenario: Not logged in and no Reading Groups | |
| 6 | + Scenario: Not logged in and no Reading Groups | |
| 7 | 7 | Given I am at the homepage |
| 8 | - When I click the Reading Group link | |
| 8 | + When I click the Reading Groups link | |
| 9 | 9 | Then I should see "Reading Groups" |
| 10 | 10 | And I should see "Name" |
| 11 | 11 | And I should see "Description" |
| 12 | 12 | And I should see "You must be logged in to Create Reading Group" |
| 13 | - | |
| 13 | + | |
| 14 | 14 | @kalibro_configuration_restart @javascript |
| 15 | 15 | Scenario: Logged in, should list Reading Groups |
| 16 | 16 | Given I am a regular user |
| ... | ... | @@ -19,7 +19,7 @@ Feature: Reading Group |
| 19 | 19 | When I am at the All Reading Groups page |
| 20 | 20 | Then the sample reading group should be there |
| 21 | 21 | And I should not see "You must be logged in to Create Reading Group" |
| 22 | - | |
| 22 | + | |
| 23 | 23 | @kalibro_configuration_restart |
| 24 | 24 | Scenario: Should show only the public or owned reading groups |
| 25 | 25 | Given I am a regular user | ... | ... |
features/repository/index.feature
| ... | ... | @@ -5,7 +5,7 @@ Feature: Repository listing |
| 5 | 5 | |
| 6 | 6 | Scenario: Listing repositories |
| 7 | 7 | Given I am at the homepage |
| 8 | - When I click the Repository link | |
| 8 | + When I click the Repositories link | |
| 9 | 9 | Then I should see "Repositories" |
| 10 | 10 | And I should see "Name" |
| 11 | 11 | And I should see "Description" | ... | ... |