From 7f0bb1c4f67c1fff65326294a8b256a46c653293 Mon Sep 17 00:00:00 2001
From: Sander Ferdinand <sa.ferdinand@gmail.com>
Date: Wed, 4 Jul 2018 23:01:18 +0200
Subject: [PATCH] Include work in progress on the proposal overview page

---
 wowfunding/routes.py                          |  2 +-
 wowfunding/templates/proposal/disclaimer.html |  4 ++--
 wowfunding/templates/proposal/overview.html   | 12 ++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/wowfunding/routes.py b/wowfunding/routes.py
index 1456d10..1e692fe 100644
--- a/wowfunding/routes.py
+++ b/wowfunding/routes.py
@@ -205,7 +205,7 @@ def proposals(status, page, cat):
         proposals = {
             'proposed': Proposal.find_by_args(status=1, limit=10),
             'funding': Proposal.find_by_args(status=2, limit=10),
-            'wip': Proposal.find_by_args(status=3, limit=4)}
+            'wip': Proposal.find_by_args(status=3, limit=5)}
         return make_response(render_template('proposal/overview.html', proposals=proposals))
 
     try:
diff --git a/wowfunding/templates/proposal/disclaimer.html b/wowfunding/templates/proposal/disclaimer.html
index dfb85e4..893a64e 100644
--- a/wowfunding/templates/proposal/disclaimer.html
+++ b/wowfunding/templates/proposal/disclaimer.html
@@ -27,7 +27,7 @@
                 <div class="card-body">
                     <h5 class="card-title">WFS length</h5>
                     <p class="card-text">
-                        Tasks should be capable being completed within <b>90 days</b> of the proposal reaching the target funding unless the proposal is a bounty.
+                        Tasks should be capable of being completed within <b>90 days</b> of the proposal reaching the target funding unless the proposal is a bounty.
                     </p>
                     <p>
                         Having indefinite, open-ended tasks could lead to <b>mission creep</b> and expanded completion time, which is not ideal because the value of WOW could become volatile.
@@ -139,7 +139,7 @@
         <div class="col-md-8">
             <div class="card">
                 <div class="card-body">
-                    <h5 class="card-title">Failed to raise funds</h5>
+                    <h5 class="card-title">Adjustments</h5>
                     <p class="card-text">
                         Minor amendments may be made to proposals <b>as long it is within the general spirit of the original
                         proposal</b>. However, for major changes, the developer should bring up the proposed change on IRC and
diff --git a/wowfunding/templates/proposal/overview.html b/wowfunding/templates/proposal/overview.html
index 9171161..bba10e9 100644
--- a/wowfunding/templates/proposal/overview.html
+++ b/wowfunding/templates/proposal/overview.html
@@ -12,8 +12,6 @@
                     {% if proposals['proposed'] %}
                         {{ proposal_table(title='Proposals', _proposals=proposals['proposed']) }}
                         <hr>
-                    {% else %}
-
                     {% endif %}
                 </div>
             </div>
@@ -21,8 +19,14 @@
                 <div class="col-lg-12">
                     {% if proposals['funding'] %}
                         {{ proposal_table(title='Funding required', _proposals=proposals['funding']) }}
-                    {% else %}
-                        No proposals here yet.
+                        <hr>
+                    {% endif %}
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-lg-12">
+                    {% if proposals['wip'] %}
+                        {{ proposal_table(title='Work in progress', _proposals=proposals['wip']) }}
                     {% endif %}
                 </div>
             </div>