From 49aa9bd29b9f63e83f0ed09e80701d87b3a22494 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Thu, 2 Feb 2017 15:17:41 -0500
Subject: [PATCH] update footer and remove build version

---
 app/assets/javascripts/recordings.coffee | 2 +-
 app/helpers/application_helper.rb        | 6 ------
 app/views/layouts/application.html.erb   | 2 +-
 circle.yml                               | 1 -
 config/locales/en-us.yml                 | 2 +-
 scripts/set_version.sh                   | 3 ---
 6 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100755 scripts/set_version.sh

diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index 34a54e79..701394a1 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -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
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 928bf1c9..bacfc69a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -47,10 +47,4 @@ module ApplicationHelper
   def on_room_or_meeting_page?
     params[:id].present?
   end
-
-  def version
-    Greenlight::VERSION
-  rescue
-    'development'
-  end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1db824d3..1cd6131b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -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>
diff --git a/circle.yml b/circle.yml
index caf30c5c..5667afd2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -10,5 +10,4 @@ deployment:
   hub:
     branch: master
     commands:
-      - ./scripts/set_version.sh
       - ./scripts/build_image_master.sh
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index bf919df0..6c51afbc 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -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
diff --git a/scripts/set_version.sh b/scripts/set_version.sh
deleted file mode 100755
index 523e0e7f..00000000
--- a/scripts/set_version.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-echo "module Greenlight VERSION = ${CIRCLE_BUILD_NUM} end" >| $HOME/greenlight/app/lib/version.rb