brightcontent-core 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6563e594a9eac2ccab983bcf4077426b89ed9f49
-  data.tar.gz: 98c62c9ab671aede312c5ff6e1865c0b066ed155
+  metadata.gz: fc28e73875ef4679ee08153287cbf8e7a141e492
+  data.tar.gz: 963c4af3bbbc66ed469853c668be945fb18c7b4a
 SHA512:
-  metadata.gz: 1b669d87ad7b4be5b4425e8d537cee1d8eb37a72682fc12e75b053a8e3890b07515bccdbced5c5b9743cd3ded21b4fed528077920b51c64c8dbf96bb1842ae79
-  data.tar.gz: 5f905144921855cec0b9b804dff6ad1ff1bb73ca00999c9c09bcb902c8bfd380809d40c52e59306e4a681d94b4373abc1ecbb4cb49dd93775bc6df5157a75ec2
+  metadata.gz: 644b914c0d27320593a08ab801576a9e32651a055648e55fd57f195fff91cb2f6d51a64878d55d8e6d8937563581df9d1fd794e7a23dc5709fedc648d1be3e48
+  data.tar.gz: 26aa3acd1268af9b8069a1997c47c84cf786de9de28f965193abf1d9855b3694d4c99fd0046a7b6482bd8925f5027db5785a3bbce6a8e5d29c5be519d937b98d

data/app/assets/javascripts/brightcontent/core.js

@@ -0,0 +1,19 @@
+//= require bootstrap-wysihtml5
+//= require brightcontent/wysithtml5-parser-rules
+//= require bootstrap-wysihtml5/locales/nl-NL
+
+$(function() {
+  var editorLocale = $('body').data('editorLocale');
+
+  $('[data-wysihtml5]').wysihtml5({
+    html: true,
+    locale: editorLocale,
+    parserRules: wysihtml5ParserRules,
+    events: {
+      load: function() {
+        var editor = $("#insertable").data("wysihtml5").editor;
+        editor.focus();
+      }
+    }
+  });
+});

data/app/controllers/brightcontent/application_controller.rb

@@ -7,7 +7,7 @@ module Brightcontent
     protect_from_forgery
 
     def index
-      redirect_to root_path + user_resources.first.path
+      redirect_to polymorphic_url(user_resources.first.klass)
     end
 
     private

data/app/views/brightcontent/application/_resource.html.erb

@@ -1,3 +1,3 @@
 <li class="<%= 'active' if resource_class == resource.klass %>">
-  <%= link_to nominative_plural(resource.klass).capitalize, root_path + resource.path %>
+  <%= link_to nominative_plural(resource.klass).capitalize, polymorphic_url(resource.klass) %>
 </li>

data/app/views/brightcontent/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag sessions_path, class: "form-signin", role: 'form' do %>
   <h2 class="form-signin-heading"><%=t('brightcontent.sign_in')%></h2>
-  <%= text_field_tag :email, params[:email], class: 'form-control', placeholder: 'Email', autofocus: true %>
-  <%= password_field_tag :password, nil, class: 'form-control', placeholder: 'Password' %>
-  <%= submit_tag "Login", class: "btn btn-lg btn-primary btn-block" %>
+  <%= text_field_tag :email, params[:email], class: 'form-control', placeholder: t('activerecord.attributes.brightcontent/admin_user.email'), autofocus: true %>
+  <%= password_field_tag :password, nil, class: 'form-control', placeholder: t('activerecord.attributes.brightcontent/admin_user.password') %>
+  <%= submit_tag t('brightcontent.login'), class: "btn btn-lg btn-primary btn-block" %>
 <% end %>

data/brightcontent-core.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency "bootstrap-sass", ">= 3.1"
   s.add_dependency "bootstrap-wysihtml5-rails", ">= 0.3.2"
   s.add_dependency "inherited_resources", ">= 1.6.0"
-  s.add_dependency "coffee-rails"
   s.add_dependency "jquery-rails"
   s.add_dependency "sass-rails", ">= 4.0.2"
   s.add_dependency "simple_form"

data/config/locales/brightcontent_core.en.yml

@@ -19,6 +19,7 @@ en:
     logout: Logout
     hidden: Hidden
     sign_in: Please sign in
+    login: Login
     editor_locale: ""
     extra_menu: More
 
@@ -27,5 +28,6 @@ en:
       brightcontent/admin_user: Admin
     attributes:
       brightcontent/admin_user:
+        email: Email
         password: Password
         password_confirmation: Password confirmation

data/config/locales/brightcontent_core.nl.yml

@@ -19,6 +19,7 @@ nl:
     logout: Uitloggen
     hidden: Verborgen
     sign_in: Inloggen
+    login: Inloggen
     editor_locale: "nl-NL"
     extra_menu: Meer
 
@@ -27,5 +28,6 @@ nl:
       brightcontent/admin_user: Beheerder
     attributes:
       brightcontent/admin_user:
+        login: Inloggen
         password: Wachtwoord
         password_confirmation: Wachtwoord bevestiging

data/lib/brightcontent/core.rb

@@ -3,7 +3,6 @@
 #
 ENV['RANSACK_FORM_BUILDER'] ||= '::SimpleForm::FormBuilder'
 
-require "coffee_script"
 require "bootstrap-sass"
 require "bootstrap-wysihtml5-rails"
 require "inherited_resources"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +272,7 @@ files:
 - Gemfile
 - Rakefile
 - app/assets/javascripts/brightcontent/brightcontent.js.erb
-- app/assets/javascripts/brightcontent/core.js.coffee
+- app/assets/javascripts/brightcontent/core.js
 - app/assets/javascripts/brightcontent/custom.js
 - app/assets/javascripts/brightcontent/wysithtml5-parser-rules.js
 - app/assets/stylesheets/brightcontent/brightcontent.css.erb
@@ -439,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Brightcontent core

data/app/assets/javascripts/brightcontent/core.js.coffee

@@ -1,15 +0,0 @@
-#= require bootstrap-wysihtml5
-#= require brightcontent/wysithtml5-parser-rules
-#= require bootstrap-wysihtml5/locales/nl-NL
-
-$ ->
-  editorLocale = $('body').data('editorLocale')
-
-  $('[data-wysihtml5]').wysihtml5
-    html: true
-    locale: editorLocale
-    parserRules: wysihtml5ParserRules
-    events:
-      load: ->
-        editor = $("#insertable").data("wysihtml5").editor
-        editor.focus()