Merge pull request #192 from radinamatic/404-for-0.6

Add 404 page to 0.6 branch
learningequality · Aug 27, 2020 · 10792a0 · 10792a0
2 parents 57eb95e + 618d397
commit 10792a0
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 19 deletions.
diff --git a/docs/404.rst b/docs/404.rst
@@ -0,0 +1,17 @@
+:orphan:
+
+Page not found
+==============
+
+It seems you are searching for a topic that has been moved elsewhere in our documentation. Please try the following to find what you were looking for:
+
+* Browse the table of content in the sidebar 
+* Use the search box
+
+
+*Use the upper menu button to open the table of contents if you are on the mobile device.*
+
+.. tip:: Make sure you are browsing the user guide for the `latest release of Kolibri <https://kolibri.readthedocs.io/en/latest/>`_.
+
+
+We apologize for the inconvenience!
diff --git a/docs/_static/theme_overrides.css b/docs/_static/theme_overrides.css
@@ -1,7 +1,13 @@
 
- .wy-table-responsive table td {
-    /* !important prevents the common CSS stylesheets from overriding
-       this as on RTD they are loaded after this stylesheet */
-    white-space: normal !important;
-    vertical-align: top !important;
- }
+@import url("https://fonts.googleapis.com/icon?family=Material+Icons");
+
+/* push down the RTD banner so it's not confused with menu */
+.keep-us-sustainable {
+  margin-top: 20em !important;
+}
+
+/* !important prevents the common CSS stylesheets from overriding this as on RTD they are loaded after this stylesheet */
+.wy-table-responsive table td {
+	white-space: normal !important;
+	vertical-align: top !important;
+}
diff --git a/docs/conf.py b/docs/conf.py
@@ -21,7 +21,7 @@
 # FOR! DO NOT LET THEM BE TARGETTED AT MORE THAN ONE MINOR SERIES!
 # I.E.: 0.1.x -- important to add 'dev' suffix for docs targetting development
 # series.
-DISPLAY_VERSION = "0.6.x"
+DISPLAY_VERSION = "0.6"
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -107,7 +107,7 @@ def process_docstring(app, what, name, obj, options, lines):
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx_rtd_theme', 'notfound.extension',]
 
 linkcheck_ignore = [
     'https://groups.google.com/a/learningequality.org/forum/#!forum/dev',

diff --git a/docs/contributing/code_of_conduct.rst b/docs/contributing/code_of_conduct.rst
@@ -1,4 +1,3 @@
-.. include:: ../../CODE_OF_CONDUCT.rst
 
 Reporting Guidelines
 ====================

diff --git a/docs/dev/dataflow.rst b/docs/dev/dataflow.rst
@@ -133,10 +133,6 @@ Collections
 For particular views on a data table (which could range from 'show me everything' to 'show me all content nodes with titles starting with "p"') - Collections are used.
 Collections are a cached view onto the data table, which are populated by Models - so if a Model that has previously been fetched from the server by a Collection is requested from :code:`getModel`, it is already cachced.
 
-.. code-block:: javascript
-  // corresponds to /api/content/<channelId>/contentnode/?popular=1
-  const contentCollection = ContentNodeResource.getCollection({ channel_id: channelId }, { popular: 1 });
-
 The first argument defines any additional required :code:`resourceIdentifiers` that we need to build up the URL, while the second argument defines the GET parameters that are used to define the filters to be applied to the data and hence the subset of the data that the Collection represents.
 
 We now have a reference for a representation of this data on the server. To ensure that it has data from the server, we can call :code:`fetch` on it, this will resolve to an array of the returned data objects

diff --git a/docs/dev/index.rst b/docs/dev/index.rst
@@ -40,8 +40,6 @@ References
   :maxdepth: 1
 
   upgrade
-  cli
   files
   glossary
-  building
-  ../py_modules/modules
+
diff --git a/docs/user/install/linux.rst b/docs/user/install/linux.rst
@@ -10,7 +10,7 @@ Linux
 Install
 -------
 
-#. Download the Kolibri :url-deb-installer:`Linux installer <>`.
+#. Download Kolibri.
 #. Run the command:
 
   .. code-block:: bash

diff --git a/docs/user/install/osx.rst b/docs/user/install/osx.rst
@@ -10,7 +10,7 @@ OSX
 Install
 -------
 
-#. Download the Kolibri :url-osx-installer:`OSX installer <>`.
+#. Download Kolibri.
 #. Double-click the downloaded ``.pkg`` file.
 #. Follow the instructions in the installation wizard window.
 #. Once you have Kolibri installed on your system, proceed with the :ref:`initial_setup` of your facility. 

diff --git a/docs/user/install/windows.rst b/docs/user/install/windows.rst
@@ -8,7 +8,7 @@ To install or uninstall Kolibri on Windows, follow these steps.
 Install
 -------
 
-#. Download the Kolibri :url-windows-installer:`Windows installer <>`.
+#. Download Kolibri.
 #. Double-click the downloaded ``.exe`` file.
 #. Select the language for the installation.
 #. Follow the instructions in the installation wizard window.

diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,5 @@
 sphinx
 sphinx_rtd_theme
 sphinx-intl
+sphinx-notfound-page
 kolibri>=0.6,<0.7