Update logo and manual links

Author: David Stirling

README.md

@@ -1,11 +1,11 @@
 <div align="center">
-  <img src="http://i.imgur.com/TmujaUa.png"><br><br>
+  <img src="https://i.imgur.com/uaEp2md.png"><br><br>
 </div>
 -----------------
 
 |  **`Version`**  |  **`Documentation`** | **`Forum`** |
 |---------------|----------------|-----------------|
-| [![Build Status](https://img.shields.io/badge/version-2.2.1-green.svg)](http://cellprofiler.org/releases) | [![Build Status](https://img.shields.io/badge/documentation-2.2.1-brightgreen.svg)](http://cellprofiler.org/CPA/) | [![Build Status](https://img.shields.io/badge/forum-CPA-blue.svg)](https://forum.image.sc/tag/cellprofiler-analyst) |
+| [![Build Status](https://img.shields.io/badge/version-2.2.1-green.svg)](https://cellprofileranalyst.org/releases) | [![Build Status](https://img.shields.io/badge/documentation-3.0.0-brightgreen.svg)](https://cellprofiler-manual.s3.amazonaws.com/CellProfiler-Analyst-3.0.0/index.html) | [![Build Status](https://img.shields.io/badge/forum-CPA-blue.svg)](https://forum.image.sc/tag/cellprofiler-analyst) |
 
 **CellProfiler Analyst** allows interactive exploration and analysis of data,
 particularly from high-throughput, image-based experiments. Included is a

cpa/classifier.py

@@ -630,7 +630,7 @@ def CreateMenus(self):
         rejectDuplicatesItem.Check(False)
         self.GetMenuBar().Append(advancedMenu, 'Advanced')
 
-        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="https://cellprofiler.org/v-classifier"), 'Help')
+        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="5_classifier.html"), 'Help')
 
 
         # Bind events to different menu items

cpa/helpmenu.py

@@ -2,7 +2,7 @@
 import cpa
 import cpa.icons
 from cpa.updatechecker import check_update
-from cpa.util.version import display_version
+from cpa.util.version import display_version, __version__
 
 
 def _on_check_update(self):
@@ -70,7 +70,8 @@ def _on_about(self):
     info.SetWebSite('cellprofileranalyst.org')
     AboutBox(info)
 
-def make_help_menu(frame, main=False, manual_url="http://cellprofiler.org/CPA"):
+def make_help_menu(frame, main=False, manual_url="index.html"):
+    manual_url = f"https://cellprofiler-manual.s3.amazonaws.com/CellProfiler-Analyst-{__version__}/{manual_url}"
     helpMenu = wx.Menu()
     def on_manual(self):
         import webbrowser

cpa/imagegallery.py

@@ -277,7 +277,7 @@ def CreateMenus(self):
         saveObjMenuItem = advancedMenu.Append(-1, item='Save object thumbnails as PNG', helpString='Save object thumbnails as PNG')
         self.GetMenuBar().Append(advancedMenu, 'Advanced')
 
-        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="https://cellprofiler.org/xiv-image-gallery"), 'Help')
+        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="14_image_gallery.html"), 'Help')
 
         self.Bind(wx.EVT_MENU, self.OnShowImageControls, imageControlsMenuItem)
         self.Bind(wx.EVT_MENU, self.OnFetchObjThumbnails ,fetchObjMenuItem)

cpa/imageviewer.py

@@ -281,7 +281,7 @@ def CreateMenus(self):
         self.classViewMenuItem = self.viewMenu.Append(-1, item='View %s classes as numbers'%p.object_name[0])
         self.classViewMenuItem.Enable(p.object_table is not None)
         self.GetMenuBar().Append(self.viewMenu, 'View')
-        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="https://cellprofiler.org/vii-image-viewer"), 'Help')
+        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="7_image_viewer.html"), 'Help')
 
 
     #######################################

cpa/plateviewer.py

@@ -54,7 +54,7 @@ def __init__(self, parent, size=(800,-1), **kwargs):
         self.fileMenu = wx.Menu()
         self.exitMenuItem = self.fileMenu.Append(id=wx.ID_EXIT, item='Exit\tCtrl+Q', helpString='Close Plate Viewer')
         self.GetMenuBar().Append(self.fileMenu, 'File')
-        self.menuBar.Append(cpa.helpmenu.make_help_menu(self, manual_url="https://cellprofiler.org/viii-plate-viewer"), 'Help')
+        self.menuBar.Append(cpa.helpmenu.make_help_menu(self, manual_url="8_plate_viewer.html"), 'Help')
         save_csv_menu_item = self.fileMenu.Append(-1, 'Save table to CSV\tCtrl+S')
         self.Bind(wx.EVT_MENU, self.on_save_csv, save_csv_menu_item)
 

cpa/tableviewer.py

@@ -562,7 +562,7 @@ def __init__(self, parent, **kwargs):
         fit_cols_menu_item = column_width_menu.Append(-1, 'Fit to table', kind=wx.ITEM_RADIO)
         auto_cols_menu_item = column_width_menu.Append(-1, 'Auto width', kind=wx.ITEM_RADIO)
 
-        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="https://cellprofiler.org/xii-table-viewer"), 'Help')
+        self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="6_table_viewer.html"), 'Help')
 
         self.CreateStatusBar()
 

docs/source/index.rst

@@ -7,7 +7,7 @@
 Manual 3.0.0
 ============
 
-.. image:: http://i.imgur.com/lNJcJPC.png
+.. image:: https://i.imgur.com/uaEp2md.png
 
 Table of Contents: