Rework labelling. More succinct, labels match actions, not statuses

Categories are labels/titles and should use title case.  Use initial
capital letter on all non-joining words.

In Progress is an OK label choice but Ongoing communicates the same
thing with a single word just like all the other options.

In the workflow the "Parked" status is being used for commitfests
labelled, e.g.,  Draft v18, so use Drafts as the category label too.

Change Open to Bugs to relfect its new usage.

Once committed a large technical refactor/rename pass over the models
and code to make the enums match up with the usage is planned.

Author: polobo

pgcommitfest/commitfest/models.py

@@ -42,10 +42,10 @@ class CommitFest(models.Model):
     STATUS_PARKED = 5
     _STATUS_CHOICES = (
         (STATUS_FUTURE, "Future"),
-        (STATUS_OPEN, "Open"),
-        (STATUS_INPROGRESS, "In Progress"),
+        (STATUS_OPEN, "Bugs"),
+        (STATUS_INPROGRESS, "Ongoing"),
         (STATUS_CLOSED, "Closed"),
-        (STATUS_PARKED, "Parked"),
+        (STATUS_PARKED, "Drafts"),
     )
     _STATUS_LABELS = (
         (STATUS_FUTURE, "default"),
@@ -255,13 +255,13 @@ class PatchOnCommitFest(models.Model):
     STATUS_RETURNED = 7
     STATUS_WITHDRAWN = 8
     _STATUS_CHOICES = (
-        (STATUS_REVIEW, "Needs review"),
+        (STATUS_REVIEW, "Needs Review"),
         (STATUS_AUTHOR, "Waiting on Author"),
         (STATUS_COMMITTER, "Ready for Committer"),
         (STATUS_COMMITTED, "Committed"),
-        (STATUS_NEXT, "Moved to next CF"),
+        (STATUS_NEXT, "Moved"),
         (STATUS_REJECTED, "Rejected"),
-        (STATUS_RETURNED, "Returned with feedback"),
+        (STATUS_RETURNED, "Returned with Feedback"),
         (STATUS_WITHDRAWN, "Withdrawn"),
     )
     _STATUS_LABELS = (

pgcommitfest/commitfest/templates/patch_administrative.inc

@@ -12,18 +12,18 @@
    <div class="btn-group">
     <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">Change Status <span class="caret"></span></a>
     <ul class="dropdown-menu" role="menu">
-     <li role="presentation" class="dropdown-header">Open statuses</li>
-     <li role="presentation"><a href="status/review/">Needs review</a></li>
-     <li role="presentation"><a href="status/author/">Waiting on Author</a></li>
-     <li role="presentation"><a href="status/committer/">Ready for Committer</a></li>
+     <li role="presentation" class="dropdown-header">Assign to:</li>
+     <li role="presentation"><a href="status/review/">Reviewer</a></li>
+     <li role="presentation"><a href="status/author/">Author</a></li>
+     <li role="presentation"><a href="status/committer/">Committer</a></li>
      <li role="presentation" class="divider"></li>
-     <li role="presentation" class="dropdown-header">Closed statuses</li>
-     <li role="presentation"><a href="close/reject/" onclick="return verify_reject()">Rejected</a></li>
-     <li role="presentation"><a href="close/withdrawn/" onclick="return verify_withdrawn()">Withdrawn</a></li>
-     <li role="presentation"><a href="close/feedback/" onclick="return verify_returned()">Returned with feedback</a></li>
-     <li role="presentation"><a href="close/committed/" onclick="return flagCommitted({%if patch.committer%}'{{patch.committer}}'{%elif is_committer%}'{{user.username}}'{%else%}null{%endif%})">Committed</a></li>
+     <li role="presentation" class="dropdown-header">Resolve:</li>
+     <li role="presentation"><a href="close/reject/" onclick="return verify_reject()">Reject</a></li>
+     <li role="presentation"><a href="close/withdrawn/" onclick="return verify_withdrawn()">Withdraw</a></li>
+     <li role="presentation"><a href="close/feedback/" onclick="return verify_returned()">Return</a></li>
+     <li role="presentation"><a href="close/committed/" onclick="return flagCommitted({%if patch.committer%}'{{patch.committer}}'{%elif is_committer%}'{{user.username}}'{%else%}null{%endif%})">Commit</a></li>
      <li role="presentation" class="divider"></li>
-     <li role="presentation" class="dropdown-header">Move To Options</li>
+     <li role="presentation" class="dropdown-header">Move To:</li>
      {%if not cf.isfuture and workflow.future %}
       <li role="presentation">
        <a

pgcommitfest/commitfest/templates/patch_workflow.inc

@@ -106,13 +106,13 @@
      <div>{{reviewer.first_name}} {{reviewer.last_name}}</div>
     {%endfor%}
     {%if user.is_authenticated %}
-     <div><a href="reviewer/{{is_reviewer|yesno:"remove,become"}}/" class="btn btn-default">{{is_reviewer|yesno:"Remove from reviewers,Become reviewer"}}</a></div>
+     <div><a href="reviewer/{{is_reviewer|yesno:"remove,become"}}/" class="btn btn-default">{{is_reviewer|yesno:"Remove Self,Become Reviewer"}}</a></div>
     {%endif%}
    </td>
    <!-- Resolve -->
    <td>
     {%if patch.committer%}<div>{{patch.committer.fullname}}</div>{%endif%}
-    {%if is_committer%}<div><a href="committer/{{is_this_committer|yesno:"remove,become"}}/" class="btn btn-default">{{is_this_committer|yesno:"Unclaim as committer,Claim as committer"}}</a></div>{%endif%}
+    {%if is_committer%}<div><a href="committer/{{is_this_committer|yesno:"remove,become"}}/" class="btn btn-default">{{is_this_committer|yesno:"Unclaim,Claim for Self"}}</a></div>{%endif%}
    </td>
    <!-- Move -->
    <td>

pgcommitfest/commitfest/templates/workflow.html

@@ -15,10 +15,10 @@ <h3>The Commitfest Workflow</h3>
  after which they are "Closed" and a new bin for the same category is created.
  Each bin serves a role in the workflow and there are 4 active categories of bins.
  <ul>
-  <li>Open - annual, all bug reports</li>
-  <li>Parked - annual, drafts for new features</li>
-  <li>Future - scheduled, proposed new features</li>
-  <li>In Progress - scheduled, review and commit new features</li>
+  <li>Bugs - annual, all bug reports</li>
+  <li>Drafts - annual, drafts for new features</li>
+  <li>Next - scheduled, proposed new features</li>
+  <li>Ongoing - scheduled, review and commit new features</li>
  </ul>
 There are three active categories of patch status covering the four statuses.
  <ul>
@@ -36,34 +36,34 @@ <h3>The Commitfest Workflow</h3>
 (See notes below for all available statuses and their intended usage.)
 </p>
 <p>
- The patches in the open bin are all of type "bug fix".  The full lifecycle of
+ The patches in the bugs bin are all of type "bug fix".  The full lifecycle of
  a bux fix patch lives here and there is no distinction as to the nature of the
  reviewer category.  The remaining bins exist to help deal with the large volume
  of new feature patches.
 </p>
 <p>
- The parked bin is where patches waiting on significant work go.  A reviewer
+ The drafts bin is where patches waiting on significant work go.  A reviewer
  patch status category here mainly means awaiting guidance, though that will
  often lead to a final review, allowing the patch to be moved to the future bin
  with the committer patch status category already set.
 </p>
 <p>
- The future and in progress bins are the ones that strictly comprise a commitfest.
+ The future and ongoing bins are the ones that strictly comprise a commitfest.
  The future bin always exists and new features ready for review and commit go
- here.  At scheduled points, the future bin becomes an in progress bin and a new
+ here.  At scheduled points, the future bin becomes an ongoing bin and a new
  future bin is created.
 </p>
 <p>
- The in progress bin only exists during an active commitfest period, during which
+ The ongoing bin only exists during an active commitfest period, during which
  no new patches should be added and the community reviewers and committers are
  encouraged to focus on reviews and commits.  At the end of the scheduled period
  the bin is closed.  This is only bin that is not present at all times.
 </p>
 <p>
  The workflow is also designed with the release cycle in mind, in particular
- the start of the annual feature freeze period.  At this time both the parked
- and open bins are closed and new ones created.  If the feature freeze is for
- version 18 then the new parked bin is called "Drafts v19" and the new open
+ the start of the annual feature freeze period.  At this time both the drafts
+ and bugs bins are closed and new ones created.  If the feature freeze is for
+ version 18 then the new drafts bin is called "Drafts v19" and the new bugs
  bin is named "Bugs v18".
 </p>
 <h3>Patches on Commitfests (PoC)</h3>
@@ -178,40 +178,40 @@ <h4>Overview</h4>
  of a patch to be keyed to commitfest status type without the need for further
  disambiguation.
 </p>
-<h4>In Progress</h4>
+<h4>Ongoing</h4>
 <p>
  An Active (see Workflow above) period where no new features should be added
  and the goal is to get as many review"patches committed as possible.
 </p>
 <h4>Future</h4>
 <p>
  The next active (see workflow above) period.
- Any patch not exempted to be added to the in progress or open commitfests
+ Any patch not exempted to be added to the ongoing or bugs commitfests
  can always be added here.
 </p>
-<h4>Open</h4>
+<h4>Bugs</h4>
 <p>
  A commitfest for high-priority and bug fix patches.  Full patch lifecycle.
  Created as "Bugs v18" at the start of the v18 feature freeze period (closing
  "Bugs v17").
 </p>
-<h4>Parked</h4>
+<h4>Drafts</h4>
 <p>
- The commitfest setup as parked is used to hold patches that are not intended
+ The commitfest setup as drafts is used to hold patches that are not intended
  to be formally reviewed and committed.  Another term is "work-in-progress" (WIP).
  Within the Workflow, at the start of the v18 feature freeze, the existing
  "Draft v18" commitfest is closed and a new "Draft v19" commitfest is created.
  This allows for a fresh start coinciding with the project release cycle.
- And while commits cannot accumulate within a parked commitfest, withdrawn and
+ And while commits cannot accumulate within a drafts commitfest, withdrawn and
  rejected patches would and so having a truly never-closing commitfest is not
  ideal.  Similarly, given the volume of patches, getting rid of abandonment
  is counter-productive.  This workflow provides a middle-ground between
  every-other-month and never patch moving requirements.
 </p>
 <h4>Closed</h4>
 <p>
- Parked, open and in progress commitfests are closed (future ones
- always go through in progress) when the period they cover has passed.
+ Drafts, bugs and ongoing commitfests are closed (future ones
+ always go through ongoing) when the period they cover has passed.
  Closing a commitfest does not impact its related PoCs; though no new PoCs can
  be created for a closed commitfest.
 </p>