From 462659a9fcff2f61d752a85651433964ce40449b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 19 Mar 2013 12:17:00 -0600 Subject: [PATCH] Use index.html instead of example-list.html The original decision to avoid index.html was because it only works with a build step. Since we've all accepted a build step, the more sensible name is index.html. Without this change, every hosted example has a link to http://openlayers.github.com/ol3/master/examples/example-list.html which 404s. --- bin/example-screenshot.js | 2 +- bin/exampleparser.py | 4 ++-- build.py | 5 ++--- examples/anchored-elements.html | 2 +- examples/animation.html | 2 +- examples/bind-input.html | 2 +- examples/bing-maps.html | 2 +- examples/brightness-contrast.html | 2 +- examples/canvas-tiles.html | 2 +- examples/epsg-4326.html | 2 +- examples/export-jpeg.html | 2 +- examples/geolocation.html | 2 +- examples/hue-saturation.html | 2 +- examples/{example-list.html => index.html} | 2 +- examples/mapquest.html | 2 +- examples/mouse-position.html | 2 +- examples/rotation.html | 2 +- examples/scale-line.html | 2 +- examples/semi-transparent-layer.html | 2 +- examples/side-by-side.html | 2 +- examples/simple.html | 2 +- examples/stamen.html | 2 +- examples/style-rules.html | 2 +- examples/tilejson.html | 2 +- examples/vector-layer.html | 2 +- examples/wms-capabilities.html | 2 +- examples/wms-custom-proj.html | 2 +- examples/wms-single-image-custom-proj.html | 2 +- examples/wms-single-image.html | 2 +- examples/wms-tiled.html | 2 +- examples/wmts-from-capabilities.html | 2 +- examples/wmts.html | 2 +- examples/zoomslider.html | 2 +- 33 files changed, 35 insertions(+), 36 deletions(-) rename examples/{example-list.html => index.html} (98%) diff --git a/bin/example-screenshot.js b/bin/example-screenshot.js index 9904316c36..ac86cfaba3 100644 --- a/bin/example-screenshot.js +++ b/bin/example-screenshot.js @@ -42,7 +42,7 @@ exampleDir = system.args[2], // various settings ignoreFiles = [ - 'example-list.html' + 'index.html' ], intervalMillisecs = 25, renderMillisecs = 2000, diff --git a/bin/exampleparser.py b/bin/exampleparser.py index 042e83c246..573198a132 100755 --- a/bin/exampleparser.py +++ b/bin/exampleparser.py @@ -38,11 +38,11 @@ feedPath = "http://openlayers.github.com/ol3/master/examples/" def getListOfExamples(relPath): """ returns list of .html filenames within a given path - excludes - example-list.html + index.html """ examples = os.listdir(relPath) examples = [example for example in examples if - example.endswith('.html') and example != "example-list.html"] + example.endswith('.html') and example != "index.html"] return examples diff --git a/build.py b/build.py index 01205ef6df..fdbe1478a8 100755 --- a/build.py +++ b/build.py @@ -51,7 +51,7 @@ EXAMPLES = [path for path in ifind('examples') if not path.startswith('examples/standalone/') if path.endswith('.html') - if path != 'examples/example-list.html'] + if path != 'examples/index.html'] EXAMPLES_JSON = [example.replace('.html', '.json') for example in EXAMPLES] @@ -425,8 +425,7 @@ def hostexamples(t): t.cp('build/loader_hosted_examples.js', examples_dir + '/loader.js') t.cp('build/ol.js', 'build/ol-simple.js', 'build/ol-whitespace.js', 'build/ol.css', build_dir) - t.cp('examples/example-list.html', examples_dir + '/index.html') - t.cp('examples/example-list.js', 'examples/example-list.xml', + t.cp('examples/index.html', 'examples/example-list.js', 'examples/example-list.xml', 'examples/Jugl.js', 'examples/jquery.min.js', 'examples/social-links.js', examples_dir) t.rm_rf('build/gh-pages/%(BRANCH)s/closure-library') t.makedirs('build/gh-pages/%(BRANCH)s/closure-library') diff --git a/examples/anchored-elements.html b/examples/anchored-elements.html index 2c76782c3e..16833dd89b 100644 --- a/examples/anchored-elements.html +++ b/examples/anchored-elements.html @@ -69,7 +69,7 @@
- OpenLayers 3 Examples + OpenLayers 3 Examples
    • diff --git a/examples/animation.html b/examples/animation.html index 3de1bea818..58e0a4c377 100644 --- a/examples/animation.html +++ b/examples/animation.html @@ -14,7 +14,7 @@
    - OpenLayers 3 Examples + OpenLayers 3 Examples
      • diff --git a/examples/bind-input.html b/examples/bind-input.html index ea52757eb9..7e09555b42 100644 --- a/examples/bind-input.html +++ b/examples/bind-input.html @@ -14,7 +14,7 @@
      - OpenLayers 3 Examples + OpenLayers 3 Examples
        • diff --git a/examples/bing-maps.html b/examples/bing-maps.html index c3498e7d08..1fd6bf8dcc 100644 --- a/examples/bing-maps.html +++ b/examples/bing-maps.html @@ -14,7 +14,7 @@
        - OpenLayers 3 Examples + OpenLayers 3 Examples
          • diff --git a/examples/brightness-contrast.html b/examples/brightness-contrast.html index 5434bca1c1..67542e5591 100644 --- a/examples/brightness-contrast.html +++ b/examples/brightness-contrast.html @@ -14,7 +14,7 @@
          - OpenLayers 3 Examples + OpenLayers 3 Examples
            • diff --git a/examples/canvas-tiles.html b/examples/canvas-tiles.html index 703b61d318..a8eb159133 100644 --- a/examples/canvas-tiles.html +++ b/examples/canvas-tiles.html @@ -14,7 +14,7 @@
            - OpenLayers 3 Examples + OpenLayers 3 Examples
              • diff --git a/examples/epsg-4326.html b/examples/epsg-4326.html index d78c20b3ed..f50838cb1e 100644 --- a/examples/epsg-4326.html +++ b/examples/epsg-4326.html @@ -14,7 +14,7 @@
              - OpenLayers 3 Examples + OpenLayers 3 Examples
                • diff --git a/examples/export-jpeg.html b/examples/export-jpeg.html index aacb2ecf7d..9e280e427d 100644 --- a/examples/export-jpeg.html +++ b/examples/export-jpeg.html @@ -14,7 +14,7 @@
                - OpenLayers 3 Examples + OpenLayers 3 Examples
                  • diff --git a/examples/geolocation.html b/examples/geolocation.html index a1da7bea06..597b14e7ce 100644 --- a/examples/geolocation.html +++ b/examples/geolocation.html @@ -20,7 +20,7 @@
                  - OpenLayers 3 Examples + OpenLayers 3 Examples
                    • diff --git a/examples/hue-saturation.html b/examples/hue-saturation.html index bee40e14c5..bfe7bc3787 100644 --- a/examples/hue-saturation.html +++ b/examples/hue-saturation.html @@ -14,7 +14,7 @@
                    - OpenLayers 3 Examples + OpenLayers 3 Examples
                      • diff --git a/examples/example-list.html b/examples/index.html similarity index 98% rename from examples/example-list.html rename to examples/index.html index ff9cc49aba..4eeed6938f 100644 --- a/examples/example-list.html +++ b/examples/index.html @@ -174,7 +174,7 @@
                      - OpenLayers 3 Examples + OpenLayers 3 Examples
                      diff --git a/examples/mapquest.html b/examples/mapquest.html index d4fedb9b2b..81f455df9a 100644 --- a/examples/mapquest.html +++ b/examples/mapquest.html @@ -14,7 +14,7 @@
                      - OpenLayers 3 Examples + OpenLayers 3 Examples
                        • diff --git a/examples/mouse-position.html b/examples/mouse-position.html index aca8a6575a..cbe629e930 100644 --- a/examples/mouse-position.html +++ b/examples/mouse-position.html @@ -14,7 +14,7 @@
                        - OpenLayers 3 Examples + OpenLayers 3 Examples
                          • diff --git a/examples/rotation.html b/examples/rotation.html index 1f1eec6da4..118008ab6d 100644 --- a/examples/rotation.html +++ b/examples/rotation.html @@ -14,7 +14,7 @@
                          - OpenLayers 3 Examples + OpenLayers 3 Examples
                            • diff --git a/examples/scale-line.html b/examples/scale-line.html index 62b62d3a45..0ac37b53f0 100644 --- a/examples/scale-line.html +++ b/examples/scale-line.html @@ -14,7 +14,7 @@
                            - OpenLayers 3 Examples + OpenLayers 3 Examples
                              • diff --git a/examples/semi-transparent-layer.html b/examples/semi-transparent-layer.html index 6b619fddd1..b1e8d4183b 100644 --- a/examples/semi-transparent-layer.html +++ b/examples/semi-transparent-layer.html @@ -14,7 +14,7 @@
                              - OpenLayers 3 Examples + OpenLayers 3 Examples
                                • diff --git a/examples/side-by-side.html b/examples/side-by-side.html index 5dd9223d0e..c116a50b23 100644 --- a/examples/side-by-side.html +++ b/examples/side-by-side.html @@ -14,7 +14,7 @@
                                - OpenLayers 3 Examples + OpenLayers 3 Examples
                                  • diff --git a/examples/simple.html b/examples/simple.html index 9a349b3224..579a730cfc 100644 --- a/examples/simple.html +++ b/examples/simple.html @@ -14,7 +14,7 @@
                                  - OpenLayers 3 Examples + OpenLayers 3 Examples
                                    • diff --git a/examples/stamen.html b/examples/stamen.html index 7afe45e4f5..599bede6db 100644 --- a/examples/stamen.html +++ b/examples/stamen.html @@ -14,7 +14,7 @@
                                    - OpenLayers 3 Examples + OpenLayers 3 Examples
                                      • diff --git a/examples/style-rules.html b/examples/style-rules.html index fe787c8c99..c95589dd71 100644 --- a/examples/style-rules.html +++ b/examples/style-rules.html @@ -14,7 +14,7 @@
                                      - OpenLayers 3 Examples + OpenLayers 3 Examples
                                        • diff --git a/examples/tilejson.html b/examples/tilejson.html index 5720fe5517..2ed8d448c3 100644 --- a/examples/tilejson.html +++ b/examples/tilejson.html @@ -14,7 +14,7 @@
                                        - OpenLayers 3 Examples + OpenLayers 3 Examples
                                          • diff --git a/examples/vector-layer.html b/examples/vector-layer.html index 9507bdd5d4..2933d5e21a 100644 --- a/examples/vector-layer.html +++ b/examples/vector-layer.html @@ -14,7 +14,7 @@
                                          - OpenLayers 3 Examples + OpenLayers 3 Examples
                                            • diff --git a/examples/wms-capabilities.html b/examples/wms-capabilities.html index 129a79759c..02c061b7fc 100644 --- a/examples/wms-capabilities.html +++ b/examples/wms-capabilities.html @@ -14,7 +14,7 @@
                                            - OpenLayers 3 Examples + OpenLayers 3 Examples
                                              • diff --git a/examples/wms-custom-proj.html b/examples/wms-custom-proj.html index 6f8bebbbe1..9a9649eb78 100644 --- a/examples/wms-custom-proj.html +++ b/examples/wms-custom-proj.html @@ -14,7 +14,7 @@
                                              - OpenLayers 3 Examples + OpenLayers 3 Examples
                                                • diff --git a/examples/wms-single-image-custom-proj.html b/examples/wms-single-image-custom-proj.html index 59eb495572..d815ffe8cc 100644 --- a/examples/wms-single-image-custom-proj.html +++ b/examples/wms-single-image-custom-proj.html @@ -14,7 +14,7 @@
                                                - OpenLayers 3 Examples + OpenLayers 3 Examples
                                                  • diff --git a/examples/wms-single-image.html b/examples/wms-single-image.html index 9c2aec69e1..b6010f9ba5 100644 --- a/examples/wms-single-image.html +++ b/examples/wms-single-image.html @@ -14,7 +14,7 @@
                                                  - OpenLayers 3 Examples + OpenLayers 3 Examples
                                                    • diff --git a/examples/wms-tiled.html b/examples/wms-tiled.html index d8fe63ab32..97c9f1cf76 100644 --- a/examples/wms-tiled.html +++ b/examples/wms-tiled.html @@ -14,7 +14,7 @@
                                                    - OpenLayers 3 Examples + OpenLayers 3 Examples
                                                      • diff --git a/examples/wmts-from-capabilities.html b/examples/wmts-from-capabilities.html index 0952265356..6cc64678a7 100644 --- a/examples/wmts-from-capabilities.html +++ b/examples/wmts-from-capabilities.html @@ -14,7 +14,7 @@
                                                      - OpenLayers 3 Examples + OpenLayers 3 Examples
                                                        • diff --git a/examples/wmts.html b/examples/wmts.html index 00e0bebf2e..46cd2f5315 100644 --- a/examples/wmts.html +++ b/examples/wmts.html @@ -14,7 +14,7 @@
                                                        - OpenLayers 3 Examples + OpenLayers 3 Examples
                                                          • diff --git a/examples/zoomslider.html b/examples/zoomslider.html index 66531e66a6..2391da35fa 100644 --- a/examples/zoomslider.html +++ b/examples/zoomslider.html @@ -66,7 +66,7 @@
                                                          - OpenLayers 3 Examples + OpenLayers 3 Examples