Commit Graph

623 Commits

Author SHA1 Message Date
Dougal Matthews
1a87bede35 Add nested navigation to the ReadTheDocs theme 2015-05-05 08:38:52 +01:00
Dougal Matthews
a413dfd48b Add nested navigation the the MkDocs theme 2015-05-05 08:38:52 +01:00
Dougal Matthews
639af4e70f Refactor site navigation generation to allow further nesting
Further refactor the site navigation builder to allow for further
nesting of the pages.
2015-05-05 08:38:52 +01:00
Dougal Matthews
8085c65c6a Refactor the pages configuration
The current pages configuration looks like this:

    pages:
    - ['index.md', 'Home']
    - ['writing-your-docs.md', 'User Guide', 'Writing your docs']
    - ['styling-your-docs.md', 'User Guide', 'Styling your docs']
    - ['configuration.md', 'User Guide', 'Configuration']
    - ['about/license.md', 'About', 'License']
    - ['about/release-notes.md', 'About', 'Release Notes']
    - ['about/contributing.md', 'About', 'Contributing']

This has a number of flaws:

- It isn't clear how to add second levels of navigation for
  newcomers. This is often queried and not easy to document.

- We are representing a tree structure as a set of flat items
  that need to be merged. This creates some interesting edge
  cases, for example:

    - ['writing-your-docs.md', 'User Guide']
    - ['styling-your-docs.md', 'User Guide', 'Styling your docs']

 Is the first entry a page with the title User Guide? or a page
 in the User Guide category with an automatic title.

- We are currently limited to two levels deep in the navigation.
  Changing this with the current structure isn't trivial.

This change adds a new format which makes the above configuration
look like this:

    pages:
    - Home: index.md
    - User Guide:
        - user-guide/writing-your-docs.md
        - user-guide/styling-your-docs.md
        - user-guide/configuration.md
    - About:
        - License: about/license.md
        - about/release-notes.md
        - Contributing: about/contributing.md

With this structure, we can more easily see the documentation
tree and it is far more obvious what the navigation will look
like. It also removes the ambiguous edge cases and opens up the
possibility of adding further levels to the navigation more
easily.

This change restructures the pages configuration, but doesn't yet
allow users to add further levels in the navigation.

Fixes #6
2015-05-05 08:38:18 +01:00
Dougal Matthews
1a0dfb5ee3 Merge pull request #497 from ugocupcic/F#316_titles_squashed_hist
Fixes #316 - titles
2015-05-05 07:54:53 +01:00
Ugo Cupcic
11de1929e5 fixing code smell 2015-05-05 07:44:19 +02:00
Ugo Cupcic
26f2465c41 Fixes #316 - better navigation titles 2015-05-05 07:35:14 +02:00
Ugo Cupcic
965b62ee73 merged upstream 2015-05-04 13:54:59 +02:00
Dougal Matthews
aa7dd95813 Merge pull request #492 from d0ugal/master
Remove extra logging and correct a log message
2015-05-04 08:32:26 +01:00
Dougal Matthews
fafea5efd8 Remove extra logging and correct a log message 2015-05-02 12:33:15 +01:00
Dougal Matthews
7fa41ab65b Merge pull request #436 from d0ugal/sitemap
Add building extra templates
2015-05-02 07:23:37 +01:00
Dougal Matthews
76e44bceb7 Merge pull request #491 from d0ugal/master
Fix a possible error when pages can't be found and then are skipped
2015-05-01 07:54:13 +01:00
Dougal Matthews
25665133cf Fix a possible error when pages can't be found and then are skipped 2015-05-01 07:28:20 +01:00
Dougal Matthews
2148bc851b Merge pull request #483 from d0ugal/remove-json-cmd
Start the deprecation of the json cmd
2015-05-01 07:14:00 +01:00
Dougal Matthews
e57e47e377 Merge pull request #490 from d0ugal/less_dates
Only include the build date and version on the homepage.
2015-04-30 11:29:37 +01:00
Dougal Matthews
b92bceb528 Only include the build date and version on the homepage.
We only really need it on one place.
2015-04-30 11:09:26 +01:00
Dougal Matthews
075410d976 Start the deprecation of mkdocs json
Fixes #481
2015-04-29 09:38:57 +01:00
Dougal Matthews
28dc279e5a Merge pull request #487 from d0ugal/cli-typos
Fixed a couple of Typos in the recent CLI refactor
2015-04-29 09:38:28 +01:00
Dougal Matthews
0becdd0190 Fixed a couple of Typos in the recent CLI refactor 2015-04-29 09:05:27 +01:00
Dougal Matthews
f496c4524f Merge pull request #450 from d0ugal/click
Refactor the current CLI implementation to use Click
2015-04-28 21:02:37 +01:00
Dougal Matthews
b5bd1c7f0b Add building extra templates
This is similar to extra_css and extra_javascript except it picks up
HTML and XML files and runs them through jinja2 with the global context.
This adds for quite a bit of flexability and allows people to easily add
custom site maps, static and templates htlp.

