forked from External/greenlight
		
	Merge pull request #104 from zach-chai/update_footer
update footer and remove build version
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -47,10 +47,4 @@ module ApplicationHelper
 | 
			
		||||
  def on_room_or_meeting_page?
 | 
			
		||||
    params[:id].present?
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def version
 | 
			
		||||
    Greenlight::VERSION
 | 
			
		||||
  rescue
 | 
			
		||||
    'development'
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -10,5 +10,4 @@ deployment:
 | 
			
		||||
  hub:
 | 
			
		||||
    branch: master
 | 
			
		||||
    commands:
 | 
			
		||||
      - ./scripts/set_version.sh
 | 
			
		||||
      - ./scripts/build_image_master.sh
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +0,0 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
echo "module Greenlight VERSION = ${CIRCLE_BUILD_NUM} end" >| $HOME/greenlight/app/lib/version.rb
 | 
			
		||||
		Reference in New Issue
	
	Block a user