From 3fb2d262b857b6764f48df4c21df36eae0efa467 Mon Sep 17 00:00:00 2001
From: augier <christophe@c-henry.fr>
Date: Sun, 2 Aug 2015 12:17:46 +0200
Subject: [PATCH] Using entypo icon as default application image

---
 app/assets/stylesheets/mobile/settings.scss   | 30 +++++++++++--------
 app/assets/stylesheets/user_applications.scss | 19 ++++++++++--
 .../api/openid_connect/o_auth_application.rb  |  4 ---
 app/presenters/user_applications_presenter.rb |  2 +-
 .../_add_remove_applications.haml             |  5 +++-
 app/views/user_applications/index.mobile.haml |  3 +-
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/mobile/settings.scss b/app/assets/stylesheets/mobile/settings.scss
index a19241e60..c45814a7d 100644
--- a/app/assets/stylesheets/mobile/settings.scss
+++ b/app/assets/stylesheets/mobile/settings.scss
@@ -30,24 +30,30 @@
   }
 }
 
-#blocked_people {
-  .blocked_person {
-    border-bottom: 1px solid $border-grey;
-    margin-top: 0;
-    .avatar { max-width: 35px; }
-    .info { color: $text; }
-  }
-}
-
 .applications-page {
+  .applications-explenation {
+    margin-bottom: 15px;
+  }
+
   .application-img {
     display: inline;
+    padding: 9px 0;
     float: left;
+    text-align: center;
 
-    img {
+    &, img {
       width: 70px;
       max-height: 70px;
-      margin: 9px 0;
+    }
+
+    [class^="entypo-"] {
+      font-size: 60px;
+      height: 0;
+      width: 100%;
+      &::before {
+        position: relative;
+        top: -15px;
+      }
     }
   }
 
@@ -57,4 +63,4 @@
     display: inline-block;
     float: right;
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/user_applications.scss b/app/assets/stylesheets/user_applications.scss
index 32cadd102..1290a5abd 100644
--- a/app/assets/stylesheets/user_applications.scss
+++ b/app/assets/stylesheets/user_applications.scss
@@ -1,12 +1,27 @@
 .applications-page {
+  .applications-explenation {
+    margin-bottom: 15px;
+  }
+
   .application-img {
     display: inline;
+    padding: 9px 0;
     float: left;
+    text-align: center;
 
-    img {
+    &, img {
       width: 70px;
       max-height: 70px;
-      margin: 9px 0;
+    }
+
+    [class^="entypo-"] {
+      font-size: 60px;
+      height: 0;
+      width: 100%;
+      &::before {
+        position: relative;
+        top: -15px;
+      }
     }
   }
 
diff --git a/app/models/api/openid_connect/o_auth_application.rb b/app/models/api/openid_connect/o_auth_application.rb
index 6589cdec4..5ecf8ea69 100644
--- a/app/models/api/openid_connect/o_auth_application.rb
+++ b/app/models/api/openid_connect/o_auth_application.rb
@@ -19,10 +19,6 @@ module Api
         self.client_secret = SecureRandom.hex(32)
       end
 
-      def image_uri
-        logo_uri ? logo_uri : "branding/logos/asterisk.png"
-      end
-
       class << self
         def available_response_types
           ["id_token", "id_token token", "code"]
diff --git a/app/presenters/user_applications_presenter.rb b/app/presenters/user_applications_presenter.rb
index 5a0ad9cfc..5d400822d 100644
--- a/app/presenters/user_applications_presenter.rb
+++ b/app/presenters/user_applications_presenter.rb
@@ -23,7 +23,7 @@ class UserApplicationsPresenter
     {
       id:             find_id(application),
       name:           application.client_name,
-      image:          application.image_uri,
+      image:          application.logo_uri,
       authorizations: find_scopes(application)
     }
   end
diff --git a/app/views/user_applications/_add_remove_applications.haml b/app/views/user_applications/_add_remove_applications.haml
index 4f0c082d0..db71c35c9 100644
--- a/app/views/user_applications/_add_remove_applications.haml
+++ b/app/views/user_applications/_add_remove_applications.haml
@@ -3,7 +3,10 @@
     - @user_apps.user_applications.each do |app|
       %li.list-group-item
         .application-img
-          = image_tag app[:image], class: "img-responsive"
+          - if app[:image]
+            = image_tag app[:image], class: "img-responsive"
+          - else
+            %i.entypo-browser
         .application-authorizations
           - if app[:authorizations].count > 0
             %h4="#{app[:name]} #{t("user_applications.index.access")}"
diff --git a/app/views/user_applications/index.mobile.haml b/app/views/user_applications/index.mobile.haml
index 696ce47d8..27d0b6b82 100644
--- a/app/views/user_applications/index.mobile.haml
+++ b/app/views/user_applications/index.mobile.haml
@@ -6,9 +6,8 @@
 
   .container-fluid
     .row
-      .col-md-12
+      .col-md-12.applications-explenation
         = t('.applications_explanation')
-      .small-horizontal-spacer
       .col-md-12
         = render 'add_remove_applications'