From f6e31714ddebb8b444ba083fd05cfc7ebe04db1b Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@konecty.com>
Date: Mon, 24 Aug 2015 09:37:52 -0300
Subject: [PATCH 1/2] Setting: Layout Sidenav Footer

---
 client/stylesheets/base.less                           | 4 ++++
 client/views/admin/admin.html                          | 6 ++++++
 client/views/app/sideNav/sideNav.coffee                | 2 ++
 client/views/app/sideNav/sideNav.html                  | 5 +----
 i18n/en.i18n.json                                      | 2 ++
 packages/rocketchat-lib/settings/server/startup.coffee | 1 +
 6 files changed, 16 insertions(+), 4 deletions(-)

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 @@ <h3>{{#with group}}{{description}}{{/with}}</h3>
 										{{else}}
 											<input type="text" name="{{_id}}" value="{{value}}" />
 										{{/if}}
+										{{#if description}}
+											<small>{{description}}</small>
+										{{/if}}
 									</div>
 								</div>
 							{{/if}}
@@ -35,6 +38,9 @@ <h3>{{#with group}}{{description}}{{/with}}</h3>
 										<label><input type="radio" name="{{_id}}" value="1" checked="{{$eq value true}}" /> {{_ "True"}}</label>
 										<label><input type="radio" name="{{_id}}" value="0" checked="{{$eq value false}}" /> {{_ "False"}}</label>
 									</div>
+									{{#if description}}
+										<small>{{description}}</small>
+									{{/if}}
 								</div>
 							{{/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 @@ <h3 class="open-admin">
 			<span class="arrow bottom"></span>
 		{{/if}}
 		<footer class="footer">
-			<a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank">
-				<img src="/images/logo/logo.svg?v=3" />
-				<small><i class="icon-github-circled"></i> {{_ "Fork_it_on_github"}}</small>
-			</a>
+			{{{footer}}}
 		</footer>
 	</aside>
 </template>
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..d4fa5519f8e68 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 <br> 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 <br> 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 <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true }
+	RocketChat.settings.add 'Layout_Sidenav_Footer', '<a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="/images/logo/logo.svg?v=3" /> <small><i class="icon-github-circled"></i> {{_ "Fork_it_on_github"}}</small> </a>', { 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'))

From 0aa98c40b2344aa7d6e61dd396532228871bff24 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 24 Aug 2015 11:34:23 -0300
Subject: [PATCH 2/2] Fork it on github

---
 packages/rocketchat-lib/settings/server/startup.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/settings/server/startup.coffee b/packages/rocketchat-lib/settings/server/startup.coffee
index d4fa5519f8e68..d2cc1de78325d 100644
--- a/packages/rocketchat-lib/settings/server/startup.coffee
+++ b/packages/rocketchat-lib/settings/server/startup.coffee
@@ -70,7 +70,7 @@ Meteor.startup ->
 	RocketChat.settings.add 'Layout_Home_Body', 'Welcome to Rocket.Chat <br> 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 <br> 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 <br> Go to APP SETTINGS -> Layout to customize this page.', { type: 'string', multiline: true, group: 'Layout', public: true }
-	RocketChat.settings.add 'Layout_Sidenav_Footer', '<a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="/images/logo/logo.svg?v=3" /> <small><i class="icon-github-circled"></i> {{_ "Fork_it_on_github"}}</small> </a>', { type: 'string', group: 'Layout', public: true, i18nDescription: 'Layout_Sidenav_Footer_description' }
+	RocketChat.settings.add 'Layout_Sidenav_Footer', '<a href="https://github.com/RocketChat/Rocket.Chat" class="logo" target="_blank"> <img src="/images/logo/logo.svg?v=3" /> <small><i class="icon-github-circled"></i> Fork it on github</small> </a>', { 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'))