From b4f2dc5fab41ec089d27cd21f45d002f1f561076 Mon Sep 17 00:00:00 2001 From: jomo Date: Mon, 24 Jun 2013 14:17:27 +0200 Subject: [PATCH] small fixes --- app/assets/stylesheets/screen.css.scss | 6 +++--- app/controllers/application_controller.rb | 2 +- app/helpers/tools_helper.rb | 2 -- app/helpers/users_helper.rb | 4 ++-- app/views/layouts/_head.html.erb | 2 +- app/views/users/new.html.erb | 2 +- app/views/users/show.html.erb | 2 +- 7 files changed, 9 insertions(+), 11 deletions(-) delete mode 100644 app/helpers/tools_helper.rb diff --git a/app/assets/stylesheets/screen.css.scss b/app/assets/stylesheets/screen.css.scss index b9dca84..76ac76b 100644 --- a/app/assets/stylesheets/screen.css.scss +++ b/app/assets/stylesheets/screen.css.scss @@ -112,11 +112,11 @@ and (min-width: 1000px) } img.avatar { - image-rendering:optimizeSpeed; + image-rendering: optimizeSpeed; image-rendering:-moz-crisp-edges; image-rendering:-o-crisp-edges; - image-rendering:optimize-contrast; - image-rendering:-webkit-optimize-contrast; + image-rendering: optimize-contrast; + image-rendering: -webkit-optimize-contrast; -ms-interpolation-mode: nearest-neighbor; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d2125a8..83ab100 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base protect_from_forgery # force_ssl helper :all - include ToolsHelper + include UsersHelper helper_method :current_user private diff --git a/app/helpers/tools_helper.rb b/app/helpers/tools_helper.rb deleted file mode 100644 index 68d0e9c..0000000 --- a/app/helpers/tools_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ToolsHelper -end \ No newline at end of file diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 709431c..d267102 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,8 +1,8 @@ module UsersHelper - def avatar_url(user_id) + def avatar_url(user_id, size) u = User.find_by_id(user_id) u.nil? ? ign = :char : ign = u.ign - return "https://minotar.net/avatar/#{ign}/8" + return "https://minotar.net/avatar/#{ign}/#{size}" end def mc_running? diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 23d67f0..92de2bd 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -8,7 +8,7 @@ <%= link_to current_user.name.truncate(14), current_user %>
<%= link_to "Logout", logout_path %> - <%= link_to image_tag(avatar_url(current_user.id), :class => "avatar size32"), current_user %> + <%= link_to image_tag(avatar_url(current_user.id, 32), :class => "avatar"), current_user %> <% else %> <%= link_to "Log in", login_path, :action => "new" %>
<%= link_to "Register", register_path %> diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 67f79dd..fe5da42 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -2,7 +2,7 @@ <%= simple_form_for @user do |f| %> <%= f.input :name %> - <%= f.input :ign, label: "Ingame name" %> + <%= f.input :ign, label: "Exact ingame name" %> <%= f.input :email %> <%= f.input :password %> <%= f.input :password_confirmation %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 41e2221..fde10ea 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,6 +1,6 @@
<%= link_to "edit profile", edit_user_path(@user), :class => "btn-blue" %>
- <%= image_tag avatar_url(@user.id), :class => "user-avatar avatar", :alt => "avatar" %>
+ <%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %>
<% if @user.banned %> This user is banned! <% end %>