brightcontent-core 2.0.31 → 2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b14c5e3e5868779efe399929d61b1c1b6370865d
-  data.tar.gz: 042f496e3c714b54896d95ee48a02a173d29fc63
+  metadata.gz: 147c48a77582f6e93c10d4a563c282bd7fbbb765
+  data.tar.gz: c281ca212990a54336c0b0ce921abb45ed4a9989
 SHA512:
-  metadata.gz: 567b8186b474923724f93b6a681fe72bad14432bd9ec2f6f04d4c171a6585a4e20e5a42318a1aca3f1ecf00f7bce3aeea119d0bc6bd9f08fd624cde9d9e85be3
-  data.tar.gz: c55958d7cf3394301a00cf52c2d1866b838fcf1a31e88662f06516aa80baf36e38b16e696debf651a0d9a9d85fc756ed8e1406b3f8b31b0caa3ad369d5efd842
+  metadata.gz: 6956ed78f70cfb75f9d2f9cc0d90e7867c78862bee3d583d5a2e48b40645600a76a76a9de97044f68b16c43386e00b0ddc9bf950ac98f126e041be94de194ce0
+  data.tar.gz: 55a585f385b36d9fb3853ce4dc6aad023bb075f56efb4e2cad3ee5f58db1dc7cfd6c0b548e79623b60ebab5a56bf5f2d683fbba888a01c475f12ae2c01b1c0f5

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

@@ -11,9 +11,11 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require jquery
+//= require jquery-ui
 //= require jquery_ujs
 //= require bootstrap-wysihtml5
 //= require bootstrap-wysihtml5/locales/nl-NL
 //= require brightcontent/attachments
+//= require brightcontent/pages
 //= require brightcontent/custom
 //= require_tree .

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

