abra at Thu Dec 27 13:44:21 +04 2018

templates/web/activitylog_form.html

@@ -1,10 +1,13 @@
 {% extends 'web/base.html' %}
 
 {% block main %}
+  {{ form.media }}
 
-<form method="post">{% csrf_token %}
-  {{ form.as_p }}
-  <input class="btn btn-primary" type="submit" value="Сохранить">
-</form>
+  <form method="post">{% csrf_token %}
+    {{ form.as_p }}
+    {#    {% bootstrap_form form %}#}
+
+    <input class="btn btn-primary" type="submit" value="Сохранить">
+  </form>
 
 {% endblock %}

templates/web/user_detail.html

@@ -81,10 +81,10 @@
 
       <h2>Активности</h2>
       <ul>
-        {% for activity in activities %}
+        {% for activities_and_pct in activities_and_pcts %}
           <li>
-            <a href="{% url 'user_charts_activity' user.id activity.id %}">
-              {{ activity }}
+            <a href="{% url 'user_charts_activity' user.id activities_and_pct.0.id %}">
+              {{ activities_and_pct.0 }} — {{ activities_and_pct.1|stringformat:".2f%%" }}
             </a>
           </li>
         {% endfor %}