[Git][noosfero/noosfero][master] 3 commits: Removing unwanted css class and improving icon size

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
b7521351 by Alax Alves at 2018-08-20T19:08:59Z
Removing unwanted css class and improving icon size

- - - - -
2d430d80 by MatheusRich at 2018-08-21T14:29:53Z
Fixing display in groups list

Fixing safe strings test

Signed-off-by: Alax Alves <alaxallves at gmail.com>

- - - - -
17208802 by Rodrigo Souto at 2018-08-22T14:48:45Z
Merge branch 'issue-6836' into 'master'

Fixes "Manage my groups" page layout

See merge request noosfero/noosfero!1599
- - - - -


4 changed files:

- app/helpers/profile_image_helper.rb
- app/views/shared/_list_groups.html.erb
- public/designs/themes/base/style.scss
- test/integration/safe_strings_test.rb


Changes:

=====================================
app/helpers/profile_image_helper.rb
=====================================
@@ -170,7 +170,7 @@ module ProfileImageHelper
         )) +
         extra_info_tag + profile_sex_icon(profile),
         profile.url,
-        class: 'profile_link url',
+        class: 'profile_link',
         style: (
           theme_option(:profile_list_bg_imgs) ?
           "background: url(#{profile_icon(profile, size)}) no-repeat center center; 


=====================================
app/views/shared/_list_groups.html.erb
=====================================
@@ -4,28 +4,30 @@
       <div class='common-profile-list-block'>
         <%= profile_image_link(group, :portrait, 'div') %>
       </div>
-      <span class='profile-details'>
-        <strong><%= group.name %></strong><br/>
-        <%= raw _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by(resource_id: group.id) %>
-        <%= _('Type: %s') % _(group.class.identification) %> <br/>
-        <%= raw _('Description: %s') % group.description  + '<br/>' if group.community? %>
-        <%= _('Members: %s') % group.members_count.to_s %> <br/>
-        <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
-        <%= button_bar do %>
-          <% if user.has_permission?(:edit_profile, group) %>
-            <%= button :control_panel, _('Control panel'), group.admin_url %>
-          <% end %>
-          <%= button :logout, _('Leave'), group.leave_url(true), :class => 'leave-community' %>
+      <div>
+        <span class='profile-details'>
+          <strong><%= group.name %></strong><br/>
+          <%= raw _('Role: %s') % rolename_for(profile, group) + '<br/>' if profile.role_assignments.find_by(resource_id: group.id) %>
+          <%= _('Type: %s') % _(group.class.identification) %> <br/>
+          <%= raw _('Description: %s') % group.description  + '<br/>' if group.community? %>
+          <%= _('Members: %s') % group.members_count.to_s %> <br/>
+          <%= _('Created at: %s') % show_date(group.created_at) unless group.enterprise? %> <br/>
+          <%= button_bar do %>
+            <% if user.has_permission?(:edit_profile, group) %>
+              <%= button :control_panel, _('Control panel'), group.admin_url %>
+            <% end %>
+            <%= button :logout, _('Leave'), group.leave_url(true), :class => 'leave-community' %>
 
-          <% if (user.has_permission?(:destroy_profile, group) && !environment.enabled?('forbid_destroy_profile')) || user.is_admin?(environment) %>
-            <%= button :delete, _('Remove'),
-              { :controller => 'profile_editor',
-                :action => 'destroy_profile',
-                :profile => group.identifier }
-            %>
+            <% if (user.has_permission?(:destroy_profile, group) && !environment.enabled?('forbid_destroy_profile')) || user.is_admin?(environment) %>
+              <%= button :delete, _('Remove'),
+                { :controller => 'profile_editor',
+                  :action => 'destroy_profile',
+                  :profile => group.identifier }
+              %>
+            <% end %>
           <% end %>
-        <% end %>
-      </span>
+        </span>
+      </div>
       <br class="may-clear" />
     </li>
   <% end %>


=====================================
public/designs/themes/base/style.scss
=====================================
@@ -685,7 +685,7 @@ div#notice {
 #content .box-1 .block .common-profile-list-block.vcard,
 #content .box-1 .block .common-profile-list-block.vcard .profile_link {
  padding-bottom: 0px;
- width: 70px;
+ width: 100px;
 }
 
 .block-footer-content {
@@ -1570,6 +1570,7 @@ table.profile th {
 /**** controller-memberships action-memberships-index ****/
 
 #memberships-index li {
+  display: flex;
   background-color: #FFF;
   border: 1px solid #EEE;
   -moz-border-radius: 9px;


=====================================
test/integration/safe_strings_test.rb
=====================================
@@ -31,7 +31,7 @@ class SafeStringsTest < ActionDispatch::IntegrationTest
     get "/profile/#{community.identifier}"
     assert_tag :tag => 'div', :attributes => { :id => "block-#{community.blocks.first.id}" }, :descendant => {
       :tag => 'li', :attributes => { :class => 'vcard common-profile-list-block no-pic' }, :descendant => {
-        :tag => 'a', :attributes => { :class => 'profile_link url', :title => person.name }
+        :tag => 'a', :attributes => { :class => 'profile_link', :title => person.name }
       }
     }
   end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/712a6e7e0386f55e929e78490125c62f4143b963...172088021504575b4b8bb40eea2a8eda8c7c3af8

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/712a6e7e0386f55e929e78490125c62f4143b963...172088021504575b4b8bb40eea2a8eda8c7c3af8
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/20180822/bef2a7b3/attachment-0001.html>