[ARVADOS] updated: 696e9cc71bb82411bb73148e5cdf1d68b11b709b
git at public.curoverse.com
git at public.curoverse.com
Tue Dec 31 10:09:24 EST 2013
Summary of changes:
apps/workbench/Gemfile | 1 +
apps/workbench/Gemfile.lock | 2 +
apps/workbench/app/assets/images/dax.png | Bin 0 -> 66943 bytes
.../app/controllers/application_controller.rb | 40 +++--
apps/workbench/app/controllers/users_controller.rb | 21 ++-
apps/workbench/app/models/arvados_api_client.rb | 80 ++++++----
.../app/views/layouts/application.html.erb | 113 +++++++------
.../app/views/users/_notifications.html.erb | 101 +++++++++++
.../app/views/users/_quick_links.html.erb | 10 +
.../app/views/users/_request_activation.html.erb | 11 --
apps/workbench/app/views/users/_tables.html.erb | 182 ++++++++++++++++++++
apps/workbench/app/views/users/home.html.erb | 159 +++++-------------
apps/workbench/app/views/users/welcome.html.erb | 20 ++
doc/_layouts/default.html | 6 +
doc/user/getting_started/ssh-access.textile | 18 +-
doc/user/getting_started/workbench.textile | 2 +-
sdk/cli/Gemfile.lock | 46 +++++
17 files changed, 573 insertions(+), 239 deletions(-)
create mode 100644 apps/workbench/app/assets/images/dax.png
create mode 100644 apps/workbench/app/views/users/_notifications.html.erb
create mode 100644 apps/workbench/app/views/users/_quick_links.html.erb
delete mode 100644 apps/workbench/app/views/users/_request_activation.html.erb
create mode 100644 apps/workbench/app/views/users/_tables.html.erb
create mode 100644 apps/workbench/app/views/users/welcome.html.erb
via 696e9cc71bb82411bb73148e5cdf1d68b11b709b (commit)
via b45c3b271232fafb310cf55d4bb37372c6053592 (commit)
via f90679d93de9a4bf7dd741b79e9da62a4b7bd4a2 (commit)
via 1e8f93a86465bce9bf6b32245ef99932c3cbfe08 (commit)
via 0be3297ce7c76d312b429532541bf94a7da2b83c (commit)
via 8c8391fa8c763032742bdc0d6fa0c02ca336a82a (commit)
via 10be0dd7536aeb8909cb21573f9c47bfdc4cfbea (commit)
via 8fe9c3a7c28ecc4a8b4f9fd788d5554dd391f725 (commit)
via f4705620139af8c1d9032da8c0dacc71fe9085be (commit)
via 67e5d42cccb652e4200a6c97164d492225394305 (commit)
via d6b05255cc0a7732408360c8b989d306e329346d (commit)
via 740dcfdd2c1f493e2d200efe5739e8b449c77ff1 (commit)
via 6ab23e5a3bb46f4155073dc870e232a5dc04d73b (commit)
via 4ec2f44338e79033045f798f585e083777d7f9ee (commit)
via 42db7b0f5120a762bcb061f04116bba792706de5 (commit)
via 461b2b4bfa50a11acb257817d13e70d030700dc0 (commit)
via e159519053a0f74c96a596ae78f3587bb98ebd09 (commit)
via 18b95abb060d64cdd581afb4611ae5b295f89cf1 (commit)
via 1944f82913c0a19254a136bf79bc353e762267e1 (commit)
via bab3fc9161233635d5d64d1ad37b79efac6a4313 (commit)
via ab3f9742f002e3af4339c17eede2b6ee99df83b2 (commit)
via 5416a457a781c7bdd3797a9bfbaf1750fc4f3168 (commit)
via 92208a37142717bc9b70a95f889950639e584d58 (commit)
via b0296ce4619e4e871a5c67cc77005d945cd3ec3c (commit)
from b6bb61bb11ad530e281791c528aad5bc59bba6e4 (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 696e9cc71bb82411bb73148e5cdf1d68b11b709b
Merge: b6bb61b b45c3b2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Dec 31 10:09:47 2013 -0500
Merge branch '1692-redesign-dashboard'
commit b45c3b271232fafb310cf55d4bb37372c6053592
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Dec 31 10:08:09 2013 -0500
* Updated ssh-access documentation for workbench dashboard changes
* Fixed problem where links within the document were cut off by top menu bar
diff --git a/doc/_layouts/default.html b/doc/_layouts/default.html
index 380d5f6..3dccf1a 100644
--- a/doc/_layouts/default.html
+++ b/doc/_layouts/default.html
@@ -59,6 +59,12 @@
.userinput {
color: #d14;
}
+ h1 {
+ padding-top: 41px;
+ }
+ h2 {
+ padding-top: 41px;
+ }
</style>
<link href="{{ site.baseurl }}/css/bootstrap-responsive.min.css" rel="stylesheet">
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
diff --git a/doc/user/getting_started/ssh-access.textile b/doc/user/getting_started/ssh-access.textile
index 5cd73c9..59f976f 100644
--- a/doc/user/getting_started/ssh-access.textile
+++ b/doc/user/getting_started/ssh-access.textile
@@ -27,7 +27,7 @@ Start by opening a terminal window. Check if you have an existing public key:
notextile. <pre><code>$ <span class="userinput">ls ~/.ssh/id_rsa.pub</span></code></pre>
-If the file @id_rsa.pub@ exists, then you may use your existing key. Copy the contents of @~/.ssh/id_rsa.pub@ onto the clipboard and proceed to "adding your key to the Arvados Workbench.":#workbench
+If the file @id_rsa.pub@ exists, then you may use your existing key. Copy the contents of @~/.ssh/id_rsa.pub@ onto the clipboard (this is your public key). Proceed to "adding your key to the Arvados Workbench.":#workbench
If there is no file @~/.ssh/id_rsa.pub@, you must generate a new key. Use @ssh-keygen@ to do this:
@@ -72,11 +72,11 @@ When everything is set up, @ssh-add -l@ should yield output that looks something
</code></pre>
</notextile>
-Copy the contents of @~/.ssh/id_rsa.pub@ onto the clipboard and proceed to "adding your key to the Arvados Workbench":#workbench .
+Copy the contents of @~/.ssh/id_rsa.pub@ onto the clipboard (this is your public key). Proceed to "adding your key to the Arvados Workbench":#workbench .
h2(#windows). Windows: Using PuTTY
-(Note: if you are using the ssh client that comes with "Cygwin":http://cygwin.com you should follow the "Unix":#unix instructions).
+(Note: if you are using the @ssh@ client that comes with "Cygwin":http://cygwin.com you should follow the "Unix":#unix instructions).
"PuTTY":http://www.putty.org/ is a free (MIT-licensed) Win32 Telnet and SSH client. PuTTy includes all the tools a windows user needs to set up Private Keys and to set up and use SSH connections to your virtual machines in the Arvados Cloud.
@@ -119,11 +119,13 @@ _Note: We recommend you do not delete the “Default” Saved Session._
h1(#workbench). Adding your key to Arvados Workbench
-Open the Workbench dashboard (in this guide, this is "https://workbench.{{ site.arvados_api_host }}/":https://workbench.{{ site.arvados_api_host }}/ ) and look at the *Configuration* box. If you do not have any ssh keys added, it will show:
+h3. From the workbench dashboard
-bc. SSH keys 0
+Open the Workbench dashboard (in this guide, this is "https://workbench.{{ site.arvados_api_host }}/":https://workbench.{{ site.arvados_api_host }}/ ) and look at the right hand column. If you have no @ssh@ keys registered, there should be a notification box asking you to provide your @ssh@ public key. Paste your public key into the text area and click on the check button to submit the key. You are now ready to "log into an Arvados VM":#login.
-This indicates that you have not yet provided Arvados with your public @ssh@ key. Click on "SSH keys" or use the menu item _Access %(rarr)→% Keys_ to add an authorized ssh key to your account.
+h3. Alternate way to add ssh keys
+
+If you want to add additional @ssh@ keys, use the menu item _Access %(rarr)→% Keys_ to add an authorized ssh key to your account.
Click on the button <span class="btn btn-primary disabled">Add a new authorized key</span>.
@@ -139,9 +141,9 @@ To determine the name and login information of the VM instance that you will con
This section consists of two sets of instructions, depending on whether you will be logging in using a "Unix":#unixvm (Linux, OS X, Cygwin) or "Windows":#windowsvm client.
-h2. Logging in using command line ssh (Unix)
+h2(#unixvm). Logging in using command line ssh (Unix)
-h3(#unixvm). Connecting to the VM
+h3. Connecting to the VM
Use the following command to connect to the "shell" VM instance as "you":
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list