Merge branch 'develop'

Author: toastercup

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
-gem 'cortex-plugins-core', '= 0.10.0'
+gem 'cortex-plugins-core', '= 0.10.2'
 
 # API
 gem 'grape', '~> 0.17'

Gemfile.lock

@@ -136,7 +136,7 @@ GEM
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
-    cortex-plugins-core (0.10.0)
+    cortex-plugins-core (0.10.2)
       cells (~> 4.1)
       cells-haml (~> 0.0.10)
       cells-rails (~> 0.0.6)
@@ -704,7 +704,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.6)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core (= 0.10.0)
+  cortex-plugins-core (= 0.10.2)
   database_cleaner (~> 1.5)
   devise (~> 4.2.0)
   doorkeeper (~> 4.2)

README.md

@@ -1,11 +1,10 @@
-# Cortex
+# Cortex CMS [![Build Status](https://semaphoreci.com/api/v1/projects/ec90715a-da8f-4960-bb64-f371850f9c98/813409/shields_badge.svg)](https://semaphoreci.com/content-enablement/cortex) [![Code Climate](https://codeclimate.com/repos/53f62c2869568018180036c9/badges/78e3c3c865b118bbd72b/gpa.svg)](https://codeclimate.com/repos/53f62c2869568018180036c9/feed) [![Test Coverage](https://codeclimate.com/repos/53f62c2869568018180036c9/badges/78e3c3c865b118bbd72b/coverage.svg)](https://codeclimate.com/repos/53f62c2869568018180036c9/coverage) [![Documentation Status](https://readthedocs.org/projects/cortex-cms/badge/?version=latest)](http://docs.cbcortex.com/en/latest/?badge=latest)
 
-[![Build Status](https://semaphoreci.com/api/v1/projects/ec90715a-da8f-4960-bb64-f371850f9c98/813409/shields_badge.svg)](https://semaphoreci.com/content-enablement/cortex)
-[![Code Climate](https://codeclimate.com/repos/53f62c2869568018180036c9/badges/78e3c3c865b118bbd72b/gpa.svg)](https://codeclimate.com/repos/53f62c2869568018180036c9/feed)
-[![Test Coverage](https://codeclimate.com/repos/53f62c2869568018180036c9/badges/78e3c3c865b118bbd72b/coverage.svg)](https://codeclimate.com/repos/53f62c2869568018180036c9/coverage)
-[![Documentation Status](https://readthedocs.org/projects/cortex-cms/badge/?version=latest)](http://docs.cbcortex.com/en/latest/?badge=latest)
+<img align="right" height="150"
+     src="https://hiring-assets.careerbuilder.com/branding/cortex-logo.svg"
+     alt="Cortex CMS Logo">
 
-Cortex is a [multitenant](https://en.wikipedia.org/wiki/Multitenancy) identity, content distribution/management and reporting platform built by the [Content Enablement][cb-ce-github] team at [CareerBuilder](https://github.com/careerbuilder). Its purpose is to provide central infrastructure for next-generation applications; exposing a single point of management while enabling quicker build-out of new software.
+Cortex CMS is a [multitenant](https://en.wikipedia.org/wiki/Multitenancy) identity, content distribution/management and reporting platform built by the [Content Enablement][cb-ce-github] team at [CareerBuilder](https://github.com/careerbuilder). Its purpose is to provide central infrastructure for next-generation applications; exposing a single point of management while enabling quicker build-out of new software.
 
 Cortex follows a decentralized, API-only architecture - it is *not* built like Wordpress or Drupal, which are considered monolithic, all-in-one solutions.
 

app/cells/wizard/field/show.haml

@@ -18,7 +18,7 @@
     = cell(Plugins::Core::TagCell, field_item, form: field_item_form, default_value: [], input_options: input, label_options: label).(:tag_picker)
 
   - if field_item.field.field_type_instance.class == UserFieldType
-    = cell(Plugins::Core::UserCell, field_item, form: field_item_form, default_value: User.all.first.id, user_data: User.all, input_options: input, label_options: label).(:dropdown)
+    = cell(Plugins::Core::UserCell, field_item, form: field_item_form, user_data: User.all, input_options: input, label_options: label).(:dropdown)
 
   - if field_item.field.field_type_instance.class == AssetFieldType
     = cell(Plugins::Core::AssetCell, field_item, form: field_item_form, input_options: input, label_options: label).(:input)

lib/tasks/employer/blog.rake

@@ -8,7 +8,6 @@ namespace :employer do
         tree = Tree.new
         tree.add_node({name: "CB Research"})
         tree.add_node({name: "Third Party Research"})
-        tree.add_node({name: "N/A"})
 
         tree
       end

public/ckeditor-plugins/media-selector/plugin.js

@@ -7,15 +7,15 @@
       editor.addCommand('insertMedia', {
         exec: function (editor) {
           var mediaLibraryModal = $('#media-library-modal');
-          mediaLibraryModal.openModal();
+          mediaLibraryModal.modal('open');
 
           global.media_select = {};
           global.media_select_defer = $.Deferred();
           global.media_select_defer.promise(global.media_select);
 
           global.media_select.done(function (media) {
             editor.insertHtml(global.utility.getMediaHtml(media));
-            mediaLibraryModal.closeModal();
+            mediaLibraryModal.modal('close');
           });
         }
       });