diff options
| author | Azul <azul@leap.se> | 2013-12-23 00:03:11 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-12-23 00:03:11 +0100 |
| commit | 5f00ae48047f32f9068281af65fb349a7e79c22d (patch) | |
| tree | 2f6647bad105eae5cd1c8dad44ac77c603d71e8b /users/app/views | |
| parent | 4c5851dfac51453571427535419469fe1b73a81d (diff) | |
| parent | a5fa80ca1e20591f25f63d1702a9bc134c60b9ba (diff) | |
Merge remote-tracking branch 'jessib/feature/3389_download_links' into develop
Conflicts:
core/app/views/common/_home_page_buttons.html.haml
users/app/views/users/show.html.haml
Diffstat (limited to 'users/app/views')
| -rw-r--r-- | users/app/views/users/show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml index 4c710a0..c587017 100644 --- a/users/app/views/users/show.html.haml +++ b/users/app/views/users/show.html.haml @@ -20,3 +20,6 @@ - # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly} %li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user)) %li= icon('shopping-cart') + link_to(t(:overview_billing), billing_top_link(@user)) if APP_CONFIG[:billing] + .container-fluid + .row-fluid + = home_page_buttons(true)
\ No newline at end of file |