From c75268538a63692a371fd03a999721f252af2a98 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 29 Apr 2014 12:23:22 +0200
Subject: simplify download button

---
 app/assets/stylesheets/leap.scss            | 2 +-
 app/views/common/_download_button.html.haml | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 4c0dfe3..2a0c100 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -231,13 +231,13 @@ input, textarea {
   .download {
     a.btn {
       width: 14em;
+      font-weight: bold;
       small {
         font-weight: normal;
       }
     }
   }
   a.btn {
-    font-weight: bold;
     width: 11em;
     margin: 10px auto;
     display: block;
diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml
index 157c40a..e57c56b 100644
--- a/app/views/common/_download_button.html.haml
+++ b/app/views/common/_download_button.html.haml
@@ -2,5 +2,7 @@
   .row-fluid.first
     .span2
     .download.span8
-      = render partial: 'common/download_for_os', collection: available_clients + ['other']
+      = link_to client_download_url, class: "btn btn-large btn-primary" do
+        = big_icon('download')
+        = t(:download_client)
     .span2
-- 
cgit v1.2.3


From 8219db0c388f8b8caf7293cbd60086a1aeef8eb4 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 29 Apr 2014 12:31:24 +0200
Subject: smaller download button with context on dash

To use bitmask services:
Download Bitmask
---
 app/views/users/show.html.haml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 3c73147..ddc33ab 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -20,6 +20,11 @@
     - # %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
-      = render 'common/download_button'
+      %h4 To use bitmask services:
+      = link_to client_download_url, class: "btn btn-primary" do
+        %i.icon-arrow-down.icon-white
+        = t(:download_client)
-- 
cgit v1.2.3


From 5b3d92e40000e14c913c52227b5a717201cc5074 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 29 Apr 2014 12:34:32 +0200
Subject: remove os specific download buttons

keeping the platform detection for now.
---
 app/assets/stylesheets/leap.scss            | 59 -----------------------------
 app/views/common/_download_for_os.html.haml | 17 ---------
 2 files changed, 76 deletions(-)
 delete mode 100644 app/views/common/_download_for_os.html.haml

(limited to 'app')

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 2a0c100..d4db879 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -43,65 +43,6 @@
   display: none;
 }
 
-//
-// OS specific
-//
-
-.os-android {
-  display: none !important;
-}
-
-html.android .os-android {
-  display: inherit !important;
-}
-
-.os-linux {
-  display: none !important;
-}
-
-html.linux .os-linux {
-  display: inherit !important;
-}
-
-// .os-linux32 {
-//   display: none !important;
-// }
-// html.linux32 .os-linux32 {
-//   display: inherit !important;
-// }
-// .os-linux64 {
-//   display: none !important;
-// }
-// html.linux64 .os-linux64 {
-//   display: inherit !important;
-// }
-
-.os-windows {
-  display: none !important;
-}
-
-html.windows .os-windows {
-  display: inherit !important;
-}
-
-.os-osx {
-  display: none !important;
-}
-
-html.osx .os-osx {
-  display: inherit !important;
-}
-
-.os-other {
-  display: none !important;
-}
-
-html.oldmac, html.oldwin, html.ios, html.fxos, html.other {
-  .os-other {
-    display: inherit !important;
-  }
-}
-
 //
 // ICONS
 //
diff --git a/app/views/common/_download_for_os.html.haml b/app/views/common/_download_for_os.html.haml
deleted file mode 100644
index 3a11d10..0000000
--- a/app/views/common/_download_for_os.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- os = download_for_os
-%div{:class => "os-#{os}"}
-  %span.link
-    - btn_class = (os == "other") ? "disabled" : "btn-primary"
-    = link_to client_download_url(os), :class => "btn btn-large #{btn_class}" do
-      = big_icon('download')
-      .pull-right
-        = t(:download_client)
-        %br/
-        %small= I18n.t("os.#{os}")
-  %span.info
-    %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
-    %div
-    - if os == "other"
-      = t(:all_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe
-    - else
-      = t(:other_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe
-- 
cgit v1.2.3