nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Using entypo icon as default application image

Browse source
This commit is contained in:
augier 2015-08-02 12:17:46 +02:00 committed by theworldbright
parent 098e8e46dd
commit 3fb2d262b8
6 changed files with 41 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/assets/stylesheets/mobile/settings.scss
View file

@ -30,24 +30,30 @@
} }
} }
#blocked_people { .applications-page {
.blocked_person { .applications-explenation {
border-bottom: 1px solid $border-grey; margin-bottom: 15px;
margin-top: 0;
.avatar { max-width: 35px; }
.info { color: $text; }
}
} }
.applications-page {
.application-img { .application-img {
display: inline; display: inline;
padding: 9px 0;
float: left; float: left;
text-align: center;
img { &, img {
width: 70px; width: 70px;
max-height: 70px; max-height: 70px;
margin: 9px 0; }
[class^="entypo-"] {
font-size: 60px;
height: 0;
width: 100%;
&::before {
position: relative;
top: -15px;
}
} }
} }

19
app/assets/stylesheets/user_applications.scss
View file

@ -1,12 +1,27 @@
.applications-page { .applications-page {
.applications-explenation {
margin-bottom: 15px;
}
.application-img { .application-img {
display: inline; display: inline;
padding: 9px 0;
float: left; float: left;
text-align: center;
img { &, img {
width: 70px; width: 70px;
max-height: 70px; max-height: 70px;
margin: 9px 0; }
[class^="entypo-"] {
font-size: 60px;
height: 0;
width: 100%;
&::before {
position: relative;
top: -15px;
}
} }
} }

4
app/models/api/openid_connect/o_auth_application.rb
View file

@ -19,10 +19,6 @@ module Api
self.client_secret = SecureRandom.hex(32) self.client_secret = SecureRandom.hex(32)
end end
def image_uri
logo_uri ? logo_uri : "branding/logos/asterisk.png"
end
class << self class << self
def available_response_types def available_response_types
["id_token", "id_token token", "code"] ["id_token", "id_token token", "code"]

2
app/presenters/user_applications_presenter.rb
View file

@ -23,7 +23,7 @@ class UserApplicationsPresenter
{ {
id: find_id(application), id: find_id(application),
name: application.client_name, name: application.client_name,
image: application.image_uri, image: application.logo_uri,
authorizations: find_scopes(application) authorizations: find_scopes(application)
} }
end end

3
app/views/user_applications/_add_remove_applications.haml
View file

@ -3,7 +3,10 @@
- @user_apps.user_applications.each do |app| - @user_apps.user_applications.each do |app|
%li.list-group-item %li.list-group-item
.application-img .application-img
- if app[:image]
= image_tag app[:image], class: "img-responsive" = image_tag app[:image], class: "img-responsive"
- else
%i.entypo-browser
.application-authorizations .application-authorizations
- if app[:authorizations].count > 0 - if app[:authorizations].count > 0
%h4="#{app[:name]} #{t("user_applications.index.access")}" %h4="#{app[:name]} #{t("user_applications.index.access")}"

3
app/views/user_applications/index.mobile.haml
View file

@ -6,9 +6,8 @@
.container-fluid .container-fluid
.row .row
.col-md-12 .col-md-12.applications-explenation
= t('.applications_explanation') = t('.applications_explanation')
.small-horizontal-spacer
.col-md-12 .col-md-12
= render 'add_remove_applications' = render 'add_remove_applications'