From 4085e3fabef6427cd3f8be9b61c209bd82eaa595 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 24 May 2014 10:33:31 +0200
Subject: navigation works with empty locale selected

Just in case some translation keys are not present things should still work and make sense.
So translation keys should be picked in a meaningful way and scoped rather than prefixed.
For example overview.account will turn into "Account" if no translation is present while "overview_account" will turn into "Overview Account". We usually want the former.
---
 app/views/users/show.html.haml | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ddc33ab..6760099 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,30 +1,7 @@
-.overview
-
-  %h2.first= t(:overview_welcome, :username => @user.login)
-
-  - if admin?
-    %p
-      = t(:created)
-      = @user.created_at
-      %br
-      = t(:updated)
-      = @user.updated_at
-      %br
-      = t(:enabled)
-      = @user.enabled?
-
-  %p= t(:overview_intro)
-
-  %ul.unstyled
-    %li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
-    - # %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
-      %h4 To use bitmask services:
-      = link_to client_download_url, class: "btn btn-primary" do
-        %i.icon-arrow-down.icon-white
-        = t(:download_client)
+= render 'overview'
+.container-fluid
+  .row-fluid
+    %h4 To use bitmask services:
+    = link_to client_download_url, class: "btn btn-primary" do
+      %i.icon-arrow-down.icon-white
+      = t(:download_bitmask)
-- 
cgit v1.2.3


From cc59ce53e52bf48d97de16d66012e8309bf98fe8 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 27 May 2014 16:32:50 +0200
Subject: add btn helper for link_to with .btn

Also translates the first arg if it's a symbol and adds more btn- classes if given as html_options[:type]
---
 app/views/users/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/users/show.html.haml')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 6760099..da8e467 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -2,6 +2,6 @@
 .container-fluid
   .row-fluid
     %h4 To use bitmask services:
-    = link_to client_download_url, class: "btn btn-primary" do
+    = btn client_download_url, type: "primary" do
       %i.icon-arrow-down.icon-white
       = t(:download_bitmask)
-- 
cgit v1.2.3