Download as
Browse Code »

Commit 17094e8a6067efc76b8b210edd6d6044e43b606b

Authored by AurelioAHeckert
1 parent ac4008f7
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem639: crazy del buttons corrected on manage contacts 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2456 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 69 additions and 52 deletions   Show diff stats
app/views/favorite_enterprises/index.rhtml
  Diff comments   View file @17094e8
@@ -2,10 +2,12 @@ @@ -2,10 +2,12 @@
2 2
3 <h1><%= _("%s's favorite enteprises") % profile.name %></h1> 3 <h1><%= _("%s's favorite enteprises") % profile.name %></h1>
4 4
5 -<ul class='profile-list'> 5 +<ul class="profile-list">
6 <% @favorite_enterprises.each do |enterprise| %> 6 <% @favorite_enterprises.each do |enterprise| %>
7 <li> 7 <li>
8 - <%= profile_image_link enterprise %> 8 + <%= link_to_profile profile_image(enterprise) + '<br/>' + enterprise.name,
  9 + enterprise.identifier, :class => 'profile-link' %>
  10 + <%# profile_image_link enterprise, :portrait, 'div' %>
9 <div class="controll"> 11 <div class="controll">
10 <%= link_to content_tag('span',_('remove')), 12 <%= link_to content_tag('span',_('remove')),
11 { :action => 'remove', :id => enterprise.id }, 13 { :action => 'remove', :id => enterprise.id },
app/views/friends/index.rhtml
  Diff comments   View file @17094e8
@@ -2,13 +2,11 @@ @@ -2,13 +2,11 @@
2 2
3 <h1><%= __("%s's friends") % profile.name %></h1> 3 <h1><%= __("%s's friends") % profile.name %></h1>
4 4
5 -<ul class='profile-list'> 5 +<ul class="profile-list">
6 <% @friends.each do |friend| %> 6 <% @friends.each do |friend| %>
7 <li> 7 <li>
8 - <center>  
9 - <%= link_to_profile(profile_image(friend) + '<br/>' + friend.name, friend.identifier) %>  
10 - </center>  
11 - <!--<%= button(:delete, _('Remove'), {:action => 'remove', :id => friend.id}, :method => :post) %>--> 8 + <%= link_to_profile profile_image(friend) + '<br/>' + friend.name,
  9 + friend.identifier, :class => 'profile-link' %>
12 <div class="controll"> 10 <div class="controll">
13 <%= link_to content_tag('span',_('remove')), 11 <%= link_to content_tag('span',_('remove')),
14 { :action => 'remove', :id => friend.id }, 12 { :action => 'remove', :id => friend.id },
@@ -16,7 +14,6 @@ @@ -16,7 +14,6 @@
16 :title => _('remove'), 14 :title => _('remove'),
17 :help => __('Clicking on this button will remove your friend relation with %s.') % friend.name %> 15 :help => __('Clicking on this button will remove your friend relation with %s.') % friend.name %>
18 </div><!-- end class="controll" --> 16 </div><!-- end class="controll" -->
19 -  
20 </li> 17 </li>
21 <% end %> 18 <% end %>
22 </ul> 19 </ul>
public/stylesheets/controller_favorite_enterprises.css 0 → 100644
  Diff comments   View file @17094e8
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +
  2 +@import url(manage_contacts_list.css);
public/stylesheets/controller_friends.css
  Diff comments   View file @17094e8
1 1
2 -#content #manage_friends ul {  
3 - margin: 0px;  
4 - padding: 0px;  
5 - list-style: none;  
6 -}  
7 -  
8 -#content #manage_friends li {  
9 - float: left;  
10 - width: 100px;  
11 - height: 100px;  
12 - margin: 5px;  
13 - padding: 5px;  
14 - border: 2px solid #B8CFE7;  
15 - list-style: none;  
16 - overflow: hidden;  
17 - position: relative;  
18 -}  
19 -#content #manage_friends li:hover {  
20 - border: 2px solid #2A5896;  
21 - background: #729FCF;  
22 -}  
23 -  
24 -#content #manage_friends li center {  
25 - float: left;  
26 -}  
27 -  
28 -.profile-list img {  
29 - border: none;  
30 -}  
31 -  
32 -.profile-list a {  
33 - text-decoration: none;  
34 -}  
35 -  
36 -.profile-list .profile_link span {  
37 - width: 200px;  
38 - display: block;  
39 - overflow: hidden;  
40 -}  
41 -  
42 -#manage_friends .button-bar {  
43 - clear: both;  
44 - padding-top: 20px;  
45 -} 2 +@import url(manage_contacts_list.css);
46 3
47 #remove_friend .friend_picture { 4 #remove_friend .friend_picture {
48 float: left; 5 float: left;
public/stylesheets/manage_contacts_list.css 0 → 100644
  Diff comments   View file @17094e8
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
  1 +.profile-list {
  2 + margin: 0px;
  3 + padding: 0px;
  4 + list-style: none;
  5 +}
  6 +
  7 +.profile-list li {
  8 + float: left;
  9 + width: 100px;
  10 + height: 100px;
  11 + margin: 5px;
  12 + padding: 5px;
  13 + border: 2px solid #B8CFE7;
  14 + list-style: none;
  15 + overflow: hidden;
  16 + position: relative;
  17 +}
  18 +.profile-list li:hover {
  19 + border: 2px solid #2A5896;
  20 + background: #729FCF;
  21 +}
  22 +
  23 +.profile-list img {
  24 + border: none;
  25 +}
  26 +
  27 +.profile-list a.profile-link {
  28 + text-decoration: none;
  29 + text-align: center;
  30 + display: block;
  31 +}
  32 +.profile-list a.profile-link:hover {
  33 + color: #FFF;
  34 +}
  35 +
  36 +.profile-list .profile_link span {
  37 + width: 200px;
  38 + display: block;
  39 + overflow: hidden;
  40 +}
  41 +
  42 +.profile-list {
  43 + position: relative;
  44 +}
  45 +.profile-list .controll {
  46 + position: absolute;
  47 + top: 5px;
  48 + right: 0px;
  49 +}
  50 +.msie6 .profile-list .controll a {
  51 + display: block;
  52 + width: 0px;
  53 +}
  54 +
  55 +.button-bar {
  56 + clear: both;
  57 + padding-top: 20px;
  58 +}
  59 +