Commit 9d5847e

Stephen Peasley <s@stephenpeasley.com>
2015-08-14 02:20:06
[WIP] Add gender and social_tolerance to avatar
1 parent af2a02a
Changed files (5)
app/assets/stylesheets/global.scss
@@ -53,6 +53,15 @@ header {
   }
 }
 /* ---------------------------------------------- */
+/* Avatars -------------------------------------- */
+/* ---------------------------------------------- */
+a[class^="gender_"] {
+	background: #ffff00;
+}
+a[class^="social_"] {
+	background: #ffff00;
+}
+/* ---------------------------------------------- */
 /* Alerts --------------------------------------- */
 /* ---------------------------------------------- */
 .alert-box ul {
app/controllers/profiles_controller.rb
@@ -19,7 +19,7 @@ class ProfilesController < ApplicationController
       flash[:notice] = t("profiles.edit.profile_update_success")
       redirect_to profile_path(@profile)
     else
-      flash[:notice] = t("profiles.edit.profile_updated_error")
+      flash[:notice] = t("profiles.edit.profile_update_error")
       render 'edit'
     end
   end
app/views/profiles/show.html.erb
@@ -1,7 +1,7 @@
 <div class="row">
     
   <div class="small-12 medium-4 columns small-text-center medium-text-left">
-    <%= link_to profile_path(@user), class: 'th [radius]' do %>
+    <%= link_to profile_path(@user), class: "th [radius] gender_#{@profile.gender} social_#{@profile.social_tolerance}" do %>
       <%= gravatar_for(@user, size: 128) %>
     <% end %>
     <h1><%= link_to @user.username, profile_path(@user) %></h1>
Gemfile
@@ -25,6 +25,7 @@ gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4', group: :doc
 gem 'foundation-rails'
 gem 'email_validator'
+gem 'font-awesome-rails'
 
 # Use ActiveModel has_secure_password
 gem 'bcrypt', '~> 3.1.7'
Gemfile.lock
@@ -124,6 +124,8 @@ GEM
     ffaker (2.0.0)
     flamegraph (0.1.0)
       fast_stack
+    font-awesome-rails (4.4.0.0)
+      railties (>= 3.2, < 5.0)
     foreman (0.78.0)
       thor (~> 0.19.1)
     foundation-rails (5.5.2.1)
@@ -352,6 +354,7 @@ DEPENDENCIES
   factory_girl_rails
   ffaker
   flamegraph
+  font-awesome-rails
   foreman
   foundation-rails
   groupdate