Add an option to show warning in a setting

pull/1682/head
Rodrigo Nascimento 10 years ago
parent 7736e172b5
commit 12402e80de
  1. 1
      i18n/en.i18n.json
  2. 8
      packages/rocketchat-theme/assets/stylesheets/base.less
  3. 3
      packages/rocketchat-ui-admin/admin/admin.html

@ -463,6 +463,7 @@
"Submit" : "Submit",
"Success" : "Success",
"The_field_is_required" : "The field %s is required.",
"The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server" : "The image resize will not work because we can not detect ImageMagick or GraphicsMagick installed in your server.",
"The_server_will_restart_in_s_seconds" : "The server will restart in %s seconds",
"The_setting_s_is_configured_to_s_and_you_are_accessing_from_s" : "The setting <strong>%s</strong> is configured to <strong>%s</strong> and you are accessing from <strong>%s</strong>!",
"There_is_no_integrations" : "There is no integrations",

@ -1813,6 +1813,14 @@ a.github-fork {
color: #888;
padding: 5px;
}
.settings-alert {
background-color: rgb(255, 255, 230);
border: 1px solid rgb(255, 242, 196);
color: orange;
font-weight: bold;
padding: 5px;
}
}
}
}

@ -101,6 +101,9 @@
{{#if description}}
<div class="settings-description">{{{description}}}</div>
{{/if}}
{{#if alert}}
<div class="settings-alert"><i class="icon-attention"></i>{{{_ alert}}}</div>
{{/if}}
</div>
</div>
{{/each}}

Loading…
Cancel
Save