Download as
Browse Code »

Commit 74a2b88a983841f0f1e0cfca692e7e18d00f1b3f

Authored by Antonio Terceiro
1 parent 2c81d81a
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

ActionItem1126: better formatting

Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
app/views/profile_editor/_organization.rhtml
  Diff comments   View file @74a2b88
... ... @@ -45,10 +45,10 @@
45 45 <%= labelled_form_field( _('Address'),
46 46 '<code>' + url_for(profile.url).gsub(/#{profile.identifier}$/, '') +
47 47 text_field(:profile_data, :identifier, :onchange => "warn_value_change(this)", :size => 15) + '</code>' +
48   - content_tag('div', '<strong>' + _('WARNING:') + '</strong> ' + _("the address was changed, this might break any external links to this profile and articles in this profile, you really want to change? ") +
  48 + content_tag('div', '<strong>' + _('WARNING!') + '</strong> ' + _("You are about to change the address, and this will break external links to the homepage or to content inside it. Do you really want to change? ") +
49 49 '<div>' + button_to_function(:ok, _("Yes"), 'hide_warning()') + ' ' +
50 50 button_to_function(:cancel, _('No'), '$("profile_data_identifier").value = $("old_profile_identifier").value; hide_warning()') + '</div>',
51   - :id => 'identifier-change-confirmation'
  51 + :id => 'identifier-change-confirmation', :style => 'display: none;'
52 52 )
53 53 )
54 54 %>
... ...
public/stylesheets/controller_profile_editor.css
  Diff comments   View file @74a2b88
... ... @@ -32,14 +32,15 @@
32 32 }
33 33  
34 34 #identifier-change-confirmation {
35   - background-color: #EE4444;
36   - padding: 3px 20px 3px 20px;
  35 + background-color: #ef2929;
  36 + border: 6px solid #a40000;
  37 + padding: 20px;
37 38 margin: 5px 30px 10px 30px;
38 39 }
39 40  
40 41 #identifier-change-confirmation div {
41 42 text-align: right;
42   - padding: 0px 10px 5px 0px;
  43 + padding: 20px 10px 0px 0px;
43 44 }
44 45  
45 46 code input {
... ...