[ARVADOS] updated: dcd5dad4a40baef826270f43ae80d7b39a3b9113
git at public.curoverse.com
git at public.curoverse.com
Thu Feb 6 10:36:20 EST 2014
Summary of changes:
apps/workbench/Gemfile | 2 +-
apps/workbench/Gemfile.lock | 6 +++---
.../app/assets/javascripts/application.js | 7 +++++--
apps/workbench/app/assets/javascripts/editable.js | 10 ++++++++++
.../app/assets/stylesheets/application.css.scss | 5 ++---
apps/workbench/app/assets/stylesheets/loading.css | 2 +-
apps/workbench/app/helpers/application_helper.rb | 6 +++---
.../app/views/application/_recent.html.erb | 2 +-
.../app/views/layouts/application.html.erb | 3 ++-
apps/workbench/app/views/links/_recent.html.erb | 2 +-
.../app/views/pipeline_instances/_recent.html.erb | 6 ------
11 files changed, 29 insertions(+), 22 deletions(-)
create mode 100644 apps/workbench/app/assets/javascripts/editable.js
via dcd5dad4a40baef826270f43ae80d7b39a3b9113 (commit)
via e9047106c462a8767abe9abd06cd7090d31cbc16 (commit)
via 8ac83bf6c1464344721514494c8c50ad6679a5bc (commit)
from c16a97576716f81c721bcd0c889309cb75e3eb9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit dcd5dad4a40baef826270f43ae80d7b39a3b9113
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Feb 6 10:37:03 2014 -0500
Fixed up some glyphicons
diff --git a/apps/workbench/app/views/application/_recent.html.erb b/apps/workbench/app/views/application/_recent.html.erb
index 6ea3818..86b6b04 100644
--- a/apps/workbench/app/views/application/_recent.html.erb
+++ b/apps/workbench/app/views/application/_recent.html.erb
@@ -46,7 +46,7 @@
<td>
<% if object.editable? %>
<%= link_to({action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "You are about to delete #{controller.model_class} #{object.uuid}.\n\nAre you sure?"}) do %>
- <i class="icon-trash"></i>
+ <i class="glyphicon glyphicon-trash"></i>
<% end %>
<% end %>
</td>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index b7f4ad3..2e2fb84 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -160,7 +160,8 @@
<% [['Data', [['humans'],
['traits'],
['specimens'],
- ['collections', 'Files']]],
+ ['collections', 'Files'],
+ ['links']]],
['Compute', [['pipeline_templates', 'Pipelines'],
['repositories', 'Code repositories'],
['virtual_machines']]],
diff --git a/apps/workbench/app/views/links/_recent.html.erb b/apps/workbench/app/views/links/_recent.html.erb
index 76e959a..7548ae1 100644
--- a/apps/workbench/app/views/links/_recent.html.erb
+++ b/apps/workbench/app/views/links/_recent.html.erb
@@ -38,7 +38,7 @@
<td>
<% if current_user and (current_user.is_admin or current_user.uuid == link.owner_uuid) %>
- <%= link_to raw('<i class="icon-trash"></i>'), { action: 'destroy', id: link.uuid }, { confirm: 'Delete this link?', method: 'delete' } %>
+ <%= link_to raw('<i class="glyphicon glyphicon-trash"></i>'), { action: 'destroy', id: link.uuid }, { confirm: 'Delete this link?', method: 'delete' } %>
<% end %>
</td>
diff --git a/apps/workbench/app/views/pipeline_instances/_recent.html.erb b/apps/workbench/app/views/pipeline_instances/_recent.html.erb
index 481d276..ef394e8 100644
--- a/apps/workbench/app/views/pipeline_instances/_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_recent.html.erb
@@ -58,12 +58,6 @@
</small>
</td><td>
<%= ob.created_at %>
- </td><td>
- <% if ob.editable? %>
- <%= link_to({action: 'destroy', id: ob.uuid}, method: :delete, remote: true, data: {confirm: "You are about to delete #{controller.model_class} #{ob.uuid}.\n\nAre you sure?"}) do %>
- <i class="icon-trash"></i>
- <% end %>
- <% end %>
</td>
</tr>
commit e9047106c462a8767abe9abd06cd7090d31cbc16
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Feb 6 10:27:34 2014 -0500
Editable fields works again
diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 1ed0bec..8cbaed0 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -49,3 +49,5 @@ jQuery(function($){
});
})(jQuery);
+
+
diff --git a/apps/workbench/app/assets/javascripts/editable.js b/apps/workbench/app/assets/javascripts/editable.js
new file mode 100644
index 0000000..804eeb2
--- /dev/null
+++ b/apps/workbench/app/assets/javascripts/editable.js
@@ -0,0 +1,10 @@
+$.fn.editable.defaults.ajaxOptions = {type: 'put', dataType: 'json'};
+$.fn.editable.defaults.send = 'always';
+$.fn.editable.defaults.params = function (params) {
+ var a = {};
+ var key = params.pk.key;
+ a.id = params.pk.id;
+ a[key] = {};
+ a[key][params.name] = params.value;
+ return a;
+};
\ No newline at end of file
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 1edd22a..cd8e527 100644
--- 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-name" => attr,
- "data-pk" => object.uuid,
"data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore),
"data-title" => "Update #{attr.gsub '_', ' '}",
+ "data-name" => attr,
+ "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}",
:class => "editable"
}.merge(htmloptions)
end
commit 8ac83bf6c1464344721514494c8c50ad6679a5bc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Feb 6 09:39:19 2014 -0500
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 1fd2d6a..66734ef 100644
--- 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 4526801..7f4dc8e 100644
--- 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 fbbf8f3..1ed0bec 100644
--- 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 d94dc4e..3265ece 100644
--- 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 .
*/
- at 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 a6c208b..c76f104 100644
--- 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 a42016b..1edd22a 100644
--- 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list