Merge pull request #144 from flask-dashboard/graph_names

Graph names

flask_monitoringdashboard/core/forms/daterange.py

@@ -14,8 +14,8 @@ class SelectDateRangeForm(FlaskForm):
     """ Used for selecting two dates, which together specify a range. """
     start_date = DateField('Start date', format=DATE_FORMAT, validators=[validators.data_required()])
     end_date = DateField('End date', format=DATE_FORMAT, validators=[validators.data_required()])
-    submit = SubmitField('Submit')
-    title = 'Select two dates for reducing the size of the graph'
+    submit = SubmitField('Update')
+    title = 'Select the time interval'
 
     def get_days(self):
         """

flask_monitoringdashboard/core/forms/double_slider.py

@@ -12,7 +12,7 @@ class DoubleSliderForm(FlaskForm):
     """
     slider0 = IntegerRangeField()
     slider1 = IntegerRangeField()
-    submit = SubmitField('Submit')
+    submit = SubmitField('Update')
     title = 'Select two numbers below for reducing the size of the graph'
     subtitle = ['Subtitle0', 'Subtitle1']
 
@@ -54,15 +54,19 @@ def content(self):
                            self.submit(class_="btn btn-primary btn-block"))
 
 
-def get_double_slider_form(slider_max=[100, 100], subtitle=None):
+def get_double_slider_form(slider_max=(100, 100), title=None, subtitle=None):
     """
     Return a SliderForm with the range from 0 to slider_max
     :param slider_max: maximum value for the slider
+    :param title: override the default title
+    :param subtitle: override the default titles of the 2 sliders
     :return: a SliderForm with the range (0 ... slider_max)
     """
     form = DoubleSliderForm(request.form)
-    form.min_value = [1, 1]
+    form.min_value = (1, 1)
     form.max_value = slider_max
+    if title:
+        form.title = title
     if subtitle:
         form.subtitle = subtitle
     if 'slider0' in request.form:

flask_monitoringdashboard/core/forms/slider.py

@@ -11,7 +11,7 @@ class SliderForm(FlaskForm):
         Class for generating a slider that can be used to reduce the graph.
     """
     slider = IntegerRangeField()
-    submit = SubmitField('Submit')
+    submit = SubmitField('Update')
     title = 'Select a number below for reducing the size of the graph'
 
     def get_slider_value(self):
@@ -38,15 +38,18 @@ def content(self):
                            self.submit(class_="btn btn-primary btn-block"))
 
 
-def get_slider_form(slider_max=100):
+def get_slider_form(slider_max=100, title=None):
     """
     Return a SliderForm with the range from 0 to slider_max
     :param slider_max: maximum value for the slider
+    :param title: override the default title
     :return: a SliderForm with the range (0 ... slider_max)
     """
     form = SliderForm(request.form)
     form.min_value = 1
     form.max_value = slider_max
+    if title:
+        form.title = title
     if 'slider' in request.form:
         form.start_value = request.form['slider']
     else:

flask_monitoringdashboard/templates/fmd_base.html

@@ -45,7 +45,7 @@ <h4>Flask Monitoring Dashboard</h4>
       <span class="navbar-toggler-icon"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbarResponsive">
-      <ul class="navbar-nav navbar-sidenav nav-pills" id="exampleAccordion">
+      <ul class="navbar-nav navbar-sidenav nav-pills" id="exampleAccordion" style="overflow: hidden">
         <li class="nav-item" data-toggle="tooltip" data-placement="right" title="Rules">
           <a class="nav-link {{ active_if_is(rules_endpoint) }}" href="{{ url_for(rules_endpoint) }}">
             <i class="fa fa-fw fa-wrench"></i>

flask_monitoringdashboard/views/dashboard/version_usage.py

@@ -27,7 +27,7 @@
 @secure
 def version_usage():
     with session_scope() as db_session:
-        form = get_slider_form(count_versions(db_session))
+        form = get_slider_form(count_versions(db_session), 'Select the number of versions')
     graph = version_usage_graph(form)
     return render_template('fmd_dashboard/graph.html', graph=graph, title=TITLE,
                            information=get_information(AXES_INFO, CONTENT_INFO), form=form)

flask_monitoringdashboard/views/details/time_user.py

@@ -26,7 +26,7 @@
 def users(end):
     with session_scope() as db_session:
         details = get_endpoint_details(db_session, end)
-        form = get_slider_form(count_users(db_session, end))
+        form = get_slider_form(count_users(db_session, end), title='Select the number of users')
     graph = users_graph(end, form)
 
     return render_template('fmd_dashboard/graph-details.html', details=details, graph=graph, form=form,

flask_monitoringdashboard/views/details/time_version.py

@@ -27,7 +27,7 @@
 @secure
 def versions(end):
     with session_scope() as db_session:
-        form = get_slider_form(count_versions_end(db_session, end))
+        form = get_slider_form(count_versions_end(db_session, end), title='Select the number of versions')
         details = get_endpoint_details(db_session, end)
         graph = versions_graph(db_session, end, form)
         return render_template('fmd_dashboard/graph-details.html', details=details, graph=graph,

flask_monitoringdashboard/views/details/version_ip.py

@@ -34,7 +34,8 @@ def version_ip(end):
     with session_scope() as db_session:
         details = get_endpoint_details(db_session, end)
         form = get_double_slider_form([count_ip(db_session, end), count_versions_end(db_session, end)],
-                                      subtitle=['Amount of IP-addresses', 'Amount of Versions'])
+                                      subtitle=['IP-addresses', 'Versions'],
+                                      title='Select the number of IP-addresses and versions')
         graph = version_ip_graph(db_session, end, form)
     return render_template('fmd_dashboard/graph-details.html', details=details, graph=graph, form=form,
                            title='{} for {}'.format(TITLE, end),

flask_monitoringdashboard/views/details/version_user.py

@@ -34,7 +34,7 @@ def version_user(end):
     with session_scope() as db_session:
         details = get_endpoint_details(db_session, end)
         form = get_double_slider_form([count_users(db_session, end), count_versions_end(db_session, end)],
-                                      subtitle=['Amount of Users', 'Amount of Versions'])
+                                      subtitle=['Users', 'Versions'], title='Select the number of users and versions')
         graph = version_user_graph(db_session, end, form)
     return render_template('fmd_dashboard/graph-details.html', details=details, graph=graph, form=form,
                            title='{} for {}'.format(TITLE, end),