[Git][noosfero/noosfero][master] 3 commits: Fixes add admin icon

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
bf4474d4 by MatheusRich at 2018-10-24T14:15:54Z
Fixes add admin icon

- - - - -
7234f7e1 by MatheusRich at 2018-10-25T15:21:20Z
Fixes forum selenium test

- - - - -
5ed563c0 by Rodrigo Souto at 2018-10-29T20:19:50Z
Merge branch 'fix-icons' into 'master'

Fixes add admin icon

See merge request noosfero/noosfero!1633
- - - - -


2 changed files:

- app/views/users/_users_list.html.erb
- features/forum.feature


Changes:

=====================================
app/views/users/_users_list.html.erb
=====================================
@@ -16,9 +16,9 @@
 
 <table>
   <colgroup>
-    <col width="60%">
+    <col width="50%">
+    <col width="25%">
     <col width="25%">
-    <col width="15%">
   </colgroup>
   <tr>
     <th><%= _('Member') %></th>
@@ -38,7 +38,7 @@
           <% if p.is_admin? %>
             <%= button_without_text :user, _('Reset admin role'), {action: 'reset_admin_role', id: p, q: @q}, filter: @filter, data: {confirm: _("Do you want to reset this user as administrator?")} %>
           <% else %>
-            <%= button_without_text :admin_user, _('Set admin role'), {action: 'set_admin_role', id: p, q: @q}, filter: @filter, data: {confirm: _("Do you want to set this user as administrator?")} %>
+            <%= button_without_text :add_admin, _('Set admin role'), {action: 'set_admin_role', id: p, q: @q}, filter: @filter, data: {confirm: _("Do you want to set this user as administrator?")} %>
           <% end %>
           <% if !p.user.activated? %>
             <%= button_without_text :ok, _('Activate user'), {action: 'activate', id: p, q: @q}, filter: @filter, data: {confirm: _("Do you want to activate this user?")} %>


=====================================
features/forum.feature
=====================================
@@ -126,6 +126,7 @@ Feature: forum
     And I am logged in as "mariasilva"
     And I go to /joaosilva/forum-one?terms=terms
     When I follow "Accept"
+    And I wait for 1 second
     Then I should see "Forum One"
     And I should see "My description"
 



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/d59b8e1bed2aaac45882543b7d69de53642c1b54...5ed563c06e2a454cfbd24156121bcadf031bd6b9

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/d59b8e1bed2aaac45882543b7d69de53642c1b54...5ed563c06e2a454cfbd24156121bcadf031bd6b9
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20181029/09835c09/attachment-0001.html>