@@ -15,13 +15,11 @@ $(document).ready(function(){
 
   $("#attachments").on("click", ".insert_image", function(e){
     e.preventDefault();
-    console.log($(this).data("insertImage"));
     editor.composer.commands.exec("insertImage", { src: $(this).data("insertImage") });
   });
 
   $("#attachments").on("click", ".insert_link", function(e){
     e.preventDefault();
-    console.log($(this).data());
     editor.composer.commands.exec("createLink", { href: $(this).data("insertUrl"), target: "_blank", rel: "nofollow", text: $(this).data("insertName") });
   });
 

data/app/assets/stylesheets/brightcontent/brightcontent.css

@@ -13,5 +13,7 @@
  *= require brightcontent/bootstrap-responsive.min
  *= require bootstrap-wysihtml5
  *= require brightcontent/main
+ *= require brightcontent/pages
+ *= require brightcontent/attachments
  *= require brightcontent/custom
  */

data/app/controllers/brightcontent/base_controller.rb

@@ -36,5 +36,15 @@ module Brightcontent
     end
     helper_method :parent
 
+    def resource_item_path
+      [parent, resource]
+    end
+    helper_method :resource_item_path
+
+    def resource_index_path
+      [parent, resource_class]
+    end
+    helper_method :resource_index_path
+
   end
 end

data/app/helpers/brightcontent/base_helper.rb

@@ -13,7 +13,7 @@ module Brightcontent
     def link_for_scope(scope)
       case scope[:type]
       when :boolean
-        polymorphic_url([parent, resource_class], scope[:as] => true)
+        polymorphic_url(resource_index_path, scope[:as] => true)
       end
     end
 

data/app/views/brightcontent/base/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for [parent, resource] do |form| -%>
+<%= simple_form_for resource_item_path do |form| -%>
   <%= form.error_notification %>
 
   <div class="form-inputs">
@@ -11,7 +11,7 @@
   <%= form.button :submit, "Save and continue", :name => "commit_and_continue" %>
 
   <% unless resource.new_record? -%>
-    <%= link_to "Delete", [parent, resource], :class => "btn btn-danger delete", :method => :delete, :data => { :confirm => 'Are you sure?' } %>
+    <%= link_to "Delete", resource_item_path, :class => "btn btn-danger delete", :method => :delete, :data => { :confirm => 'Are you sure?' } %>
   <% end -%>
 
 <% end -%>

data/app/views/brightcontent/base/index.html.erb

@@ -1,6 +1,6 @@
 <div id="overview">
 
-  <%= link_to "Create new #{resource_instance_name.to_s.humanize}", polymorphic_url([parent, resource_class], action: :new), class: "btn btn-primary btn-right" %>
+  <%= link_to "Create new #{resource_instance_name.to_s.humanize}", polymorphic_url(resource_index_path, action: :new), class: "btn btn-primary btn-right" %>
   <h1><%= resource_class.model_name.human.pluralize %></h1>
 
   <%= render "scope_filters" if scopes_configuration %>

data/brightcontent-core.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.2.13"
+  s.add_dependency "rails", ">= 3.2.13"
   s.add_dependency "jquery-rails"
-  s.add_dependency "bcrypt-ruby", "3.0.0"
+  s.add_dependency "bcrypt-ruby", ">= 3.0.0"
   s.add_dependency "inherited_resources"
   s.add_dependency "has_scope"
   s.add_dependency "simple_form"

data/lib/brightcontent/default_actions.rb

@@ -6,22 +6,23 @@ module Brightcontent
 
     def create
       if params["commit_and_continue"].present?
-        create! { [parent, resource] }
+        create! { resource_item_path }
       else
-        create! { [parent, resource_class] }
+        create! { resource_index_path }
       end
     end
 
     def update
       if params["commit_and_continue"].present?
-        update! { [parent, resource] }
+        update! { resource_item_path }
       else
-        update! { [parent, resource_class] }
+        update! { resource_index_path }
       end
     end
 
     def destroy
-      destroy! { [parent, resource_class] }
+      destroy! { resource_index_path }
     end
+
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.0.31
+  version: 2.0.33
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
@@ -42,14 +42,14 @@ dependencies:
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -214,7 +214,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - app/assets/images/brightcontent/.gitkeep
 - app/assets/images/brightcontent/glyphicons-halflings-white.png
@@ -224,11 +223,14 @@ files:
 - app/assets/javascripts/brightcontent/brightcontent.js
 - app/assets/javascripts/brightcontent/custom.js
 - app/assets/javascripts/brightcontent/main.js
+- app/assets/javascripts/brightcontent/pages.js
+- app/assets/stylesheets/brightcontent/attachments.css
 - app/assets/stylesheets/brightcontent/bootstrap-responsive.min.css
 - app/assets/stylesheets/brightcontent/bootstrap.min.css
 - app/assets/stylesheets/brightcontent/brightcontent.css
 - app/assets/stylesheets/brightcontent/custom.css
 - app/assets/stylesheets/brightcontent/main.css
+- app/assets/stylesheets/brightcontent/pages.css
 - app/controllers/brightcontent/admin_users_controller.rb
 - app/controllers/brightcontent/application_controller.rb
 - app/controllers/brightcontent/base_controller.rb

data/Gemfile.lock

@@ -1,156 +0,0 @@
-PATH
-  remote: .
-  specs:
-    brightcontent-core (2.0.31)
-      bcrypt-ruby (= 3.0.0)
-      bootstrap-wysihtml5-rails
-      has_scope
-      inherited_resources
-      jquery-rails
-      rails (~> 3.2.13)
-      simple_form
-      strong_parameters
-      will_paginate
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.0)
-    bootstrap-wysihtml5-rails (0.3.1.20)
-      railties (>= 3.0)
-    builder (3.0.4)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-    has_scope (0.5.1)
-    hike (1.2.3)
-    i18n (0.6.1)
-    inherited_resources (1.4.0)
-      has_scope (~> 0.5.0)
-      responders (~> 0.9)
-    journey (1.0.4)
-    jquery-rails (3.0.4)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.0)
-    launchy (2.3.0)
-      addressable (~> 2.3)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    mini_portile (0.5.1)
-    multi_json (1.7.7)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    responders (0.9.3)
-      railties (~> 3.1)
-    rspec-core (2.14.3)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-rails (2.14.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    simple_form (2.1.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.1)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    will_paginate (3.0.4)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  brightcontent-core!
-  capybara
-  factory_girl_rails
-  launchy
-  rspec-rails
-  sqlite3