Download as
Browse Code »

Commit 63d37eb00e7439507ced22fc7224950f7d105f6f

Authored by Antonio Terceiro
2 parents 074f8e5f bad1cc53
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Merge commit 'bad1cc537d710e03288c446a54c06e55df9994c5' into v0.11.x

Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
app/views/memberships/index.rhtml
  Diff comments   View file @63d37eb
... ... @@ -2,6 +2,12 @@
2 2  
3 3 <h1><%= _('Manage my groups') %></h1>
4 4  
  5 +<% button_bar do %>
  6 + <%= button(:add, _('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
  7 + <%= button(:add, __('Register a new Enterprise'), :controller => 'enterprise_registration') if environment.regions.any?{|i| i.has_validator?} %>
  8 + <%= button :back, _('Go back'), :controller => 'profile_editor' %>
  9 +<% end %>
  10 +
5 11 <ul>
6 12 <% for membership in @memberships %>
7 13 <li>
... ... @@ -25,10 +31,4 @@
25 31 <% end %>
26 32 </ul>
27 33  
28   -<% button_bar do %>
29   - <%= button(:add, _('Create a new community'), :controller => 'memberships', :action => 'new_community') %>
30   - <%= button(:add, __('Register a new Enterprise'), :controller => 'enterprise_registration') if environment.regions.any?{|i| i.has_validator?} %>
31   - <%= button :back, _('Go back'), :controller => 'profile_editor' %>
32   -<% end %>
33   -
34 34 </div>
... ...
public/stylesheets/button.css
  Diff comments   View file @63d37eb
... ... @@ -69,6 +69,7 @@ input.button.with-text:hover {
69 69  
70 70 .button-bar {
71 71 margin-top: 1em;
  72 + margin-bottom: 1em;
72 73 }
73 74  
74 75 .button-bar .button {
... ...