From: radhika <radhika@curoverse.com>
Date: Thu, 3 Jul 2014 20:45:08 +0000 (-0400)
Subject: Merge branch 'master' into 3055-advanced-tab-explanations
X-Git-Tag: 1.1.0~2489^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/3657c576451610bc6e7f269cbf4f13cb18ff35ba?hp=ce69b2c94aeb8f897f41fbeaabfed3f3c55495d5

Merge branch 'master' into 3055-advanced-tab-explanations
---

diff --git a/apps/workbench/app/views/application/_show_advanced_cli_example.html.erb b/apps/workbench/app/views/application/_show_advanced_cli_example.html.erb
index 45168762fe..990631e27a 100644
--- a/apps/workbench/app/views/application/_show_advanced_cli_example.html.erb
+++ b/apps/workbench/app/views/application/_show_advanced_cli_example.html.erb
@@ -1,7 +1,11 @@
+An example arv command to get a <%= object.class.to_s.underscore %> using its uuid:
 <pre>
 arv --pretty <%= object.class.to_s.underscore %> get \
  --uuid <%= object.uuid %>
+</pre>
 
+An example arv command to update the "<%= object.attributes.keys[-3] %>" attribute for the current <%= object.class.to_s.underscore %>:
+<pre>
 arv <%= object.class.to_s.underscore %> update \
  --uuid <%= object.uuid %> \
  --<%= object.class.to_s.underscore.gsub '_', '-' %> '<%= JSON.generate({object.attributes.keys[-3] => object.attributes.values[-3]}).gsub("'","'\''") %>'
diff --git a/apps/workbench/app/views/application/_show_advanced_curl_example.html.erb b/apps/workbench/app/views/application/_show_advanced_curl_example.html.erb
index 0454c13c30..d6b983470d 100644
--- a/apps/workbench/app/views/application/_show_advanced_curl_example.html.erb
+++ b/apps/workbench/app/views/application/_show_advanced_curl_example.html.erb
@@ -1,3 +1,4 @@
+An example curl command to update the "<%= object.attributes.keys[-3] %>" attribute for the current <%= object.class.to_s.underscore %>:
 <pre>
 curl -X PUT \
  -H "Authorization: OAuth2 $ARVADOS_API_TOKEN" \
diff --git a/apps/workbench/app/views/application/_show_advanced_python_example.html.erb b/apps/workbench/app/views/application/_show_advanced_python_example.html.erb
index 3ceae4f757..f7cb7a10d9 100644
--- a/apps/workbench/app/views/application/_show_advanced_python_example.html.erb
+++ b/apps/workbench/app/views/application/_show_advanced_python_example.html.erb
@@ -1,3 +1,4 @@
+An example python command to get a <%= object.class.to_s.underscore %> using its uuid:
 <pre>
 import arvados