Flexibus/#374/user dashboard #567
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
added 3 commits
February 8, 2018 15:44
JakobEdding
requested changes
Feb 8, 2018
config/locales/de.yml
Outdated
| @@ -111,7 +111,8 @@ de: | |||
| edit_profile: "Profil bearbeiten" | |||
|
|
|||
| dashboard: | |||
| title: "Dashboard für %{name}" | |||
| title: "Hallo %{name}!" | |||
| show_all: "Alle anzeigem" | |||
JakobEdding
requested changes
Feb 8, 2018
| @@ -2,3 +2,14 @@ | |||
| <div class="page-header"> | |||
| <h1><%= t('dashboard.title', name: @user.first_name) %></h1> | |||
| </div> | |||
|
|
|||
| <% if user_signed_in? and current_user.teams_created_by_user.present? %> | |||
| <h4><%= t('teams.index.my_teams')%> <a><%= t('dashboard.show_all')%></a></h4> | |||
There was a problem hiding this comment.
href is missing -> link doesn't work
|
Number of teams shown is not limited to 4 - is that inteded or ok for now? @emanuel-metzenthin @zhamanakov |
|
Number of teams is ok, as no other sections are implemented yet. |
JakobEdding
approved these changes
Feb 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #374.
The dashboard is not finished. But it already contains the user's teams. This can be merged before the feature freeze and final presentation.