diff --git a/lowfat/templates/lowfat/blogs.html b/lowfat/templates/lowfat/blogs.html index 61018142..736d047a 100644 --- a/lowfat/templates/lowfat/blogs.html +++ b/lowfat/templates/lowfat/blogs.html @@ -37,6 +37,11 @@
+ ID + | + {% endif %} {% if user.is_staff or claimant and user == claimant.user %}
Submitted date
@@ -52,11 +57,6 @@ Funding Request |
{% endif %}
- {% if user.is_staff or claimant and user == claimant.user %}
- - ID - | - {% endif %}Status | @@ -84,6 +84,9 @@{{expense.fund.id}} | + {% endif %} + {% if user.is_staff or claimant and user == claimant.user %}{{ expense.added }} | @@ -111,9 +114,6 @@{{expense.fund.id}} | - {% endif %}{{ expense.get_status_display }} {% if fund.status == 'F' %} diff --git a/lowfat/templates/lowfat/funds.html b/lowfat/templates/lowfat/funds.html index ebf9e890..7f7947b6 100644 --- a/lowfat/templates/lowfat/funds.html +++ b/lowfat/templates/lowfat/funds.html @@ -22,17 +22,17 @@ | |||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- Submitted date + ID | {% endif %} -- Title - | {% if user.is_staff or claimant and user == claimant.user %}- ID + Submitted date | {% endif %} ++ Title + | {% if user.is_staff %}Fellow @@ -75,6 +75,9 @@ {% endif %} > {% if user.is_staff or claimant and user == claimant.user %} + | {{fund.id}} | + {% endif %} + {% if user.is_staff or claimant and user == claimant.user %}{{ fund.added }} | @@ -113,9 +116,6 @@ ) {% endif %} - {% if user.is_staff or claimant and user == claimant.user %} -{{fund.id}} | - {% endif %} {% if user.is_staff %}{{ fund.claimant.fullname }} |