Fixes #28
Fixes #44
2015-04-28 20:43:19 +01:00
Dougal Matthews
c3ab1cc95b Refactor the current CLI implementation to use Click
This reimplements the CLI interface to use Click, which in turn gives us
a much easier to use interface as it provides help messages for all the
commands and individual commands.

Fixes #259
2015-04-28 20:06:57 +01:00
Dougal Matthews
c3d1b9bc6d Merge pull request #486 from facelessuser/master
Preserve order of Python Markdown extensions
2015-04-28 08:08:07 +01:00
facelessuser
801a5259b7 Preserve order of Python Markdown extensions
Python Markdown inclusion order can be important when including various
custom extensions.  Conflicts can arise as to where extensions get
inserted in the workflow.  By preserving order of how extensions are
defined in the settings file, this can allow a user to control
insertion order and work around these issues.  As Py26 supported is
noted to be removed in the future, I saw no reason to add additional
dependencies for OrderedDict.  Try catch statements can be removed when
Py26 support is removed.
2015-04-27 20:34:09 -06:00
Dougal Matthews
6d69d85969 Merge pull request #484 from d0ugal/cleanup
Added a missing base class
2015-04-27 23:00:45 +01:00
Dougal Matthews
f8abad096d Added a missing base class 2015-04-27 20:53:53 +01:00
Dougal Matthews
8ba6864282 Merge pull request #457 from d0ugal/search-new
Add search to MkDocs
2015-04-27 12:18:06 +01:00
Dougal Matthews
7409a71b88 Merge pull request #478 from d0ugal/docs-pages
Add further documentation about the pages config
2015-04-26 10:18:30 +01:00
Dougal Matthews
2b37deb188 Add further documentation about the pages config
This change explicitly calls out how to do multi-level documentation.

Closes #475
2015-04-26 09:02:13 +01:00
Dougal Matthews
835c27b5b2 Add details about implementing search in a custom theme 2015-04-25 10:03:47 +01:00
Dougal Matthews
621f38c9ff Enable permalinks in the MkDocs docs.
They were used a bit in the previous doc additions, so makes sense to
add them.
2015-04-24 20:44:18 +01:00
Dougal Matthews
eb75c8a71a Expanded the section at the start of styling your docs 2015-04-24 20:43:47 +01:00
Dougal Matthews
3241ae5cf9 Only load the search index on the search page in the RTD theme 2015-04-23 22:27:02 +01:00
Dougal Matthews
68521de4f7 Remove the dependency on jQuery 2015-04-23 22:27:02 +01:00
Dougal Matthews
159fe16eee Rename the search modal 2015-04-23 22:27:02 +01:00
Dougal Matthews
f82d9da182 Remove the source maps which cause 404's 2015-04-23 22:27:02 +01:00
Dougal Matthews
6749cc87cb Remove unused extra_context parameter from build template 2015-04-23 22:27:02 +01:00
Dougal Matthews
c46549ad3b Remove a conditional import that is better handled by six 2015-04-23 22:27:02 +01:00
Dougal Matthews
347020103c Add frontend and support it in the MkDocs and RTD themes 2015-04-23 22:27:02 +01:00
Dougal Matthews
56caa4e438 Remove references to include_search in themes that don't support search 2015-04-23 22:27:02 +01:00
Dougal Matthews
234bc4168d Remove mkdocs.compat and add six
Fixes #447
2015-04-23 22:27:02 +01:00
Dougal Matthews
bc8518c78d Generate a search index
This change adds a new stage to the build process which creates a search
index based on the contents of the documentation.
2015-04-23 22:21:51 +01:00
Ugo Cupcic
c5d3555594 refactoring: moving markdown parsing to utils 2015-04-23 11:08:55 +02:00
Ugo Cupcic
3fe8bbe46e comment 2015-04-23 10:48:50 +02:00
Ugo Cupcic
0b50ba7ec4 refactoring: filename_to_title changed to file_to_title 2015-04-23 10:38:53 +02:00
Dougal Matthews
4991aada68 Added release notes for 0.12.2 2015-04-22 08:24:04 +01:00
Dougal Matthews
2bf3d03b9a Merge pull request #470 from d0ugal/v
Bump to 0.13.0.dev
2015-04-22 08:21:43 +01:00
Dougal Matthews
3e6f0fa9e4 Bump to 0.13.0.dev 2015-04-22 08:06:21 +01:00
Dougal Matthews
3b565964ff Merge pull request #469 from d0ugal/wheels
Create Wheels
2015-04-22 08:02:41 +01:00
Dougal Matthews
727905e5a5 Add universal = 1 for wheels 2015-04-21 16:57:32 +01:00