Updating bootstrap-editable to bootstrap3-x-editable

Almost works, just need to figure one thing out.

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 1fd2d6a53d41d96dd7ea0a370927dfcd91409182..66734ef3cd785971034751bc50a6329a41d9c808 100644 (file)
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -25,7 +25,7 @@ end
 
 gem 'jquery-rails'
 gem 'bootstrap-sass', '~> 3.1.0'
-gem 'bootstrap-editable-rails'
+gem 'bootstrap-x-editable-rails'
 
 gem 'less'
 gem 'less-rails'

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 4526801ef1931287ca74e82ef4b6e5beff24fd5e..7f4dc8e289150c38165528556f504eb6372dfe4f 100644 (file)
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -31,10 +31,10 @@ GEM
       multi_json (~> 1.0)
     andand (1.3.3)
     arel (3.0.2)
-    bootstrap-editable-rails (0.0.5)
-      railties (>= 3.1)
     bootstrap-sass (3.1.0.1)
       sass (~> 3.2)
+    bootstrap-x-editable-rails (1.5.1.1)
+      railties (>= 3.0)
     builder (3.0.4)
     capistrano (2.15.5)
       highline
@@ -150,8 +150,8 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   andand
-  bootstrap-editable-rails
   bootstrap-sass (~> 3.1.0)
+  bootstrap-x-editable-rails
   coffee-rails (~> 3.2.0)
   httpclient
   jquery-rails

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index fbbf8f330b7a254b851e718dc1641d253721afdf..1ed0becba5767dad4a4c40f1fc3dd923609bc72b 100644 (file)
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -15,8 +15,9 @@
 //= require bootstrap
 //= require bootstrap/dropdown
 //= require bootstrap/tab
-//= require bootstrap-editable
-//= require bootstrap-editable-rails
+//= require bootstrap/tooltip
+//= require bootstrap/popover
+//= require bootstrap3-editable/bootstrap-editable
 //= require_tree .
 
 jQuery(function($){

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index d94dc4efa42f291e230ca982bff2d4ad071abfb4..3265ece392b2cdf28e0b18f2e6172a7fb716baa8 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -9,12 +9,11 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require bootstrap-editable
+ *= require bootstrap
+ *= require bootstrap3-editable/bootstrap-editable
  *= require_tree .
  */
 
-@import "bootstrap";
-
 .contain-align-left {
     text-align: left;
 }

diff --git a/apps/workbench/app/assets/stylesheets/loading.css b/apps/workbench/app/assets/stylesheets/loading.css
index a6c208b593b8163bc49ed0c766dac997a9cff49a..c76f104b4068aca91aa538fa170c8c4ff1a00cfb 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/loading.css
+++ b/apps/workbench/app/assets/stylesheets/loading.css
@@ -1,4 +1,4 @@
-// http://codepen.io/alucard11/pen/IxLDJ
+/* http://codepen.io/alucard11/pen/IxLDJ */
 
 .loading {
     background: #1b1b1b;

diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index a42016b8eca0cc4a70ead39b1dbc4ff07cf0bb23..1edd22ac3311162d00f9059ea1f3a9b33d97549c 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -93,10 +93,10 @@ module ApplicationHelper
       "data-emptytext" => "none",
       "data-placement" => "bottom",
       "data-type" => input_type,
-      "data-resource" => object.class.to_s.underscore,
       "data-name" => attr,
+      "data-pk" => object.uuid,
       "data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore),
-      "data-original-title" => "Update #{attr.gsub '_', ' '}",
+      "data-title" => "Update #{attr.gsub '_', ' '}",
       :class => "editable"
     }.merge(htmloptions)
   end