Skip to content
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.

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

update footer and remove build version #104

Merged
merged 1 commit into from
Feb 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/assets/javascripts/recordings.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class @Recordings

draw: ->
if !@isOwner()
@table.api().columns(5).search('true')
@table.api().columns(6).search('true')
@table.api().columns.adjust().draw()

# refresh the recordings from the server
Expand Down
6 changes: 0 additions & 6 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,4 @@ def omniauth_providers_configured(provider = nil)
def on_room_or_meeting_page?
params[:id].present?
end

def version
Greenlight::VERSION
rescue
'development'
end
end
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.

<!-- Footer -->
<div class='footer text-center'>
<%= t('footer_html', greenlight_link: link_to('Greenlight', 'https://github.com/bigbluebutton/greenlight', target: "_blank"), version: version, bbb_link: link_to('BigBlueButton', 'http://bigbluebutton.org/', target: "_blank")) %>
<%= t('footer_html', bbb_link: link_to('BigBlueButton', 'http://bigbluebutton.org/', target: "_blank")) %>
</div>
<!-- End of Footer -->
</body>
Expand Down
1 change: 0 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ deployment:
hub:
branch: master
commands:
- ./scripts/set_version.sh
- ./scripts/build_image_master.sh
2 changes: 1 addition & 1 deletion config/locales/en-us.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ en-US:
end: End
enter_name: Enter your name
enter_meeting_name: Enter a meeting name to start
footer_html: Powered by %{bbb_link}
greet_user: Welcome, %{name}
greet_guest: Welcome to %{name} Meeting Space
hi_all: Hi Everyone
Expand Down Expand Up @@ -100,7 +101,6 @@ en-US:
phrase2: "Access the following website to view it and publish to other users: %{url}"
subject: "Your recording is ready!"
past_recordings: Past Recordings
footer_html: "%{greenlight_link} build %{version}, Powered by %{bbb_link}"
presentation: Presentation
previously_joined_meetings: Previously Joined Meetings
return_to_room: Return to your personal room
Expand Down
3 changes: 0 additions & 3 deletions scripts/set_version.sh

This file was deleted.