Skip to content

Setting: Layout Sidenav Footer #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
engelgabriel merged 2 commits into from
Aug 24, 2015
Merged

Setting: Layout Sidenav Footer #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6e3171
Setting: Layout Sidenav Footer
marceloschmidt Aug 24, 2015
0aa98c4
Fork it on github
engelgabriel Aug 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions client/stylesheets/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,10 @@ blockquote {
fieldset {
display: block;
margin-bottom: 40px;

small {
font-size: 11px;
}
}
.submit {
margin-top: 20px;
Expand Down
6 changes: 6 additions & 0 deletions client/views/admin/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand All @@ -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}}
Expand Down
2 changes: 2 additions & 0 deletions client/views/app/sideNav/sideNav.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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': ->
Expand Down
5 changes: 1 addition & 4 deletions client/views/app/sideNav/sideNav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-lib/settings/server/startup.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down