Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Moved configuration to Concerto admin settings

  • Loading branch information...
commit 2555f4fc752228df1530bab780da540e56c2eb06 1 parent ce80cf4
@gbprz gbprz authored
View
19 Gemfile-plugins
@@ -1,9 +1,18 @@
-gem 'concerto_simple_rss'
-gem 'concerto_remote_video'
+gem "concerto_weather"
-gem 'concerto_weather'
+gem "concerto_remote_video"
-gem 'concerto_iframe'
+gem "concerto_simple_rss"
-gem 'concerto_calendar'
+gem "concerto_iframe"
+
+gem "concerto_calendar"
+
+gem "concerto-hardware"
+
+gem "concerto_audio"
+
+gem "concerto_template_scheduling"
+
+gem "concerto-emergency-broadcast", "0.0.1", :path => "/home/gabe/Programming/spring_2014/concerto-emergency"
View
30 Gemfile.lock
@@ -1,3 +1,10 @@
+PATH
+ remote: ../concerto-emergency
+ specs:
+ concerto-emergency-broadcast (0.0.1)
+ concerto_simple_rss
+ rails (~> 3.2.9)
+
GEM
remote: https://rubygems.org/
specs:
@@ -39,7 +46,7 @@ GEM
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
bcrypt-ruby (3.1.2)
- bootstrap-datepicker-rails (1.1.1.11)
+ bootstrap-datepicker-rails (1.3.0.1)
railties (>= 3.0)
builder (3.0.4)
cancan (1.6.10)
@@ -53,6 +60,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.7.0)
+ concerto-hardware (0.0.5)
+ rails (~> 3.2.9)
+ concerto_audio (0.0.2)
+ rails (~> 3.2.12)
concerto_calendar (0.0.2)
google-api-client
icalendar
@@ -64,6 +75,10 @@ GEM
concerto_simple_rss (0.1)
rails (~> 3.2.11)
ruby-xslt (~> 0.9)
+ concerto_template_scheduling (0.0.3)
+ ice_cube
+ rails (~> 3.2.16)
+ recurring_select (~> 1.2.1rc3)
concerto_weather (0.0.7)
rails (~> 3.2.12)
connection_pool (1.2.0)
@@ -105,6 +120,7 @@ GEM
hike (1.2.3)
i18n (0.6.9)
icalendar (1.5.0)
+ ice_cube (0.11.3)
journey (1.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
@@ -160,6 +176,12 @@ GEM
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
+ recurring_select (1.2.1)
+ coffee-rails (>= 3.1)
+ ice_cube (>= 0.11)
+ jquery-rails (>= 3.0)
+ rails (>= 3.2)
+ sass-rails (>= 3.1)
redcarpet (2.3.0)
ref (1.0.5)
retriable (1.4.1)
@@ -203,7 +225,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- turbolinks (2.2.0)
+ turbolinks (2.2.1)
coffee-rails
twitter-bootstrap-rails-confirm (1.0.2)
tzinfo (0.3.38)
@@ -224,10 +246,14 @@ DEPENDENCIES
cancan
clockwork (= 0.7.0)
coffee-rails (~> 3.2.1)
+ concerto-emergency-broadcast (= 0.0.1)!
+ concerto-hardware
+ concerto_audio
concerto_calendar
concerto_iframe
concerto_remote_video
concerto_simple_rss
+ concerto_template_scheduling
concerto_weather
delayed_job_active_record
devise (~> 3.0.0)
View
4 config/concerto.yml
@@ -1,5 +1,5 @@
-automatic_bundle_installation: true
+automatic_bundle_installation: false
@zr2d2 Collaborator
zr2d2 added a note

I think we want this to be true by default

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
automatic_database_installation: true
compile_production_assets: true
airbrake_enabled_initially: true
-bundle_install_options: "--path vendor/bundle"
+bundle_install_options: "--path vendor/bundle"
View
5 config/concerto.yml~
@@ -0,0 +1,5 @@
+automatic_bundle_installation: true
+automatic_database_installation: true
+compile_production_assets: true
+airbrake_enabled_initially: true
+bundle_install_options: "--path vendor/bundle"
View
13 db/migrate/20140206214658_create_concerto_hardware_players.hardware.rb
@@ -0,0 +1,13 @@
+# This migration comes from hardware (originally 20121220000000)
+class CreateConcertoHardwarePlayers < ActiveRecord::Migration
+ def change
+ create_table :concerto_hardware_players do |t|
+ t.string :secret
+ t.string :ip_address
+ t.integer :screen_id
+ t.boolean :activated
+
+ t.timestamps
+ end
+ end
+end
View
7 db/migrate/20140206214659_add_updates_to_concerto_hardware_players.hardware.rb
@@ -0,0 +1,7 @@
+# This migration comes from hardware (originally 20131127201048)
+class AddUpdatesToConcertoHardwarePlayers < ActiveRecord::Migration
+ def change
+ remove_column :concerto_hardware_players, :secret
+ add_column :concerto_hardware_players, :screen_on_off, :string
+ end
+end
View
14 db/migrate/20140206214660_create_concerto_template_scheduling_schedules.template_scheduling.rb
@@ -0,0 +1,14 @@
+# This migration comes from template_scheduling (originally 20140118205731)
+class CreateConcertoTemplateSchedulingSchedules < ActiveRecord::Migration
+ def change
+ create_table :concerto_template_scheduling_schedules do |t|
+ t.integer :screen_id
+ t.integer :template_id
+ t.datetime :start_time
+ t.datetime :end_time
+ t.text :data
+
+ t.timestamps
+ end
+ end
+end
View
11 db/migrate/20140206214661_create_concerto_emergency_broadcast_ems_configs.ems.rb
@@ -0,0 +1,11 @@
+# This migration comes from ems (originally 20140127062916)
+class CreateConcertoEmergencyBroadcastEmsConfigs < ActiveRecord::Migration
+ def change
+ create_table :concerto_emergency_broadcast_ems_configs do |t|
+ t.integer :template_id
+ t.integer :feed_id
+
+ t.timestamps
+ end
+ end
+end
View
1  public/frontend_js/content_types.js
@@ -14,3 +14,4 @@ goog.require('concerto.frontend.Content.Ticker');
goog.require('concerto.frontend.Content.RemoteVideo');
goog.require('concerto.frontend.Content.Iframe');
goog.require('concerto.frontend.Content.Audio');
+goog.require('concerto.frontend.Content.EmergencyAlert');
View
64 public/frontend_js/contents/emergency_alert.js
@@ -0,0 +1,64 @@
+goog.provide('concerto.frontend.Content.EmergencyAlert');
+
+goog.require('concerto.frontend.Content');
+goog.require('concerto.frontend.ContentTypeRegistry');
+goog.require('goog.Uri');
+goog.require('goog.dom');
+goog.require('goog.events');
+goog.require('goog.events.EventType');
+goog.require('goog.style');
+
+
+/**
+ * EmergencyAlerts.
+ *
+ * @param {Object} data Properties for this piece of content.
+ * @constructor
+ * @extends {concerto.frontend.Content}
+ */
+concerto.frontend.Content.EmergencyAlert = function(data) {
+ concerto.frontend.Content.call(this, data);
+
+ /**
+ * The height of the field the alert message is being shown in.
+ * @type {number}
+ * @private
+ */
+ this.field_height_ = data.field.size.height;
+
+ /**
+ * The width of the field the alert message is being shown in.
+ * @type {number}
+ * @private
+ */
+ this.field_width_ = data.field.size.width;
+
+ /**
+ * The alert message being displayed.
+ * @type {Object}
+ */
+ this.alert = data['render_details']['alert'];
+
+};
+goog.inherits(concerto.frontend.Content.EmergencyAlert, concerto.frontend.Content);
+
+concerto.frontend.ContentTypeRegistry['EmergencyAlert'] = concerto.frontend.Content.EmergencyAlert;
+
+/**
+ * Load the text.
+ * @private
+ */
+concerto.frontend.Content.EmergencyAlert.prototype.load_ = function() {
+
+ console.log('Loading Emergency Alert ... ');
+
+ goog.dom.removeChildren(this.div_);
+ var alert_fragment = goog.dom.htmlToDocumentFragment('<div style="background-color: red;">' + this.alert + '</div>');
+ goog.dom.appendChild(this.div_, alert_fragment);
+
+ this.div_ = concerto.frontend.Helpers.Autofit(this.div_, this.field_width_,
+ this.field_height_);
+
+ this.finishLoad();
+
+};
View
491 public/frontend_js/frontend.js
117 additions, 374 deletions not shown
@zr2d2
Collaborator

I think we want this to be true by default

Please sign in to comment.
Something went wrong with that request. Please try again.