Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

small fixes

Browse Source
This commit is contained in:
jomo
2013-06-24 14:17:27 +02:00
parent fb52e8bed2
commit b4f2dc5fab
7 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/screen.css.scss
View File

@@ -112,11 +112,11 @@ and (min-width: 1000px)
} }
img.avatar { img.avatar {
image-rendering:optimizeSpeed; image-rendering: optimizeSpeed;
image-rendering:-moz-crisp-edges; image-rendering:-moz-crisp-edges;
image-rendering:-o-crisp-edges; image-rendering:-o-crisp-edges;
image-rendering:optimize-contrast; image-rendering: optimize-contrast;
image-rendering:-webkit-optimize-contrast; image-rendering: -webkit-optimize-contrast;
-ms-interpolation-mode: nearest-neighbor; -ms-interpolation-mode: nearest-neighbor;
} }

2
app/controllers/application_controller.rb
View File

@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
protect_from_forgery protect_from_forgery
# force_ssl # force_ssl
helper :all helper :all
include ToolsHelper include UsersHelper
helper_method :current_user helper_method :current_user
private private

2
app/helpers/tools_helper.rb
View File

@@ -1,2 +0,0 @@
module ToolsHelper
end

4
app/helpers/users_helper.rb
View File

@@ -1,8 +1,8 @@
module UsersHelper module UsersHelper
def avatar_url(user_id) def avatar_url(user_id, size)
u = User.find_by_id(user_id) u = User.find_by_id(user_id)
u.nil? ? ign = :char : ign = u.ign u.nil? ? ign = :char : ign = u.ign
return "https://minotar.net/avatar/#{ign}/8" return "https://minotar.net/avatar/#{ign}/#{size}"
end end
def mc_running? def mc_running?

2
app/views/layouts/_head.html.erb
View File

@@ -8,7 +8,7 @@
<%= link_to current_user.name.truncate(14), current_user %><br/> <%= link_to current_user.name.truncate(14), current_user %><br/>
<%= link_to "Logout", logout_path %> <%= link_to "Logout", logout_path %>
</span> </span>
<%= 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 %> <% else %>
<%= link_to "Log in", login_path, :action => "new" %><br/> <%= link_to "Log in", login_path, :action => "new" %><br/>
<%= link_to "Register", register_path %> <%= link_to "Register", register_path %>

2
app/views/users/new.html.erb
View File

@@ -2,7 +2,7 @@
<%= simple_form_for @user do |f| %> <%= simple_form_for @user do |f| %>
<%= f.input :name %> <%= f.input :name %>
<%= f.input :ign, label: "Ingame name" %> <%= f.input :ign, label: "Exact ingame name" %>
<%= f.input :email %> <%= f.input :email %>
<%= f.input :password %> <%= f.input :password %>
<%= f.input :password_confirmation %> <%= f.input :password_confirmation %>

2
app/views/users/show.html.erb
View File

@@ -1,6 +1,6 @@
<div id="user-info"> <div id="user-info">
<div id="edit_profile"><%= link_to "edit profile", edit_user_path(@user), :class => "btn-blue" %></div> <div id="edit_profile"><%= link_to "edit profile", edit_user_path(@user), :class => "btn-blue" %></div>
<%= image_tag avatar_url(@user.id), :class => "user-avatar avatar", :alt => "avatar" %><br/> <%= image_tag avatar_url(@user.id, 128), :class => "user-avatar avatar", :alt => "avatar" %><br/>
<% if @user.banned %> <% if @user.banned %>
<span class="user-banned">This user is banned!</span> <span class="user-banned">This user is banned!</span>
<% end %> <% end %>