Merge pull request #301 from awesomefoundation/adjust-footer

Rearrange footer and fix social media links

app/views/shared/_footer.html.erb

@@ -2,25 +2,23 @@
   <p>
     <%= link_to t("layouts.application.about_contact"), about_us_path %>
     <%= link_to t("layouts.application.faq"), faq_path %>
+
+    <%= link_to content_tag("i", nil, :class => "icon-twitter", :title => t("word.twitter")), "https://twitter.com/awesomefound", :target => "_blank" %>
+    <%= link_to content_tag("i", nil, :class => "icon-facebook", :title => t("word.facebook")), "https://www.facebook.com/awesomefoundation", :target => "_blank" %>
+
     <% if signed_in? -%>
       <%= link_to t("layouts.application.sign-out"), sign_out_path, :method => :delete %>
     <% else -%>
       <%= link_to t("layouts.application.sign-in"), sign_in_path %>
     <% end -%>
+  </p>
 
-    <span>·</span>
-
+  <p>
     <%= link_to "Български", params.merge(:locale => "bg") %>
     <%= link_to "English", params.merge(:locale => "en") %>
     <%= link_to "Español", params.merge(:locale => "es") %>
     <%= link_to "Français", params.merge(:locale => "fr") %>
     <%= link_to "Português", params.merge(:locale => "pt") %>
     <%= link_to "Русский", params.merge(:locale => "ru") %>
   </p>
-
-  <ol class="social-links">
-    <li><%= link_to "", "https://twitter.com/awesomefound", :class => :twitter %></li>
-    <li><%= link_to "", "https://www.facebook.com/awesomefoundation", :class => :facebook %></li>
-    <li><%= link_to "", "http://blog.awesomefoundation.org", :class => :blog %></li>
-  </ol>
 </footer>

config/locales/bg.yml

@@ -8,6 +8,8 @@ bg:
       funding: "%B %Y"
   word:
     inactive: Неактивен
+    twitter: Twitter
+    facebook: Facebook
   flash:
     permissions:
       must-be-logged-in: Влезте в профила си.

config/locales/en.yml

@@ -8,6 +8,8 @@ en:
       funding: "%B %Y"
   word:
     inactive: Inactive
+    twitter: Twitter
+    facebook: Facebook
   flash:
     permissions:
       must-be-logged-in: You must be logged in.

config/locales/es.yml

@@ -8,6 +8,8 @@ es:
       funding: "%B %Y"
   word:
     inactive: Inactivo
+    twitter: Twitter
+    facebook: Facebook
   flash:
     permissions:
       must-be-logged-in: Debes estar conectado.

config/locales/fr.yml

@@ -8,6 +8,8 @@ fr:
       funding: "%B %Y"
   word:
     inactive: Non-active
+    twitter: Twitter
+    facebook: Facebook
   flash:
     permissions:
       must-be-logged-in: Vous devez être connecté.

config/locales/pt.yml

@@ -8,6 +8,8 @@ pt:
       funding: "%B %Y"
   word:
     inactive: Inativo
+    twitter: Twitter
+    facebook: Facebook
   flash:
     permissions:
       must-be-logged-in: Você deve estar autenticado.

config/locales/ru.yml

@@ -8,6 +8,8 @@ ru:
       funding: "%B %Y"
   word:
     inactive: Inactive
+    twitter: Twitter
+    facebook: Facebook
   flash:
     permissions:
       must-be-logged-in: Вы должны авторизоваться.