From f224dc4458186fa8b8f3d0e10e81cacfe5ba910c Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Fri, 20 Nov 2015 22:30:11 -0500
Subject: fixed reference links and added status column to income monthly view
 unbilled

---
 design/templates/admin/income_month.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'design')

diff --git a/design/templates/admin/income_month.html b/design/templates/admin/income_month.html
index c1dccbc..ce500a8 100644
--- a/design/templates/admin/income_month.html
+++ b/design/templates/admin/income_month.html
@@ -68,7 +68,7 @@
 
 {% for gig in billed %}
 
-<tr class="{% cycle 'row1' 'row2' %}"><th class="field-title">{% if gig.pub_item %}<a href="/admin/income/gig/{{gig.pub_item.pk}}/">{{gig.title}}</a>{%else%}{{gig.title}}{%endif%}</th><td class="field-status">${{gig.payment}}</td><td class="field-payment_status">{{gig.publisher}}</td><td class="field-pub_date nowrap">{{gig.invoice_date}}</td></tr>
+<tr class="{% cycle 'row1' 'row2' %}"><th class="field-title"><a href="/admin/income/gig/{{gig.pk}}/">{{gig.title}}</a></th><td class="field-status">${{gig.payment}}</td><td class="field-payment_status">{{gig.publisher}}</td><td class="field-pub_date nowrap">{{gig.invoice_date}}</td></tr>
 {%endfor%}
 <tr class="row2"><th class="field-title">&nbsp;</th><td class="field-status"></td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
 <tr class="row2"><th class="field-title">Total Billed:</th><td class="field-status">${{billed_total.total_payment}}</td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
@@ -95,7 +95,7 @@
    <div class="clear"></div>
 </th>
 <th scope="col" class="sortable column-status">
-   <div class="text"><a href="?o=5">Date Invoiced</a></div>
+   <div class="text"><a href="?o=5">Article status</a></div>
    <div class="clear"></div>
 </th>
 </tr>
@@ -104,7 +104,7 @@
 
 {% for gig in unbilled %}
 
-<tr class="{% cycle 'row1' 'row2' %}"><th class="field-title">{% if gig.pub_item %}<a href="/admin/income/gig/{{gig.pub_item.pk}}/">{{gig.title}}</a>{%else%}{{gig.title}}{%endif%}</th><td class="field-status">${{gig.payment}}</td><td class="field-payment_status">{{gig.publisher}}</td><td class="field-pub_date nowrap">{{gig.invoice_date}}</td></tr>
+<tr class="{% cycle 'row1' 'row2' %}"><th class="field-title"><a href="/admin/income/gig/{{gig.pk}}/">{{gig.title}}</a></th><td class="field-status">${{gig.payment}}</td><td class="field-payment_status">{{gig.publisher}}</td><td class="field-pub_date nowrap">{{gig.get_status_display}}</td></tr>
 {%endfor%}
 <tr class="row2"><th class="field-title">&nbsp;</th><td class="field-status"></td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
 <tr class="row2"><th class="field-title">Total Billed:</th><td class="field-status">${{unbilled_total.total_payment}}</td><td class="field-payment_status"></td><td class="field-pub_date nowrap"></td></tr>
-- 
cgit v1.2.3