diff --git a/Gemfile b/Gemfile index 5478709..34d58f1 100644 --- a/Gemfile +++ b/Gemfile @@ -25,6 +25,7 @@ gem 'bootstrap-tagsinput-rails' gem 'cocoon', :git => 'git://github.com/nathanvda/cocoon' gem 'zeroclipboard-rails' gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' +gem 'asset_sync' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index a5f1e37..65144c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,6 +55,9 @@ GEM builder multi_json arel (5.0.1.20140414130214) + asset_sync (1.0.0) + activemodel + fog (>= 1.8.0) awesome_print (1.2.0) bcrypt (3.1.7) better_errors (1.1.0) @@ -108,6 +111,7 @@ GEM email_validator (1.4.0) activemodel erubis (2.7.0) + excon (0.33.0) execjs (2.0.2) factory_girl (4.4.0) activesupport (>= 3.0.0) @@ -115,9 +119,27 @@ GEM factory_girl (~> 4.4.0) railties (>= 3.0.0) flutie (2.0.0) + fog (1.22.0) + fog-brightbox + fog-core (~> 1.21, >= 1.21.1) + fog-json + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.2) + fog-core + fog-json + fog-core (1.22.0) + builder + excon (~> 0.33) + formatador (~> 0.2) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-json (1.0.0) + multi_json (~> 1.0) foreman (0.63.0) dotenv (>= 0.7) thor (>= 0.13.6) + formatador (0.2.4) high_voltage (2.1.0) hike (1.2.3) i18n (0.6.9) @@ -139,6 +161,9 @@ GEM mini_portile (0.5.3) minitest (5.3.3) multi_json (1.9.3) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (2.9.0) nokogiri (1.6.1) mini_portile (~> 0.5.0) orm_adapter (0.5.0) @@ -251,6 +276,7 @@ PLATFORMS DEPENDENCIES airbrake annotate! + asset_sync awesome_print better_errors binding_of_caller diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb index c2eacaa..a8d2324 100644 --- a/app/views/campaigns/_videolisting.html.erb +++ b/app/views/campaigns/_videolisting.html.erb @@ -23,6 +23,12 @@ <%= videolisting.clientprovidedscript %>
<% end %> + <% unless videolisting.toneofvideo.blank? %> +Tone of Video
+ <%= videolisting.toneofvideo %>
Production Notes
diff --git a/config/application.rb b/config/application.rb
index 3a18230..c60b2de 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,6 +28,9 @@ module Vidpush
end
config.autoload_paths += %W(#{config.root}/lib)
config.serve_static_assets = true
+ config.assets.enabled = true
+ config.assets.digest = true
+ config.assets.precompile += %w( campaign.css )
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b59092f..c98c60c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -60,6 +60,8 @@ Vidpush::Application.configure do
# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = "http://assets.example.com"
+ config.action_controller.asset_host = "http://propel-vidpush-staging.s3.amazonaws.com"
+
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
diff --git a/public/assets/campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css b/public/assets/campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css
new file mode 100644
index 0000000..b6c3f98
--- /dev/null
+++ b/public/assets/campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css
@@ -0,0 +1,124 @@
+/* line 1, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+body {
+ margin-top: 50px;
+}
+
+/* line 5, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+h2 {
+ margin-top: 0;
+}
+
+/* line 9, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+strong, label, th {
+ color: #395C84;
+}
+
+/* line 13, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+ul {
+ list-style: none;
+ padding-left: 0;
+}
+
+/* line 18, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.help-block {
+ font-size: .85em;
+}
+
+/* line 22, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.alert {
+ margin-bottom: 0;
+ margin-top: 1.5em;
+ padding: 5px 10px;
+}
+
+/* line 28, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.alert-form {
+ margin-top: .5em !important;
+}
+
+/* line 35, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.videolisting label {
+ color: #fff;
+}
+/* line 44, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.videolisting .nested-fields:nth-of-type(odd), .videolisting li.blue-box:nth-of-type(odd),
+.videolisting .nested-fields:nth-of-type(even), .videolisting li.blue-box:nth-of-type(even) {
+ -webkit-border-radius: 1em;
+ -moz-border-radius: 1em;
+ border-radius: 1em;
+ margin-bottom: 1em;
+ padding: 1em;
+}
+/* line 50, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.videolisting .nested-fields:nth-of-type(odd) .help-block, .videolisting .nested-fields:nth-of-type(odd) strong, .videolisting .nested-fields:nth-of-type(odd) p, .videolisting li.blue-box:nth-of-type(odd) .help-block, .videolisting li.blue-box:nth-of-type(odd) strong, .videolisting li.blue-box:nth-of-type(odd) p,
+.videolisting .nested-fields:nth-of-type(even) .help-block,
+.videolisting .nested-fields:nth-of-type(even) strong,
+.videolisting .nested-fields:nth-of-type(even) p, .videolisting li.blue-box:nth-of-type(even) .help-block, .videolisting li.blue-box:nth-of-type(even) strong, .videolisting li.blue-box:nth-of-type(even) p {
+ color: #ffffff;
+}
+/* line 55, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.videolisting .nested-fields:nth-of-type(odd), .videolisting li.blue-box:nth-of-type(odd) {
+ background-color: #395C84;
+}
+/* line 59, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.videolisting .nested-fields:nth-of-type(even), .videolisting li.blue-box:nth-of-type(even) {
+ background-color: #4875a8;
+}
+/* line 64, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.videolisting .remove-video a {
+ color: #ffffff;
+ font-weight: bold;
+}
+
+/* line 73, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns input, .campaigns select, .campaigns textarea {
+ width: 100%;
+}
+/* line 76, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns input[type="submit"] {
+ margin-bottom: 1em;
+ width: auto;
+}
+/* line 80, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns textarea {
+ height: 5em;
+}
+/* line 83, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns .control-group {
+ margin-bottom: 1em;
+}
+/* line 100, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns span.tag.label.label-info {
+ display: block;
+ margin-bottom: 1px;
+}
+/* line 104, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns span.tag.label.label-info .tag-item {
+ width: 90%;
+ white-space: -moz-pre-wrap !important;
+ /* Mozilla, since 1999 */
+ white-space: -pre-wrap;
+ /* Opera 4-6 */
+ white-space: -o-pre-wrap;
+ /* Opera 7 */
+ white-space: pre-wrap;
+ /* css-3 */
+ word-wrap: break-word;
+ /* Internet Explorer 5.5+ */
+ word-break: break-all;
+ white-space: normal;
+}
+/* line 116, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+.campaigns div.bootstrap-tagsinput {
+ width: 100%;
+}
+
+/* line 121, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+#error_explanation ul {
+ display: none;
+}
+
+/* line 125, /Users/tsouza/RubymineProjects/vidpush/app/assets/stylesheets/campaign.css.scss */
+span.help-inline {
+ color: #f00;
+}
diff --git a/public/assets/campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css.gz b/public/assets/campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css.gz
new file mode 100644
index 0000000..fb088c7
Binary files /dev/null and b/public/assets/campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css.gz differ
diff --git a/public/assets/manifest-918d0c6735e6eef5b0049af2cde0ae98.json b/public/assets/manifest-918d0c6735e6eef5b0049af2cde0ae98.json
index de7b9e2..f8b7e6a 100644
--- a/public/assets/manifest-918d0c6735e6eef5b0049af2cde0ae98.json
+++ b/public/assets/manifest-918d0c6735e6eef5b0049af2cde0ae98.json
@@ -1 +1 @@
-{"files":{"favicon-0b96b9f9769906608e2990070c6c8da7.png":{"logical_path":"favicon.png","mtime":"2014-04-29T11:00:35-04:00","size":313,"digest":"0b96b9f9769906608e2990070c6c8da7"},"favicon-2829d6420e65851cedf6f81806e44cae.pyxel":{"logical_path":"favicon.pyxel","mtime":"2014-04-29T11:01:10-04:00","size":952,"digest":"2829d6420e65851cedf6f81806e44cae"},"application-2e6c9221e94ecb3c0b531f05fc48c63c.js":{"logical_path":"application.js","mtime":"2014-04-28T14:08:35-04:00","size":352852,"digest":"2e6c9221e94ecb3c0b531f05fc48c63c"},"application-91b092019c3f955537c3426b563d8377.css":{"logical_path":"application.css","mtime":"2014-04-25T16:04:37-04:00","size":291545,"digest":"91b092019c3f955537c3426b563d8377"},"ZeroClipboard-6746e26b454c90c4d1b61f81710b7b0e.swf":{"logical_path":"ZeroClipboard.swf","mtime":"2014-04-28T13:56:23-04:00","size":1891,"digest":"6746e26b454c90c4d1b61f81710b7b0e"},"bootstrap/glyphicons-halflings-regular-fe255aca45c0f6e7c8b2a1ed7c7a5274.eot":{"logical_path":"bootstrap/glyphicons-halflings-regular.eot","mtime":"2014-04-21T15:21:30-04:00","size":20290,"digest":"fe255aca45c0f6e7c8b2a1ed7c7a5274"},"bootstrap/glyphicons-halflings-regular-f61f75238afd91ceeef4a5e4c639ead4.svg":{"logical_path":"bootstrap/glyphicons-halflings-regular.svg","mtime":"2014-04-21T15:21:30-04:00","size":62850,"digest":"f61f75238afd91ceeef4a5e4c639ead4"},"bootstrap/glyphicons-halflings-regular-3e35c7e527383fc6fc479c17111469de.ttf":{"logical_path":"bootstrap/glyphicons-halflings-regular.ttf","mtime":"2014-04-21T15:21:30-04:00","size":41236,"digest":"3e35c7e527383fc6fc479c17111469de"},"bootstrap/glyphicons-halflings-regular-483c8aa83c1cae07664b1c959523d062.woff":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff","mtime":"2014-04-21T15:21:30-04:00","size":23292,"digest":"483c8aa83c1cae07664b1c959523d062"}},"assets":{"favicon.png":"favicon-0b96b9f9769906608e2990070c6c8da7.png","favicon.pyxel":"favicon-2829d6420e65851cedf6f81806e44cae.pyxel","application.js":"application-2e6c9221e94ecb3c0b531f05fc48c63c.js","application.css":"application-91b092019c3f955537c3426b563d8377.css","ZeroClipboard.swf":"ZeroClipboard-6746e26b454c90c4d1b61f81710b7b0e.swf","bootstrap/glyphicons-halflings-regular.eot":"bootstrap/glyphicons-halflings-regular-fe255aca45c0f6e7c8b2a1ed7c7a5274.eot","bootstrap/glyphicons-halflings-regular.svg":"bootstrap/glyphicons-halflings-regular-f61f75238afd91ceeef4a5e4c639ead4.svg","bootstrap/glyphicons-halflings-regular.ttf":"bootstrap/glyphicons-halflings-regular-3e35c7e527383fc6fc479c17111469de.ttf","bootstrap/glyphicons-halflings-regular.woff":"bootstrap/glyphicons-halflings-regular-483c8aa83c1cae07664b1c959523d062.woff"}}
\ No newline at end of file
+{"files":{"favicon-0b96b9f9769906608e2990070c6c8da7.png":{"logical_path":"favicon.png","mtime":"2014-04-29T11:00:35-04:00","size":313,"digest":"0b96b9f9769906608e2990070c6c8da7"},"favicon-2829d6420e65851cedf6f81806e44cae.pyxel":{"logical_path":"favicon.pyxel","mtime":"2014-04-29T11:01:10-04:00","size":952,"digest":"2829d6420e65851cedf6f81806e44cae"},"application-2e6c9221e94ecb3c0b531f05fc48c63c.js":{"logical_path":"application.js","mtime":"2014-04-28T14:08:35-04:00","size":352852,"digest":"2e6c9221e94ecb3c0b531f05fc48c63c"},"application-91b092019c3f955537c3426b563d8377.css":{"logical_path":"application.css","mtime":"2014-04-25T16:04:37-04:00","size":291545,"digest":"91b092019c3f955537c3426b563d8377"},"ZeroClipboard-6746e26b454c90c4d1b61f81710b7b0e.swf":{"logical_path":"ZeroClipboard.swf","mtime":"2014-04-28T13:56:23-04:00","size":1891,"digest":"6746e26b454c90c4d1b61f81710b7b0e"},"bootstrap/glyphicons-halflings-regular-fe255aca45c0f6e7c8b2a1ed7c7a5274.eot":{"logical_path":"bootstrap/glyphicons-halflings-regular.eot","mtime":"2014-04-21T15:21:30-04:00","size":20290,"digest":"fe255aca45c0f6e7c8b2a1ed7c7a5274"},"bootstrap/glyphicons-halflings-regular-f61f75238afd91ceeef4a5e4c639ead4.svg":{"logical_path":"bootstrap/glyphicons-halflings-regular.svg","mtime":"2014-04-21T15:21:30-04:00","size":62850,"digest":"f61f75238afd91ceeef4a5e4c639ead4"},"bootstrap/glyphicons-halflings-regular-3e35c7e527383fc6fc479c17111469de.ttf":{"logical_path":"bootstrap/glyphicons-halflings-regular.ttf","mtime":"2014-04-21T15:21:30-04:00","size":41236,"digest":"3e35c7e527383fc6fc479c17111469de"},"bootstrap/glyphicons-halflings-regular-483c8aa83c1cae07664b1c959523d062.woff":{"logical_path":"bootstrap/glyphicons-halflings-regular.woff","mtime":"2014-04-21T15:21:30-04:00","size":23292,"digest":"483c8aa83c1cae07664b1c959523d062"},"campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css":{"logical_path":"campaign.css","mtime":"2014-04-25T16:35:50-04:00","size":4537,"digest":"c3fb9c02f00c3b1bf950f63d65d5e879"}},"assets":{"favicon.png":"favicon-0b96b9f9769906608e2990070c6c8da7.png","favicon.pyxel":"favicon-2829d6420e65851cedf6f81806e44cae.pyxel","application.js":"application-2e6c9221e94ecb3c0b531f05fc48c63c.js","application.css":"application-91b092019c3f955537c3426b563d8377.css","ZeroClipboard.swf":"ZeroClipboard-6746e26b454c90c4d1b61f81710b7b0e.swf","bootstrap/glyphicons-halflings-regular.eot":"bootstrap/glyphicons-halflings-regular-fe255aca45c0f6e7c8b2a1ed7c7a5274.eot","bootstrap/glyphicons-halflings-regular.svg":"bootstrap/glyphicons-halflings-regular-f61f75238afd91ceeef4a5e4c639ead4.svg","bootstrap/glyphicons-halflings-regular.ttf":"bootstrap/glyphicons-halflings-regular-3e35c7e527383fc6fc479c17111469de.ttf","bootstrap/glyphicons-halflings-regular.woff":"bootstrap/glyphicons-halflings-regular-483c8aa83c1cae07664b1c959523d062.woff","campaign.css":"campaign-c3fb9c02f00c3b1bf950f63d65d5e879.css"}}
\ No newline at end of file