Merge pull request #244 from rapidpro/develop

Updates for Deploy 1.6.1

docs/conf.py

@@ -54,7 +54,7 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = "1.6.0"
+release = "1.6.1"
 
 # The short X.Y version.
 version = "1.6"

docs/releases/changelog.rst

@@ -6,6 +6,14 @@ Tracpro's version is incremented upon each merge to master according to our `Dep
 We recommend reviewing the release notes and code diffs before upgrading
 between versions.
 
+
+v1.6.1 (released 2017-06-05)
+----------------------------
+
+Code diff: https://github.com/rapidpro/tracpro/compare/v1.6.0...v1.6.1
+
+* New infographic to guide the user through navigation between steps of making selections of data to track: Panels --> Cohorts --> Flows --> Fetch Runs
+
 v1.6.0 (released 2017-05-26)
 ----------------------------
 

tracpro/__init__.py

@@ -6,7 +6,7 @@
 
 
 # NOTE: Version must be updated in docs/conf.py as well.
-VERSION = (1, 6, 0, "final")
+VERSION = (1, 6, 1, "final")
 
 
 def get_version(version):

tracpro/static/less/trac.less

@@ -203,4 +203,44 @@ footer {
 /* Override datepicker colors */
 .ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year {
   color: #000000;
+}
+
+/* Workflow Tracker Styles */
+.workflow-tracker {
+  margin-left: 150px;
+  margin-bottom: 55px;
+}
+
+.circle, .circle-selected {
+  border-radius: 50%;
+  width: 75px;
+  height: 75px;
+  background-color: #CCC;
+  text-align: center;
+  color: #FFFFFF;
+  font-size: 2em;
+  font-weight: bold;
+  line-height: 2em;
+  padding-top: 0.3em;
+  &:hover {
+    background-color: #2A5032;
+  }
+}
+
+.circle-selected {
+  background-color: #2A5032;
+}
+
+.circle-label {
+    font-size: .5em;
+    color: #000000;
+    line-height: 1.5em;
+    padding-top: 15px;
+    width: 100px;
+    margin-left: -25px;
+}
+
+.workflow-spacer, .workflow-spacer-small {
+  border-top: #CCCCCC solid 1px;
+  margin-top: 40px;
 }

tracpro/templates/frame.html

@@ -134,15 +134,15 @@
                 <li class='dropdown'>
                   <a class='dropdown-toggle' data-toggle='dropdown' href='#'>{% trans "Flow Management" %} <b class='caret'></b></a>
                   <ul class='dropdown-menu'>
-                    {% if org_perms.polls.poll_list or request.user.is_superuser or user_is_admin %}
-                      <li><a href='{% url 'polls.poll_list' %}'> {% trans "Flows" %} </a></li>
-                    {% endif %}
                     {% if org_perms.groups.region_list or request.user.is_superuser or user_is_admin %}
                       <li><a href='{% url 'groups.region_list' %}'> {% trans "Panels" %} </a></li>
                     {% endif %}
                     {% if org_perms.groups.group_list or request.user.is_superuser or user_is_admin %}
                       <li><a href='{% url 'groups.group_list' %}'> {% trans "Cohorts" %} </a></li>
                     {% endif %}
+                    {% if org_perms.polls.poll_list or request.user.is_superuser or user_is_admin %}
+                      <li><a href='{% url 'polls.poll_list' %}'> {% trans "Flows" %} </a></li>
+                    {% endif %}
                     {% if org_perms.polls.pollrun_list or request.user.is_superuser or user_is_admin %}
                       <li><a href='{% url 'polls.pollrun_list' %}'>{% trans "Flow Runs" %}</a></li>
                     {% endif %}

tracpro/templates/groups/group_list.html

@@ -1,6 +1,12 @@
 {% extends "smartmin/list.html" %}
 {% load smartmin i18n %}
 
+
+{% block pre-content %}
+  {{ block.super }}
+  {% include 'workflow_tracker_steps.html' with step=2 %}
+{% endblock %}
+
 {% block table-controls %}
   <div class='clearfix'>
     <div class='pull-back'>

tracpro/templates/groups/region_list.html

@@ -30,6 +30,11 @@
   {% endcompress %}
 {% endblock extra-style %}
 
+{% block pre-content %}
+  {{ block.super }}
+  {% include 'workflow_tracker_steps.html' with step=1 %}
+{% endblock %}
+
 {% block table-controls %}
   {% if org_perms.groups.region_select %}
     <div id="region-actions" class="pull-right buttons">

tracpro/templates/orgs_ext/org_home.html

@@ -2,6 +2,14 @@
 
 {% load i18n %}
 
+{% block pre-content %}
+  {{ block.super }}
+  <div>
+    Follow these steps to start tracking your polls:<br /><br />
+  </div>
+  {% include 'workflow_tracker_steps.html' with step=0 %}
+{% endblock %}
+
 {% block read-buttons %}
   <a class="btn btn-default pull-right" href="{% url 'orgs_ext.org_edit' %}">
     <span class="glyphicon glyphicon-pencil"></span>

tracpro/templates/polls/fetch_runs.html

@@ -1,6 +1,11 @@
 {% extends 'smartmin/form.html' %}
 {% load i18n %}
 
+{% block pre-content %}
+  {{ block.super }}
+  {% include 'workflow_tracker_steps.html' with step=4 %}
+{% endblock %}
+
 {% block pre-form %}
 
   <p>

tracpro/templates/polls/poll_list.html

@@ -7,6 +7,9 @@ <h2>
       {% trans "Flows" %}
     </h2>
   </div>
+
+  {% include 'workflow_tracker_steps.html' with step=3 %}
+
   {% blocktrans %}
     Latest statistics on flows that are being tracked in TracPro. Click on the 'Select Flows' button to change the flows you are tracking. All flow data is tracked going forward. If you need to track flow data for dates in the past, ask your administrator to fetch runs for those dates.
   {% endblocktrans %}

tracpro/templates/workflow_tracker_steps.html

@@ -0,0 +1,44 @@
+<div class="row workflow-tracker">
+    <a href="{% url 'groups.region_list' %}">
+        <div class="col-md-2 col-sm-1 hidden-xs {% if step == 1 %}circle-selected{% else %}circle{% endif %}">
+            1
+            <div class="circle-label hidden-sm hidden-xs">
+                Select Panels
+            </div>
+        </div>
+    </a>
+    <div class="col-lg-2 col-md-2 hidden-sm hidden-xs workflow-spacer"></div>
+    <div class="hidden-lg hidden-md col-sm-1 hidden-xs workflow-spacer"></div>
+
+
+    <a href="{% url 'groups.group_list' %}">
+        <div class="col-md-2 col-sm-1 hidden-xs {% if step == 2 %}circle-selected{% else %}circle{% endif %}">
+            2
+            <div class="circle-label hidden-sm hidden-xs">
+                Select Cohorts
+            </div>
+        </div>
+    </a>
+    <div class="col-lg-2 col-md-2 hidden-sm hidden-xs workflow-spacer"></div>
+    <div class="hidden-lg hidden-md col-sm-1 hidden-xs workflow-spacer"></div>
+
+    <a href="{% url 'polls.poll_list' %}">
+        <div class="col-md-2 col-sm-1 hidden-xs {% if step == 3 %}circle-selected{% else %}circle{% endif %}">
+            3
+            <div class="circle-label hidden-sm hidden-xs">
+                Select Flows
+            </div>
+        </div>
+    </a>
+    <div class="col-lg-2 col-md-2 hidden-sm hidden-xs workflow-spacer"></div>
+    <div class="hidden-lg hidden-md col-sm-1 hidden-xs workflow-spacer"></div>
+
+    <a href="{% url 'orgs_ext.org_fetchruns' %}">
+        <div class="col-md-2 col-sm-1 hidden-xs {% if step == 4 %}circle-selected{% else %}circle{% endif %}">
+            4
+            <div class="circle-label hidden-sm hidden-xs">
+                Fetch Runs
+            </div>
+        </div>
+    </a>
+</div>