[Commits] r2301 - in sandbox/foss4g2010/src/doc: . layout

[commits at geoext.org]

Author: pgiraud
Date: 2010-09-02 15:28:18 +0200 (Thu, 02 Sep 2010)
New Revision: 2301

Removed:
   sandbox/foss4g2010/src/doc/_static/
Modified:
   sandbox/foss4g2010/src/doc/conf.py
   sandbox/foss4g2010/src/doc/layout/layout.rst
   sandbox/foss4g2010/src/doc/layout/layout_legend.png
   sandbox/foss4g2010/src/doc/layout/layout_tree_group.png
   sandbox/foss4g2010/src/doc/layout/layout_tree_onelayer.png
   sandbox/foss4g2010/src/doc/layout/layout_tree_simple.png
   sandbox/foss4g2010/src/doc/layout/legend.rst
   sandbox/foss4g2010/src/doc/layout/tree.rst
Log:
actually we don't really want static files, also simplified the screenshots

Modified: sandbox/foss4g2010/src/doc/conf.py
===================================================================
--- sandbox/foss4g2010/src/doc/conf.py	2010-09-02 12:13:13 UTC (rev 2300)
+++ sandbox/foss4g2010/src/doc/conf.py	2010-09-02 13:28:18 UTC (rev 2301)
@@ -120,7 +120,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

Modified: sandbox/foss4g2010/src/doc/layout/layout.rst
===================================================================
--- sandbox/foss4g2010/src/doc/layout/layout.rst	2010-09-02 12:13:13 UTC (rev 2300)
+++ sandbox/foss4g2010/src/doc/layout/layout.rst	2010-09-02 13:28:18 UTC (rev 2301)
@@ -107,5 +107,3 @@
 .. figure:: layout_viewport.png
 
     A map and legend in a viewport
-
-See `map.html <../_static/map_viewport.html>`.
\ No newline at end of file

Modified: sandbox/foss4g2010/src/doc/layout/layout_legend.png
===================================================================
(Binary files differ)

Modified: sandbox/foss4g2010/src/doc/layout/layout_tree_group.png
===================================================================
(Binary files differ)

Modified: sandbox/foss4g2010/src/doc/layout/layout_tree_onelayer.png
===================================================================
(Binary files differ)

Modified: sandbox/foss4g2010/src/doc/layout/layout_tree_simple.png
===================================================================
(Binary files differ)

Modified: sandbox/foss4g2010/src/doc/layout/legend.rst
===================================================================
--- sandbox/foss4g2010/src/doc/layout/legend.rst	2010-09-02 12:13:13 UTC (rev 2300)
+++ sandbox/foss4g2010/src/doc/layout/legend.rst	2010-09-02 13:28:18 UTC (rev 2301)
@@ -3,7 +3,7 @@
 Create a LegendPanel
 ====================
 
-Add a legend to the map is as easy as adding to the `map.html <../static/map_legend.html>` code:
+Add a legend to the map is as easy as adding to the :file:`map.html` code:
 
 .. code-block:: javascript
 
@@ -19,6 +19,8 @@
 
 As for the `treePanel`, the last line renders the legend panel inside the body tag of the page. You can use the `renderTo` property as well.
 
+Reload the page (which url should point to @workshop_url@/map.html) in your browser. You should see something like the following:
+
 .. figure:: layout_legend.png
 
-    A legend in a panel
\ No newline at end of file
+    A legend in a panel

Modified: sandbox/foss4g2010/src/doc/layout/tree.rst
===================================================================
--- sandbox/foss4g2010/src/doc/layout/tree.rst	2010-09-02 12:13:13 UTC (rev 2300)
+++ sandbox/foss4g2010/src/doc/layout/tree.rst	2010-09-02 13:28:18 UTC (rev 2301)
@@ -63,7 +63,7 @@
         )
     ];
 
-Find the layers config option in the MapPanel definition in map.html and replace it with the one above.
+Find the layers config option in the MapPanel definition in :file:`map.html` and replace it with the one above.
 
 Also, since we don't want all layers to be considered as overlays we need to set
 options for our map. Add the following to your `GeoExt.MapPanel` configuration object:
@@ -107,7 +107,7 @@
 But instead of this, one can use helpers to do it in an easier way. By helpers, we mean containers. Containers are specific node types made to easily render layers as groups.
 
 The more generic one is ``GeoExt.tree.LayerContainer``. This container automatically pulls in `all` the layers from the map.
-In `map.html <../_static/map_simpletree.html>`_ you can remove the code you used for the `LayerNode` and replace it by the following:
+In :file:`map.html` you can remove the code you used for the `LayerNode` and replace it by the following:
 
 .. code-block:: javascript
 
@@ -176,7 +176,7 @@
 
 In the above examples, we were managing several `OpenLayers` layers. Most of them are provided by the same WMS service. It could then be a good idea to get them grouped in a single `OpenLayers` layers.
 
-The code below is intended to replace the three latest layers in the `MapPanel` configuration in `map.html <../_static/map_layergroup.html>`_.
+The code below is intended to replace the three latest layers in the `MapPanel` configuration in :file:`map.html`.
 
 .. code-block:: javascript
 
@@ -212,4 +212,4 @@
 
 .. figure:: layout_tree_group.png
 
-    Layer in a group
\ No newline at end of file
+    Layer in a group