nummi/history/templates/history/plot.html

@@ -25,13 +25,7 @@
                     {% if date.sum_m or date.sum_p %}
                         <tr {% if not date.month.month|divisibleby:"2" %}class="even"{% endif %}>
                             <td class="icon">{% up_down_icon date.sum %}</td>
-                            <th class="date" scope="row">
+                            <th class="date" scope="row">{% month_url date.month %}</th>
-                                {% if year %}
-                                    {% month_url date.month fmt="F" %}
-                                {% else %}
-                                    {% month_url date.month %}
-                                {% endif %}
-                            </th>
                             <td class="value">{{ date.sum_m|pmrvalue }}</td>
                             <td class="bar m">{% plot_bar date.sum date.sum_m history.max.pm %}</td>
                             <td class="bar p">{% plot_bar date.sum date.sum_p history.max.pm %}</td>
@@ -51,9 +45,7 @@
     <table class="full-width">
         <thead>
             <tr>
-                {% if not year %}
+                <th scope="col">{% translate "Year" %}</th>
-                    <th scope="col">{% translate "Year" %}</th>
-                {% endif %}
                 {% calendar_head %}
             </tr>
         </thead>
@@ -61,9 +53,7 @@
             {% regroup history.data by month.year as years_list %}
             {% for y, year in years_list reversed %}
                 <tr>
-                    {% if not year %}
+                    <th class="date" scope="row">{% year_url y %}</th>
-                        <th class="date" scope="row">{% year_url y %}</th>
-                    {% endif %}
                     {% for m in year %}
                         {% if forloop.parentloop.last and forloop.first %}
                         {% empty_calendar_cells_start m.month.month %}

nummi/transaction/templates/transaction/transaction_table.html

@@ -46,15 +46,7 @@
                         {% for invoice in trans.invoices %}<a href="{{ invoice.file.url }}">{{ "attachment"|remix }}</a>{% endfor %}
                     </td>
                     <td class="date">
-                        <time datetime="{{ trans.date|date:"Y-m-d" }}">
+                        <time datetime="{{ trans.date|date:"Y-m-d" }}">{{ trans.date|date:"Y-m-d" }}</time>
-                            {% if month %}
-                                {{ trans.date|date:"l d"|capfirst }}
-                            {% elif year %}
-                                {{ trans.date|date:"d F" }}
-                            {% else %}
-                                {{ trans.date|date:"Y-m-d" }}
-                            {% endif %}
-                        </time>
                     </td>
                     <th scope="row" class="l">
                         <a href="{{ trans.get_absolute_url }}">{{ trans.name }}</a>