[Commits] r474 - in sandbox/website/trunk: docsrc/lib docsrc/lib/GeoExt/widgets geoext/lib/GeoExt/widgets
commits at geoext.org
commits at geoext.org
Sat Apr 25 18:15:29 CEST 2009
Author: tschaub
Date: 2009-04-25 18:15:29 +0200 (Sat, 25 Apr 2009)
New Revision: 474
Modified:
sandbox/website/trunk/docsrc/lib/GeoExt/widgets/MapPanel.rst
sandbox/website/trunk/docsrc/lib/template.jst
sandbox/website/trunk/geoext/lib/GeoExt/widgets/MapPanel.js
Log:
Moving more sphinx specific syntax out of source and into template.
Modified: sandbox/website/trunk/docsrc/lib/GeoExt/widgets/MapPanel.rst
===================================================================
--- sandbox/website/trunk/docsrc/lib/GeoExt/widgets/MapPanel.rst 2009-04-25 16:13:57 UTC (rev 473)
+++ sandbox/website/trunk/docsrc/lib/GeoExt/widgets/MapPanel.rst 2009-04-25 16:15:29 UTC (rev 474)
@@ -63,39 +63,39 @@
.. describe:: center
+
``OpenLayers.LonLat or Array(Number)`` A location for the map center. If
an array is provided, the first two items should represent x & y coordinates.
-
.. describe:: extent
+
``OpenLayers.Bounds or Array(Number)`` An initial extent for the map (used
if center and zoom are not provided. If an array, the first four items
should be minx, miny, maxx, maxy.
-
.. describe:: layers
+
``GeoExt.data.LayerStore or GeoExt.data.GroupingStore or Array(OpenLayers.Layer)``
A store holding records. If not provided, an empty
:class:`GeoExt.data.LayerStore` will be created.
+.. describe:: map
-.. describe:: map
``OpenLayers.Map or Object`` A configured map or a configuration object
for the map constructor. A configured map will be available after
construction through the :attr:`map` property.
-
.. describe:: zoom
+
``Number`` An initial zoom level for the map.
-
Public Properties
-----------------
@@ -104,17 +104,17 @@
.. attribute:: MapPanel.layers
-
+
+
:class:`GeoExt.data.LayerStore` A store containing
:class:`GeoExt.data.LayerRecord` objects.
-
.. attribute:: MapPanel.map
+
``OpenLayers.Map`` A configured map object.
-
Modified: sandbox/website/trunk/docsrc/lib/template.jst
===================================================================
--- sandbox/website/trunk/docsrc/lib/template.jst 2009-04-25 16:13:57 UTC (rev 473)
+++ sandbox/website/trunk/docsrc/lib/template.jst 2009-04-25 16:15:29 UTC (rev 474)
@@ -49,8 +49,10 @@
Configuration properties{% if parent_link is defined %} in addition to
those listed for {{ parent_link }}{% endif %}.
-{% for c in config %}
-{{ c }}
+{% for c in config|dictsort %}
+.. describe:: {{ c[0] }}
+
+ {{ c[1]|indent(4) }}
{% endfor %}
{% endif %}
@@ -61,8 +63,10 @@
Public properties{% if parent_link is defined %} in addition to those
listed for {{ parent_link }}{% endif %}.
-{% for p in properties %}
-{{ p }}
+{% for p in properties|dictsort %}
+.. attribute:: {{ class }}.{{ p[0] }}
+
+ {{ p[1]|indent(4) }}
{% endfor %}
{% endif %}
@@ -73,8 +77,10 @@
Public methods{% if parent_link is defined %} in addition to those
listed for {{ parent_link }}{% endif %}.
-{% for m in methods %}
-{{ m }}
+{% for m in methods|dictsort %}
+.. method:: {{ class }}.{{ m[0] }}
+
+ {{ m[1]|indent(4) }}
{% endfor %}
{% endif %}
@@ -85,7 +91,9 @@
Events{% if parent_link is defined %} in addition to those
listed for {{ parent_link }}{% endif %}.
-{% for e in events %}
-{{ e }}
+{% for e in events|dictsort %}
+.. describe:: {{ e[0] }}
+
+ {{ e[1] }}
{% endfor %}
{% endif %}
Modified: sandbox/website/trunk/geoext/lib/GeoExt/widgets/MapPanel.js
===================================================================
--- sandbox/website/trunk/geoext/lib/GeoExt/widgets/MapPanel.js 2009-04-25 16:13:57 UTC (rev 473)
+++ sandbox/website/trunk/geoext/lib/GeoExt/widgets/MapPanel.js 2009-04-25 16:15:29 UTC (rev 474)
@@ -50,57 +50,50 @@
GeoExt.MapPanel = Ext.extend(Ext.Panel, {
/** jst: config[map]
- * .. describe:: map
- *
- * ``OpenLayers.Map or Object`` A configured map or a configuration object
- * for the map constructor. A configured map will be available after
- * construction through the :attr:`map` property.
+ *
+ * ``OpenLayers.Map or Object`` A configured map or a configuration object
+ * for the map constructor. A configured map will be available after
+ * construction through the :attr:`map` property.
*/
/** jst: properties[map]
- * .. attribute:: MapPanel.map
*
- * ``OpenLayers.Map`` A configured map object.
+ * ``OpenLayers.Map`` A configured map object.
*/
map: null,
/** jst: config[layers]
- * .. describe:: layers
- *
- * ``GeoExt.data.LayerStore or GeoExt.data.GroupingStore or Array(OpenLayers.Layer)``
- * A store holding records. If not provided, an empty
- * :class:`GeoExt.data.LayerStore` will be created.
+ *
+ * ``GeoExt.data.LayerStore or GeoExt.data.GroupingStore or Array(OpenLayers.Layer)``
+ * A store holding records. If not provided, an empty
+ * :class:`GeoExt.data.LayerStore` will be created.
*/
/** jst: properties[layers]
- * .. attribute:: MapPanel.layers
*
- * :class:`GeoExt.data.LayerStore` A store containing
- * :class:`GeoExt.data.LayerRecord` objects.
+ * :class:`GeoExt.data.LayerStore` A store containing
+ * :class:`GeoExt.data.LayerRecord` objects.
*/
layers: null,
/** jst: config[center]
- * .. describe:: center
*
- * ``OpenLayers.LonLat or Array(Number)`` A location for the map center. If
- * an array is provided, the first two items should represent x & y coordinates.
+ * ``OpenLayers.LonLat or Array(Number)`` A location for the map center. If
+ * an array is provided, the first two items should represent x & y coordinates.
*/
center: null,
/** jst: config[zoom]
- * .. describe:: zoom
*
- * ``Number`` An initial zoom level for the map.
+ * ``Number`` An initial zoom level for the map.
*/
zoom: null,
/** jst: config[extent]
- * .. describe:: extent
*
- * ``OpenLayers.Bounds or Array(Number)`` An initial extent for the map (used
- * if center and zoom are not provided. If an array, the first four items
- * should be minx, miny, maxx, maxy.
+ * ``OpenLayers.Bounds or Array(Number)`` An initial extent for the map (used
+ * if center and zoom are not provided. If an array, the first four items
+ * should be minx, miny, maxx, maxy.
*/
extent: null,
More information about the Commits
mailing list