From 12402e80dec349de99b29176d148a5dc1db1a323 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 16 Dec 2015 13:55:42 -0200
Subject: [PATCH] Add an option to show warning in a setting

---
 i18n/en.i18n.json                                      | 1 +
 packages/rocketchat-theme/assets/stylesheets/base.less | 8 ++++++++
 packages/rocketchat-ui-admin/admin/admin.html          | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index e761fe82684..cbe1bda761c 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -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",
diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index dfae174ff75..5c1811a02ba 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -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;
+				}
 			}
 		}
 	}
diff --git a/packages/rocketchat-ui-admin/admin/admin.html b/packages/rocketchat-ui-admin/admin/admin.html
index 492d539321b..d7753213e5d 100644
--- a/packages/rocketchat-ui-admin/admin/admin.html
+++ b/packages/rocketchat-ui-admin/admin/admin.html
@@ -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}}