[Git][noosfero/noosfero][master] 2 commits: Add 'love' icon

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
bb71f7db by dtygel at 2015-08-09T20:40:41Z
Add 'love' icon

- - - - -
c2137b8e by Bráulio Bhavamitra at 2015-08-10T04:33:00Z
Merge branch 'icon-love' into 'master'

Add love icon

See merge request !475

- - - - -


4 changed files:

- app/views/blocks/profile_info_actions/_enterprise.html.erb
- po/pt/noosfero.po
- public/designs/icons/awesome/style.scss
- public/designs/icons/tango/style.css


Changes:

=====================================
app/views/blocks/profile_info_actions/_enterprise.html.erb
=====================================
--- a/app/views/blocks/profile_info_actions/_enterprise.html.erb
+++ b/app/views/blocks/profile_info_actions/_enterprise.html.erb
@@ -1,7 +1,7 @@
 <ul>
   <%if logged_in? %>
     <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= button(:add, _('Add as favorite'), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :title => _('Add enterprise as favorite')) %></li>
+      <li><%= button(:love, _('Add as favorite'), { profile: user.identifier, controller: 'favorite_enterprises', action: 'add', id: profile.id }, title: _('Add enterprise as favorite')) %></li>
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>


=====================================
po/pt/noosfero.po
=====================================
--- a/po/pt/noosfero.po
+++ b/po/pt/noosfero.po
@@ -8077,11 +8077,11 @@ msgstr "Enviar e-mail para os administradores"
 
 #: app/views/blocks/profile_info_actions/_enterprise.html.erb:4
 msgid "Add as favorite"
-msgstr "Adicionar favorito"
+msgstr "Favoritar"
 
 #: app/views/blocks/profile_info_actions/_enterprise.html.erb:4
 msgid "Add enterprise as favorite"
-msgstr "Editar empreendimento como favorito"
+msgstr "Adicionar empreendimento como um de seus favoritos"
 
 #: app/views/blocks/profile_info_actions/_person.html.erb:6
 #: app/views/profile/_private_profile.html.erb:13


=====================================
public/designs/icons/awesome/style.scss
=====================================
--- a/public/designs/icons/awesome/style.scss
+++ b/public/designs/icons/awesome/style.scss
@@ -299,3 +299,7 @@ $fa-font-path: "fonts";
 .icon-menu-ctrl-panel:before {
   @extend .fa-sliders:before;
 }
+
+.icon-love:before {
+  @extend .fa-heart:before;
+}


=====================================
public/designs/icons/tango/style.css
=====================================
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -111,6 +111,7 @@
 
 .icon-activate-user           { background-image: url(Tango/16x16/emblems/emblem-system.png) }
 .icon-deactivate-user         { background-image: url(Tango/16x16/emblems/emblem-unreadable.png) }
+.icon-love                    { background-image: url(Tango/16x16/emblems/emblem-favorite.png) }
 .icon-set-admin-role          { background-image: url(mod/16x16/apps/user.png) }
 .icon-reset-admin-role        { background-image: url(../../../images/icons-app/person-icon.png) }
 .icon-clock                   { background-image: url(Tango/16x16/actions/appointment.png) }



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/2827fff7c76aa180de0323ab2b99339fe4e71cf9...c2137b8ed77a540d0e0f4a7804f21c24d3b713e6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150810/3385a8f3/attachment.html>