diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 66213d85f38fe..753b07a76386b 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -230,6 +230,10 @@ blockquote {
fieldset {
display: block;
margin-bottom: 40px;
+
+ small {
+ font-size: 11px;
+ }
}
.submit {
margin-top: 20px;
diff --git a/client/views/admin/admin.html b/client/views/admin/admin.html
index cab68bbb7adab..4ae6d0699ce4e 100644
--- a/client/views/admin/admin.html
+++ b/client/views/admin/admin.html
@@ -25,6 +25,9 @@
{{#with group}}{{description}}{{/with}}
{{else}}
{{/if}}
+ {{#if description}}
+ {{description}}
+ {{/if}}
{{/if}}
@@ -35,6 +38,9 @@ {{#with group}}{{description}}{{/with}}
+ {{#if description}}
+ {{description}}
+ {{/if}}
{{/if}}
{{/each}}
diff --git a/client/views/app/sideNav/sideNav.coffee b/client/views/app/sideNav/sideNav.coffee
index 37439c3a13840..312e9b625a470 100644
--- a/client/views/app/sideNav/sideNav.coffee
+++ b/client/views/app/sideNav/sideNav.coffee
@@ -5,6 +5,8 @@ Template.sideNav.helpers
return SideNav.getFlex().template
flexData: ->
return SideNav.getFlex().data
+ footer: ->
+ return RocketChat.settings.get 'Layout_Sidenav_Footer'
Template.sideNav.events
'click .close-flex': ->
diff --git a/client/views/app/sideNav/sideNav.html b/client/views/app/sideNav/sideNav.html
index ab2ed2253ceab..b7f222b0707e4 100644
--- a/client/views/app/sideNav/sideNav.html
+++ b/client/views/app/sideNav/sideNav.html
@@ -28,10 +28,7 @@
{{/if}}
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 435293146159c..c14d4b0ef8f6b 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -111,6 +111,8 @@
"Last_message" : "Last message",
"Layout_Home_Body": "Home Body",
"Layout_Home_Title": "Home Title",
+ "Layout_Sidenav_Footer": "Side Navigation Footer",
+ "Layout_Sidenav_Footer_description": "Footer size is 260x70",
"Leave_room" : "Leave room",
"line" : "line",
"Load_more" : "Load more",
diff --git a/packages/rocketchat-lib/settings/server/startup.coffee b/packages/rocketchat-lib/settings/server/startup.coffee
index cf64c9043cf5d..d2cc1de78325d 100644
--- a/packages/rocketchat-lib/settings/server/startup.coffee
+++ b/packages/rocketchat-lib/settings/server/startup.coffee
@@ -70,6 +70,7 @@ Meteor.startup ->
RocketChat.settings.add 'Layout_Home_Body', 'Welcome to Rocket.Chat
Go to APP SETTINGS -> Layout to customize this intro.', { type: 'string', multiline: true, group: 'Layout', public: true }
RocketChat.settings.add 'Layout_Terms_of_Service', 'Terms of Service
Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true }
RocketChat.settings.add 'Layout_Privacy_Policy', 'Privacy Policy
Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true }
+ RocketChat.settings.add 'Layout_Sidenav_Footer', '
Fork it on github ', { type: 'string', group: 'Layout', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
if process?.env? and not process.env['MAIL_URL']? and RocketChat.settings.get('SMTP_Host') and RocketChat.settings.get('SMTP_Username') and RocketChat.settings.get('SMTP_Password')
process.env['MAIL_URL'] = "smtp://" + encodeURIComponent(RocketChat.settings.get('SMTP_Username')) + ':' + encodeURIComponent(RocketChat.settings.get('SMTP_Password')) + '@' + encodeURIComponent(RocketChat.settings.get('SMTP_Host'))