Commit 86d9f95208e03cdedceafb26da4f03e338b073bf
Committed by
Daniela Feitosa
1 parent
b8b38926
Exists in
master
and in
31 other branches
Add join leave button on communities page
This closes #303 Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Juliana <julianahdesousa@gmail.com>
Showing
2 changed files
with
19 additions
and
4 deletions
Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
... | ... | @@ -8,6 +8,19 @@ |
8 | 8 | padding-bottom:30px; |
9 | 9 | margin-bottom: 30px; |
10 | 10 | } |
11 | + | |
12 | +.action-profile-index #content .page-profile-header{ | |
13 | + margin-bottom: 40px; | |
14 | + border-bottom: 1px solid #D3D6DE; | |
15 | + font-family: Arial; | |
16 | + height: 40px; | |
17 | +} | |
18 | + | |
19 | +.action-profile-index .page-profile-header .control-panel-button{ | |
20 | + float:left; | |
21 | + margin-right: 4px; | |
22 | +} | |
23 | + | |
11 | 24 | .action-profile-index .page-profile-header .join-leave-button.require-login-popup{ |
12 | 25 | float:left; |
13 | 26 | width: 35%; |
... | ... | @@ -838,10 +851,10 @@ float: left; |
838 | 851 | } |
839 | 852 | |
840 | 853 | .action-profile-members #content .page-members-header{ |
841 | - margin-bottom: 45px; | |
854 | + margin-bottom: 40px; | |
842 | 855 | border-bottom: 1px solid #D3D6DE; |
843 | 856 | font-family: Arial; |
844 | - height: 150px; | |
857 | + height: 140px; | |
845 | 858 | } |
846 | 859 | |
847 | 860 | .action-profile-members #content .page-members-header h1{ |
... | ... | @@ -857,7 +870,6 @@ float: left; |
857 | 870 | .action-profile-members #content .page-members-header ul li{ |
858 | 871 | float:left; |
859 | 872 | margin:8px 0px 0px 0px; |
860 | - width: 36%; | |
861 | 873 | |
862 | 874 | } |
863 | 875 | ... | ... |
src/noosfero-spb/software_communities/views/profile/index.html.erb
... | ... | @@ -11,12 +11,15 @@ |
11 | 11 | <% end %> |
12 | 12 | |
13 | 13 | <div class="page-profile-header"> |
14 | - <%= render "blocks/profile_info_actions/join_leave_community" if profile.class == "Community" %> | |
14 | + | |
15 | 15 | <% if !user.nil? && user.has_permission?('edit_profile', profile) %> |
16 | 16 | <div class="control-panel-button"> |
17 | 17 | <%= button :control_panel, _('Control Panel'), profile.admin_url %> |
18 | 18 | </div> |
19 | 19 | <% end %> |
20 | + <% if profile.is_a? Community %> | |
21 | + <%= render "blocks/profile_info_actions/join_leave_community" %> | |
22 | + <% end %> | |
20 | 23 | </div> |
21 | 24 | |
22 | 25 | <% if @profile.public? || (logged_in? && current_person.follows?(@profile)) %> | ... | ... |
-
mentioned in commit 0f55b41236099c5ca3491e18ecee52a6c1fa4812