Merge branch 'develop'

Author: toastercup

README.md

@@ -43,6 +43,7 @@ Cortex follows a decentralized, API-only architecture - it is *not* built like W
   - [Webpages and Snippets](#webpages-and-snippets)
   - [Exceptions](#exceptions)
 - [Applications Using Cortex](#applications-using-cortex)
+- [Troubleshooting](#troubleshooting)
 - [Contributing](#contributing)
 - [License](#license)
 - [Copyright](#copyright)
@@ -55,7 +56,7 @@ Copy and rename the example `.env.example` file as `.env` and modify it to match
 
 For a rudimentary setup, these variables should be configured:
 
-* Use `$ rake secret` to generate `APP_SECRET` and `DEVISE_SECRET`
+* Execute `$ bundle exec rails secret` twice to generate both an `APP_SECRET` and `DEVISE_SECRET`
 * If the superuser isn't used for the app databases, the `DATABASE_USERNAME` and `DATABASE_PASSWORD` should be set accordingly.
 * Set `HOST` to the local Web server's root URL to properly configure Fog (local asset storage)
 
@@ -312,6 +313,9 @@ If a consuming or companion application would like to produce Cortex-equivalent
 * [CB1 Lander Shell](https://github.com/cbdr/cb1-lander-shell) - Platform for hosting lander pages and experiments, utilizing Cortex Posts and Sinatra. [Live Site](http://corporate.careerbuilder.com/)
 * [CareerBuilder.com](https://github.com/cbdr/consumer-main) - The main Consumer Web site for CB.com uses Cortex Posts for the [Privacy](http://www.careerbuilder.com/privacy) and [Terms of Service](http://www.careerbuilder.com/terms) pages.
 
+## Troubleshooting
+* For OS X / homebrew users: Run `which node` to ensure node is properly linked. The path shown should match homebrew's default installation path (run `which brew` to reveal this). If its not, then run `brew link node` and follow the instructions.
+
 ## Contributing
 
 Anyone and everyone is encouraged to fork Cortex and submit pull requests, propose new features and create issues.

app/api/v1/entities/webpage.rb

@@ -21,12 +21,14 @@ class Webpage < Grape::Entity
       expose :dynamic_yield_category, documentation: { type: 'String', desc: "Dynamic Yield Webpage Category" }
 
       expose :tables_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as JSON'}
+      expose :charts_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Charts Widget Data as JSON'}
 
       with_options if: { full: true } do
         expose :user, with: '::V1::Entities::User', documentation: {type: 'User', desc: 'Owner'}
         expose :url, documentation: { type: 'String', desc: 'URL of Webpage' }
 
         expose :tables_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as YAML'}
+        expose :charts_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Charts Widget Data as YAML'}
       end
     end
   end

app/assets/javascripts/media_dialogs.js

@@ -9,10 +9,18 @@
     global.dialogs[dialog.id] = dialog;
   });
 
-  $('.close-dialog').click(function(event) {
+  $('.close-dialog').on('click', function(event) {
+    closeDialog();
+  });
+
+  $('body').on('click', function(event) {
     var dialog = document.getElementById(event.target.closest('dialog').id);
-    dialog.close();
-    global.unblur_backdrop();
+    var rect = dialog.getBoundingClientRect();
+    var isInDialog=(rect.top <= event.clientY && event.clientY <= rect.top + rect.height && rect.left <= event.clientX && event.clientX <= rect.left + rect.width);
+
+    if (!isInDialog) {
+      closeDialog();
+    }
   });
 
   global.blur_backdrop = function() {
@@ -22,4 +30,10 @@
   global.unblur_backdrop = function() {
     $('.mdl-layout__container').removeClass('blur');
   };
+
+  function closeDialog() {
+    var dialog = document.getElementById(event.target.closest('dialog').id);
+    dialog.close();
+    global.unblur_backdrop();
+  }
 }(this));

app/assets/legacy_templates/webpages/edit.html

@@ -112,6 +112,12 @@
                       ng-model="data.webpage.tables_widget_yaml"
                       placeholder="YAML-formatted table data"></textarea>
           </div>
+          <div class="form-group">
+            <label for="charts_widget_yaml">Charts Data</label>
+            <textarea id="charts_widget_yaml" name="charts_widget_yaml" class="form-control" rows="15"
+                      ng-model="data.webpage.charts_widget_yaml"
+                      placeholder="YAML-formatted chart data"></textarea>
+          </div>
         </form>
       </div>
     </tab>

app/models/concerns/searchable_webpage.rb

@@ -30,6 +30,7 @@ module SearchableWebpage
       indexes :noarchive, :type => :boolean, :index => :not_analyzed
       indexes :noimageindex, :type => :boolean, :index => :not_analyzed
       indexes :tables_widget, :type => :nested, :enabled => false
+      indexes :charts_widget, :type => :nested, :enabled => false
     end
 
     def as_indexed_json(options = {})

app/models/webpage.rb

@@ -3,6 +3,7 @@ class Webpage < ApplicationRecord
   include SearchableWebpage
 
   serialize :tables_widget
+  serialize :charts_widget
 
   scope :find_by_protocol_agnostic_url, ->(suffix) { where('url LIKE :suffix', suffix: "%#{suffix}") }
 
@@ -30,4 +31,20 @@ def tables_widget_json
   def tables_widget_json= p
     self.tables_widget = JSON.parse(p, quirks_mode: true) # Quirks mode will let us parse a null JSON object
   end
+
+  def charts_widget_yaml
+    charts_widget.to_yaml
+  end
+
+  def charts_widget_yaml= p
+    self.charts_widget = YAML.load(p)
+  end
+
+  def charts_widget_json
+    charts_widget.to_json
+  end
+
+  def charts_widget_json= p
+    self.charts_widget = JSON.parse(p, quirks_mode: true) # Quirks mode will let us parse a null JSON object
+  end
 end

app/views/partials/_sidebar.html.haml

@@ -6,7 +6,7 @@
   = render 'partials/navigation'
   %footer
     %nav.demo-navigation.mdl-navigation
-      - unless environment == :production
+      - unless Rails.env.production?
         = render 'partials/environment_display'
       = render 'partials/tenant_display'
   .sidebar__toggle-button#sidebar__toggle-button

db/migrate/20170519201648_add_charts_widget_to_webpage.rb

@@ -0,0 +1,5 @@
+class AddChartsWidgetToWebpage < ActiveRecord::Migration[5.0]
+  def change
+    add_column :webpages, :charts_widget, :jsonb
+  end
+end