Merge branch 'master' of https://github.com/CI-WATER/tethys

tethysplatform · Jul 11, 2015 · 4e60a23 · 4e60a23
2 parents 5986b06 + 5a67a3b
commit 4e60a23
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 19 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+docs/* linguist-documentation
+static/tethys_portal/vendor/* linguist-vendored
+tethys_apps/static/vendor/* linguist-vendored
+tethys_gizmos/static/vendor/* linguist-vendored
diff --git a/docs/images/map_single_page.png b/docs/images/map_single_page.png
diff --git a/docs/images/new_map_page.png b/docs/images/new_map_page.png
diff --git a/docs/tethys_sdk/gizmos.rst b/docs/tethys_sdk/gizmos.rst
@@ -25,24 +25,24 @@ A detailed description of each step follows.
 
 The first step is to import the appropriate options object and configure the Gizmo. This is performed in the controller of the template where the Gizmo will be used.
 
-In this case, we import ``DatePickerOptions`` and initialize a new object called ``date_picker_options`` with the appropriate options. Then we pass the object to the template via the ``context`` dictionary:
+In this case, we import ``DatePicker`` and initialize a new object called ``date_picker_options`` with the appropriate options. Then we pass the object to the template via the ``context`` dictionary:
 
 ::
 
-    from tethys_gizmos.gizmos_options import DatePickerOptions
+    from tethys_apps.sdk.gizmos import DatePicker
 
     def example_controller(request):
         """
         Example of a controller that defines options for a Template Gizmo.
         """
-        date_picker_options = DatePickerOptions(name='data1',
-                                                display_text='Date',
-                                                autoclose=True,
-                                                format='MM d, yyyy',
-                                                start_date='2/15/2014',
-                                                start_view='decade',
-                                                today_button=True,
-                                                initial='February 15, 2014')
+        date_picker_options = DatePicker(name='data1',
+                                         display_text='Date',
+                                         autoclose=True,
+                                         format='MM d, yyyy',
+                                         start_date='2/15/2014',
+                                         start_view='decade',
+                                         today_button=True,
+                                         initial='February 15, 2014')
 
         context = {'date_picker_options': date_picker_options}
 

diff --git a/docs/tutorials/getting_started/url_mapping.rst b/docs/tutorials/getting_started/url_mapping.rst
@@ -73,7 +73,7 @@ In this code, the ``url`` template tag is used to provide the url to the map pag
 View New Map Page
 =================
 
-At this point, your app should be ready to run again. Save all changes in the files you edited and restart the development server using the ``tethys manage start`` command in the terminal (stop it using :kbd:`CTRL-C` if necessary). Browse to your app home page at `<http://127.0.0.1:8000/apps/my-first-app>`_. Use the "Go To Map" action to browse to your new map page. It should look similar to this:
+At this point, your app should be ready to run again. Save all changes in the files you edited and restart the development server using the ``tethys manage start`` command in the terminal (stop it using :kbd:`CTRL-C` if necessary). Browse to your app home page at `<http://127.0.0.1:8000/apps/my-first-app>`_. Use the "Go To Map" action to browse to your new map page. Click on the "Provo Stream Gages" layer in the legend to zoom to that layer. Your map page should look similar to this:
 
 .. figure:: ../../images/new_map_page.png
     :width: 650px
diff --git a/setup.py b/setup.py
@@ -9,6 +9,7 @@
 
 requires = []
 
+
 version = '1.1.0'
 
 setup(

diff --git a/tethys_gizmos/gizmo_options/highcharts_plot_view.py b/tethys_gizmos/gizmo_options/highcharts_plot_view.py
@@ -499,7 +499,7 @@ class HighChartsLinePlot(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view line_plot_view %}
+        {% gizmo highcharts_plot_view line_plot_view %}
 
     """
 
@@ -594,7 +594,7 @@ class HighChartsPolarPlot(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view web_plot %}
+        {% gizmo highcharts_plot_view web_plot %}
 
     """
 
@@ -705,7 +705,7 @@ class HighChartsScatterPlot(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view scatter_plot_view %}
+        {% gizmo highcharts_plot_view scatter_plot_view %}
 
     """
 
@@ -789,7 +789,7 @@ class HighChartsPiePlot(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view pie_plot_view %}
+        {% gizmo highcharts_plot_view pie_plot_view %}
 
     """
 
@@ -869,7 +869,7 @@ class HighChartsBarPlot(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view bar_plot_view %}
+        {% gizmo highcharts_plot_view bar_plot_view %}
 
     """
 
@@ -985,7 +985,7 @@ class HighChartsTimeSeries(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view timeseries_plot %}
+        {% gizmo highcharts_plot_view timeseries_plot %}
     """
 
     def __init__(self, series=[], title='', subtitle='', y_axis_title='', y_axis_units='', **kwargs):
@@ -1094,7 +1094,7 @@ class HighChartsAreaRange(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view area_range_plot %}
+        {% gizmo highcharts_plot_view area_range_plot %}
 
     """
 
@@ -1195,7 +1195,7 @@ class HighChartsHeatMap(HighChartsObjectBase):
 
         # TEMPLATE
 
-        {% gizmo plot_view heat_map_plot %}
+        {% gizmo highcharts_plot_view heat_map_plot %}
 
     """