diff options
| -rwxr-xr-x | docs/css/bootstrap-responsive.css (renamed from docs/static/css/bootstrap-responsive.css) | 0 | ||||
| -rwxr-xr-x | docs/css/bootstrap.css (renamed from docs/static/css/bootstrap.css) | 0 | ||||
| -rw-r--r-- | docs/css/default.css (renamed from docs/static/css/default.css) | 0 | ||||
| -rw-r--r-- | docs/css/prettify.css (renamed from docs/static/css/prettify.css) | 0 | ||||
| -rw-r--r-- | docs/img/favicon.ico (renamed from docs/static/img/favicon.ico) | bin | 2238 -> 2238 bytes | |||
| -rw-r--r-- | docs/img/glyphicons-halflings-white.png (renamed from docs/static/img/glyphicons-halflings-white.png) | bin | 8777 -> 8777 bytes | |||
| -rw-r--r-- | docs/img/glyphicons-halflings.png (renamed from docs/static/img/glyphicons-halflings.png) | bin | 12799 -> 12799 bytes | |||
| -rw-r--r-- | docs/img/grid.png (renamed from docs/static/img/grid.png) | bin | 1458 -> 1458 bytes | |||
| -rw-r--r-- | docs/img/quickstart.png (renamed from docs/images/quickstart.png) | bin | 39050 -> 39050 bytes | |||
| -rwxr-xr-x | docs/js/bootstrap-2.1.1-min.js (renamed from docs/static/js/bootstrap-2.1.1-min.js) | 0 | ||||
| -rw-r--r-- | docs/js/jquery-1.8.1-min.js (renamed from docs/static/js/jquery-1.8.1-min.js) | 0 | ||||
| -rw-r--r-- | docs/js/prettify-1.0.js (renamed from docs/static/js/prettify-1.0.js) | 0 | ||||
| -rw-r--r-- | docs/template.html | 2 | ||||
| -rw-r--r-- | docs/tutorial/quickstart.md | 2 | ||||
| -rwxr-xr-x | mkdocs.py | 22 | 
15 files changed, 14 insertions, 12 deletions
| diff --git a/docs/static/css/bootstrap-responsive.css b/docs/css/bootstrap-responsive.css index a8caf451..a8caf451 100755 --- a/docs/static/css/bootstrap-responsive.css +++ b/docs/css/bootstrap-responsive.css diff --git a/docs/static/css/bootstrap.css b/docs/css/bootstrap.css index 53df6859..53df6859 100755 --- a/docs/static/css/bootstrap.css +++ b/docs/css/bootstrap.css diff --git a/docs/static/css/default.css b/docs/css/default.css index c1d2e885..c1d2e885 100644 --- a/docs/static/css/default.css +++ b/docs/css/default.css diff --git a/docs/static/css/prettify.css b/docs/css/prettify.css index d437aff6..d437aff6 100644 --- a/docs/static/css/prettify.css +++ b/docs/css/prettify.css diff --git a/docs/static/img/favicon.ico b/docs/img/favicon.icoBinary files differ index 917892ad..917892ad 100644 --- a/docs/static/img/favicon.ico +++ b/docs/img/favicon.ico diff --git a/docs/static/img/glyphicons-halflings-white.png b/docs/img/glyphicons-halflings-white.pngBinary files differ index 3bf6484a..3bf6484a 100644 --- a/docs/static/img/glyphicons-halflings-white.png +++ b/docs/img/glyphicons-halflings-white.png diff --git a/docs/static/img/glyphicons-halflings.png b/docs/img/glyphicons-halflings.pngBinary files differ index a9969993..a9969993 100644 --- a/docs/static/img/glyphicons-halflings.png +++ b/docs/img/glyphicons-halflings.png diff --git a/docs/static/img/grid.png b/docs/img/grid.pngBinary files differ index 878c3ed5..878c3ed5 100644 --- a/docs/static/img/grid.png +++ b/docs/img/grid.png diff --git a/docs/images/quickstart.png b/docs/img/quickstart.pngBinary files differ index 5006d60f..5006d60f 100644 --- a/docs/images/quickstart.png +++ b/docs/img/quickstart.png diff --git a/docs/static/js/bootstrap-2.1.1-min.js b/docs/js/bootstrap-2.1.1-min.js index e0b220f4..e0b220f4 100755 --- a/docs/static/js/bootstrap-2.1.1-min.js +++ b/docs/js/bootstrap-2.1.1-min.js diff --git a/docs/static/js/jquery-1.8.1-min.js b/docs/js/jquery-1.8.1-min.js index 3b8d15d0..3b8d15d0 100644 --- a/docs/static/js/jquery-1.8.1-min.js +++ b/docs/js/jquery-1.8.1-min.js diff --git a/docs/static/js/prettify-1.0.js b/docs/js/prettify-1.0.js index eef5ad7e..eef5ad7e 100644 --- a/docs/static/js/prettify-1.0.js +++ b/docs/js/prettify-1.0.js diff --git a/docs/template.html b/docs/template.html index d94bef4a..b8e8b0bb 100644 --- a/docs/template.html +++ b/docs/template.html @@ -84,6 +84,7 @@                </li>              </ul>              <ul class="nav pull-right"> +              <!-- TODO                <li class="dropdown">                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Version: 2.0.0 <b class="caret"></b></a>                  <ul class="dropdown-menu"> @@ -91,6 +92,7 @@                    <li><a href="#">2.0.0</a></li>                  </ul>                </li> +            -->              </ul>            </div><!--/.nav-collapse -->          </div> diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md index cf5933ad..85411378 100644 --- a/docs/tutorial/quickstart.md +++ b/docs/tutorial/quickstart.md @@ -167,6 +167,6 @@ Great, that was easy!  If you want to get a more in depth understanding of how REST framework fits together head on over to [the tutorial][tutorial], or start browsing the [API guide][guide]. -[image]: ../images/quickstart.png +[image]: ../img/quickstart.png  [tutorial]: 1-serialization.md  [guide]: ../#api-guide
\ No newline at end of file @@ -29,27 +29,27 @@ code_label = r'<a class="github" href="https://github.com/tomchristie/django-res  page = open(os.path.join(docs_dir, 'template.html'), 'r').read()  # Copy static files -for static in ['css', 'js', 'img']: -    source = os.path.join(docs_dir, 'static', static) -    target = os.path.join(html_dir, static) -    if os.path.exists(target): -        shutil.rmtree(target) -    shutil.copytree(source, target) +# for static in ['css', 'js', 'img']: +#     source = os.path.join(docs_dir, 'static', static) +#     target = os.path.join(html_dir, static) +#     if os.path.exists(target): +#         shutil.rmtree(target) +#     shutil.copytree(source, target)  for (dirpath, dirnames, filenames) in os.walk(docs_dir):      relative_dir = dirpath.replace(docs_dir, '').lstrip(os.path.sep)      build_dir = os.path.join(html_dir, relative_dir) +      if not os.path.exists(build_dir):          os.makedirs(build_dir)      for filename in filenames:          path = os.path.join(dirpath, filename) -        if filename.endswith('.png'): -            output_path = os.path.join(build_dir, filename) -            shutil.copy(path, output_path) -            continue -        elif not filename.endswith('.md'): +        if not filename.endswith('.md'): +            if relative_dir: +                output_path = os.path.join(build_dir, filename) +                shutil.copy(path, output_path)              continue          output_path = os.path.join(build_dir, filename[:-3] + '.html') | 
