Commit
4cb862a010ac4119480ab94248e95950e9bbb420
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 remote-tracking branch 'participa/AI2923-block_name_in_edit_mode' into next
1
| <div class="block-config-options <%= @block.class.name %>-options"> |
1
| <div class="block-config-options <%= @block.class.name %>-options"> |
2
| - <h2 class="title"><%= _('Editing block') %></h2> |
2
| + <h2><%= _(@block.class.description) %></h2> |
3
| |
3
| |
4
| <% form_tag(:action => 'save', :id => @block.id) do %> |
4
| <% form_tag(:action => 'save', :id => @block.id) do %> |
5
| |
5
| |