[ARVADOS] created: 8966e4255dc7c507abbd7cb2bbd319e2da070e9a

git at public.curoverse.com git at public.curoverse.com
Tue Jan 7 15:18:31 EST 2014


        at  8966e4255dc7c507abbd7cb2bbd319e2da070e9a (commit)


commit 8966e4255dc7c507abbd7cb2bbd319e2da070e9a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jan 7 15:08:05 2014 -0500

    Added config.arvados_docsite, updated links, all tested and working.

diff --git a/apps/workbench/app/views/authorized_keys/index.html.erb b/apps/workbench/app/views/authorized_keys/index.html.erb
index c062727..4332977 100644
--- a/apps/workbench/app/views/authorized_keys/index.html.erb
+++ b/apps/workbench/app/views/authorized_keys/index.html.erb
@@ -4,5 +4,7 @@
 
 <p>
   See also:
-  <%= link_to raw('Arvados Docs → User Guide → SSH access'), 'http://doc.arvados.org/user/ssh-access.html' %>.
+  <%= link_to raw('Arvados Docs → User Guide → SSH access'),
+  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access.html",
+  target: "_blank"%>.
 </p>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index ce8689c..f843fe0 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -94,10 +94,10 @@
               Docs <b class="caret"></b>
             </a>
             <ul class="dropdown-menu">
-              <li><%= link_to 'Tutorials and User guide', "http://doc.arvados.org/user", target: "_blank" %></li>
-              <li><%= link_to 'API Reference', "http://doc.arvados.org/api", target: "_blank" %></li>
-              <li><%= link_to 'Admin guide', "http://doc.arvados.org/admin", target: "_blank" %></li>
-              <li><%= link_to 'Install guide', "http://doc.arvados.org/install", target: "_blank" %></li>
+              <li><%= link_to 'Tutorials and User guide', "#{Rails.configuration.arvados_docsite}/user", target: "_blank" %></li>
+              <li><%= link_to 'API Reference', "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %></li>
+              <li><%= link_to 'Admin guide', "#{Rails.configuration.arvados_docsite}/admin", target: "_blank" %></li>
+              <li><%= link_to 'Install guide', "#{Rails.configuration.arvados_docsite}/install", target: "_blank" %></li>
             </ul>
           </li>
 
diff --git a/apps/workbench/app/views/repositories/index.html.erb b/apps/workbench/app/views/repositories/index.html.erb
index 1872c23..564738d 100644
--- a/apps/workbench/app/views/repositories/index.html.erb
+++ b/apps/workbench/app/views/repositories/index.html.erb
@@ -19,5 +19,11 @@ git push
 
 <p>
   See also:
-  <%= link_to raw('Arvados Docs → User Guide → git'), 'http://doc.arvados.org/user/intro-git.html' %>.
+  <%= link_to raw('Arvados Docs → User Guide → SSH access'),
+  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access.html",
+      target: "_blank"%> and 
+  <%= link_to raw('Arvados Docs → User Guide → Writing a Crunch
+  Script'),
+  "#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-firstscript.html",
+  target: "_blank"%>.
 </p>
diff --git a/apps/workbench/app/views/users/_notifications.html.erb b/apps/workbench/app/views/users/_notifications.html.erb
index 78ee276..88978ef 100644
--- a/apps/workbench/app/views/users/_notifications.html.erb
+++ b/apps/workbench/app/views/users/_notifications.html.erb
@@ -7,7 +7,7 @@
     <div>
       Hi, I noticed that you have not yet set up an SSH public key for use with Arvados.  
       <%= link_to "Click here to learn about SSH keys in Arvados.",
-	  "http://doc.arvados.org/user/getting_started/ssh-access.html", 
+	  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access.html", 
 	  style: "font-weight: bold",
 	  target: "_blank" %>
       When you have an SSH key you would like to use, paste the SSH public key
@@ -28,7 +28,7 @@
   <p>
     Hi, I noticed you haven't uploaded a new collection yet. 
     <%= link_to "Click here to learn how to upload data to Arvados Keep.", 
-	"http://doc.arvados.org/user/tutorials/tutorial-keep.html", 
+	"#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-keep.html", 
 	style: "font-weight: bold", target: "_blank" %>
   </p>
 </div>
@@ -41,7 +41,7 @@
   <p><%= image_tag "dax.png", class: "dax" %>
     Hi, I noticed you haven't run a job yet. 
     <%= link_to "Click here to learn how to run an Arvados Crunch job.", 
-	"http://doc.arvados.org/user/tutorials/tutorial-job1.html", 
+	"#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-job1.html", 
 	style: "font-weight: bold",
 	target: "_blank" %>
   </p>
@@ -54,7 +54,7 @@
   <p><%= image_tag "dax.png", class: "dax" %>
     Hi, I noticed you haven't run a pipeline yet.  
     <%= link_to "Click here to learn how to run an Arvados Crunch pipeline.", 
-	"http://doc.arvados.org/user/tutorials/tutorial-new-pipeline.html", 
+	"#{Rails.configuration.arvados_docsite}/user/tutorials/tutorial-new-pipeline.html", 
 	style: "font-weight: bold",
 	target: "_blank" %>
   </p>
@@ -68,7 +68,7 @@
   <p><ul>
       <li><%= link_to "Arvados project page", "http://arvados.org", target: "_blank" %></li>
       <li><%= link_to "Tutorials and user guide",
-      "http://doc.arvados.org/user/", target: "_blank" %></li>
+      "#{Rails.configuration.arvados_docsite}/user/", target: "_blank" %></li>
     </ul>
   </p>
 </div>
diff --git a/apps/workbench/app/views/users/_quick_links.html.erb b/apps/workbench/app/views/users/_quick_links.html.erb
deleted file mode 100644
index 9ed1aa9..0000000
--- a/apps/workbench/app/views/users/_quick_links.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="clearfix">
-  <h4>Quick links</h4>
-  <div class="well dash-list">
-    <ul class="nav nav-list">
-      <li><%= link_to "Introduction to Arvados", "https://arvados.org/projects/arvados/wiki/Introduction_to_Arvados" %></li>
-      <li><%= link_to "User Guide and Tutorials", "http://doc.arvados.org/user/" %></li>
-      <li><%= link_to "API Reference", "http://doc.arvados.org/api/" %></li>
-    </ul>
-  </div>
-</div>
diff --git a/apps/workbench/app/views/virtual_machines/index.html.erb b/apps/workbench/app/views/virtual_machines/index.html.erb
index 0c223d7..63a9f7c 100644
--- a/apps/workbench/app/views/virtual_machines/index.html.erb
+++ b/apps/workbench/app/views/virtual_machines/index.html.erb
@@ -24,5 +24,7 @@ ssh <%= @objects.first.andand.hostname.andand.sub('.'+current_api_host,'') or 'v
 
 <p>
   See also:
-  <%= link_to raw('Arvados Docs → User Guide → SSH access'), 'http://doc.arvados.org/user/ssh-access.html' %>.
+  <%= link_to raw('Arvados Docs → User Guide → SSH access'),
+  "#{Rails.configuration.arvados_docsite}/user/getting_started/ssh-access.html",
+  target: "_blank"%>.
 </p>
diff --git a/apps/workbench/config/environments/development.rb.example b/apps/workbench/config/environments/development.rb.example
index e93ba6d..0103646 100644
--- a/apps/workbench/config/environments/development.rb.example
+++ b/apps/workbench/config/environments/development.rb.example
@@ -46,4 +46,6 @@ ArvadosWorkbench::Application.configure do
 
   config.site_name = 'Arvados Workbench (dev)'
   config.activation_contact_link = 'mailto:info at arvados.org'
+
+  config.arvados_docsite = 'http://doc.arvados.org'
 end
diff --git a/apps/workbench/config/environments/production.rb.example b/apps/workbench/config/environments/production.rb.example
index 6c1569e..5cc2828 100644
--- a/apps/workbench/config/environments/production.rb.example
+++ b/apps/workbench/config/environments/production.rb.example
@@ -78,4 +78,6 @@ ArvadosWorkbench::Application.configure do
 
   config.site_name = 'Arvados Workbench'
   config.activation_contact_link = 'mailto:info at arvados.org'
+
+  config.arvados_docsite = 'http://doc.arvados.org'
 end
diff --git a/apps/workbench/config/environments/test.rb.example b/apps/workbench/config/environments/test.rb.example
index e357702..f9b50b2 100644
--- a/apps/workbench/config/environments/test.rb.example
+++ b/apps/workbench/config/environments/test.rb.example
@@ -48,4 +48,6 @@ ArvadosWorkbench::Application.configure do
 
   config.site_name = 'Arvados Workbench (test)'
   config.activation_contact_link = 'mailto:info at arvados.org'
+
+  config.arvados_docsite = 'http://doc.arvados.org'
 end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list