[ARVADOS] created: bf213b6340f66bec945ceab8d2bab59f7ca17a6f

[git at public.curoverse.com]

        at  bf213b6340f66bec945ceab8d2bab59f7ca17a6f (commit)


commit bf213b6340f66bec945ceab8d2bab59f7ca17a6f
Author: Ward Vandewege <ward at curoverse.com>
Date:   Wed Mar 11 14:39:10 2015 -0400

    A series of changes to the top nav bar to make it more compact.
    
    Refs #5211

diff --git a/doc/_config.yml b/doc/_config.yml
index 3dd2e2e..4e81cbf 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -135,10 +135,6 @@ navbar:
       - api/schema/Trait.html.textile.liquid
       - api/schema/User.html.textile.liquid
       - api/schema/VirtualMachine.html.textile.liquid
-  admin:
-    - Admin:
-      - admin/index.html.md.liquid
-      - admin/cheat_sheet.html.textile.liquid
   installguide:
     - Overview:
       - install/index.html.textile.liquid
@@ -155,6 +151,7 @@ navbar:
       - install/install-keepproxy.html.textile.liquid
       - install/install-crunch-dispatch.html.textile.liquid
       - install/install-compute-node.html.textile.liquid
+      - install/cheat_sheet.html.textile.liquid
     - Software prerequisites:
       - install/install-manual-prerequisites-ruby.html.textile.liquid
       - install/install-sso.html.textile.liquid
diff --git a/doc/_includes/_navbar_top.liquid b/doc/_includes/_navbar_top.liquid
index c6c8b28..9ac8101 100644
--- a/doc/_includes/_navbar_top.liquid
+++ b/doc/_includes/_navbar_top.liquid
@@ -13,10 +13,9 @@
       <ul class="nav navbar-nav">
         <li {% if page.navsection == 'start' %} class="active" {% endif %}><a href="{{ site.baseurl }}/start/index.html">Getting Started</a></li>
         <li {% if page.navsection == 'userguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/user/index.html">User Guide</a></li>
-        <li {% if page.navsection == 'sdk' %} class="active" {% endif %}><a href="{{ site.baseurl }}/sdk/index.html">SDK Reference</a></li>
-        <li {% if page.navsection == 'api' %} class="active" {% endif %}><a href="{{ site.baseurl }}/api/index.html">API Reference</a></li>
-        <li {% if page.navsection == 'adminguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/admin/index.html">Admin Guide</a></li>
-        <li {% if page.navsection == 'installguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/install/index.html">Install Guide</a></li>
+        <li {% if page.navsection == 'sdk' %} class="active" {% endif %}><a href="{{ site.baseurl }}/sdk/index.html">SDKs</a></li>
+        <li {% if page.navsection == 'api' %} class="active" {% endif %}><a href="{{ site.baseurl }}/api/index.html">API</a></li>
+        <li {% if page.navsection == 'installguide' %} class="active" {% endif %}><a href="{{ site.baseurl }}/install/index.html">Install</a></li>
         <li><a href="https://arvados.org/projects/arvados/" style="padding-left: 2em">Developer Site »</a></li>
       </ul>
     </div>
diff --git a/doc/admin/index.html.md.liquid b/doc/admin/index.html.md.liquid
deleted file mode 100644
index f0ed3ad..0000000
--- a/doc/admin/index.html.md.liquid
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: default
-navsection: admin
-title: Overview
-...
-
-{% include 'alert_stub' %}
-
-# Administration Overview
-
-Unlike other users, administrators
-
-* can see and modify all user-created objects regardless of permission settings
-* can directly create and modify system objects like Nodes and ApiClients
diff --git a/doc/index.html.liquid b/doc/index.html.liquid
index 9bd537a..53a798f 100644
--- a/doc/index.html.liquid
+++ b/doc/index.html.liquid
@@ -53,9 +53,6 @@ title: Arvados
         <a href="{{ site.baseurl }}/api/index.html">API Reference</a> — Details about the the Arvados REST API.
       </p>
       <p>
-        <a href="{{ site.baseurl }}/admin/index.html">Admin Guide</a> — How to administer an Arvados system.
-      </p>
-      <p>
         <a href="{{ site.baseurl }}/install/index.html">Install Guide</a> — How to install Arvados on a cloud platform.
       </p>
     </div>
diff --git a/doc/admin/cheat_sheet.html.textile.liquid b/doc/install/cheat_sheet.html.textile.liquid
similarity index 70%
rename from doc/admin/cheat_sheet.html.textile.liquid
rename to doc/install/cheat_sheet.html.textile.liquid
index 83fa5e8..115c62e 100644
--- a/doc/admin/cheat_sheet.html.textile.liquid
+++ b/doc/install/cheat_sheet.html.textile.liquid
@@ -1,10 +1,12 @@
 ---
 layout: default
-navsection: admin
+navsection: installguide
 title: Cheat Sheet
 ...
 
+h3. Workbench: user management
 
+As an Admin user, use the gear icon on the top right to visit the Users page. From there, use the 'Add new user' button to create a new user. Alternatively, visit an existing user with the 'Show' button next to the user's name. Then use the 'Admin' tab and click the 'Setup' button to activate the user, and create a virtual machine login as well as git repository for them.
 
 h3. CLI setup
 
@@ -13,13 +15,13 @@ ARVADOS_API_HOST={{ site.arvados_api_host }}
 ARVADOS_API_TOKEN=1234567890qwertyuiopasdfghjklzxcvbnm1234567890zzzz
 </pre>
 
-h3. Create VM
+h3. CLI: Create VM
 
 <pre>
 arv virtual_machine create --virtual-machine '{"hostname":"xxxxxxxchangeme.example.com"}'
 </pre>
 
-h3. Activate user
+h3. CLI: Activate user
 
 <pre>
 user_uuid=xxxxxxxchangeme
@@ -47,7 +49,7 @@ read -rd $'\000' newlink <<EOF; arv link create --link "$newlink"
 EOF
 </pre>
 
-h3. User → repo
+h3. CLI: User → repo
 
 Give @$user_uuid@ permission to commit to @$repo_uuid@ as @$repo_username@
 

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


hooks/post-receive
--