Addressing latest review comments

philipstarkey · philipstarkey · commit 3b8377d0073d · 2020-06-19T15:57:44.000+10:00
diff --git a/docs/source/_templates/components.rst b/docs/source/_templates/components.rst
@@ -3,7 +3,7 @@
     :maxdepth: 2
     :hidden:
 
-    The labscript suite <{{intersphinx_mapping['labscript-suite'][0]}}>
+    the labscript suite <{{intersphinx_mapping['labscript-suite'][0]}}>
 
 {% endif %}
 *labscript suite* components
@@ -16,7 +16,7 @@ The *labscript suite* is modular by design, and is comprised of:
     :header-rows: 0
 
     {% for prog, item in programs.items() if item.type == 'lib' %}
-    * - .. image:: {{item.img}}
+    * - .. image:: {{img_path}}/{{item.icon}}
              :target: {{intersphinx_mapping['%s' | format(prog)][0]}}
              :class: labscript-suite-icon
       - |{{prog}}|_ --- {{item.desc}}
@@ -27,7 +27,7 @@ The *labscript suite* is modular by design, and is comprised of:
     :header-rows: 0
 
     {% for prog, item in programs.items() if item.type == 'gui' %}
-    * - .. image:: {{item.img}}
+    * - .. image:: {{img_path}}/{{item.icon}}
              :target: {{intersphinx_mapping['%s' | format(prog)][0]}}
              :class: labscript-suite-icon
       - |{{prog}}|_ --- {{item.desc}}
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -97,37 +97,37 @@
 labscript_suite_programs = {
     'labscript': {
         'desc': 'Expressive composition of hardware-timed experiments',
-        'img': img_path + '/labscript_32nx32n.svg',
+        'icon': 'labscript_32nx32n.svg',
         'type': 'lib',
     },
     'labscript-devices': {
         'desc': 'Plugin architecture for controlling experiment hardware',
-        'img': img_path + '/labscript_32nx32n.svg',
+        'icon': 'labscript_32nx32n.svg',
         'type': 'lib',
     },
     'labscript-utils': {
         'desc': 'Shared modules used by the *labscript suite*',
-        'img': img_path + '/labscript_32nx32n.svg',
+        'icon': 'labscript_32nx32n.svg',
         'type': 'lib',
     },
     'runmanager': {
         'desc': 'Graphical and remote interface to parameterized experiments',
-        'img': img_path + '/runmanager_32nx32n.svg',
+        'icon': 'runmanager_32nx32n.svg',
         'type': 'gui',
     },
     'blacs': {
         'desc': 'Graphical interface to scientific instruments and experiment supervision',
-        'img': img_path + '/blacs_32nx32n.svg',
+        'icon': 'blacs_32nx32n.svg',
         'type': 'gui',
     },
     'lyse': {
         'desc': 'Online analysis of live experiment data',
-        'img': img_path + '/lyse_32nx32n.svg',
+        'icon': 'lyse_32nx32n.svg',
         'type': 'gui',
     },
     'runviewer': {
         'desc': 'Visualize hardware-timed experiment instructions',
-        'img': img_path + '/runviewer_32nx32n.svg',
+        'icon': 'runviewer_32nx32n.svg',
         'type': 'gui',
     },
 }
@@ -219,5 +219,6 @@ def setup(app):
                 intersphinx_mapping=intersphinx_mapping,
                 programs=labscript_suite_programs,
                 current_project=project,
+                img_path=img_path
             )
         )
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -67,10 +67,12 @@
 .. toctree::
    :maxdepth: 2
    :hidden:
+   :caption: DOCUMENTATION
 
    installation/index
    changes
    contributing
+   archive
 
 .. toctree::
    :maxdepth: 2
@@ -86,6 +88,7 @@
 
    Home Page <http://labscriptsuite.org>
    Source Code <https://github.com/labscript-suite/labscript-suite>
-   archive
+   PyPI <https://pypi.org/project/labscript-suite/>
+   Anaconda Cloud <https://anaconda.org/labscript-suite/labscript-suite>
 
 .. todolist:: 
