Merged [2947] from rjsparks@nostrum.com:

Changed the way ballot discuss/comment texts are displayed to
put the text from current ADs first, and mark ex-ADs with []
following the convention on the left bar.

This fixes issue #608
 - Legacy-Id: 2955
Note: SVN reference [2947] has been migrated to Git commit 3c88c011e48e626e842c027575feb2f2aedde230

ietf/idrfc/idrfc_wrapper.py

@@ -755,6 +755,8 @@ def create_position_object(ballot, position, all_comments):
              position=p)
     if not position.ad.is_current_ad():
         r['is_old_ad'] = True
+    else:
+        r['is_old_ad'] = False
         
     was = [v for k,v in positions.iteritems() if position.__dict__[k] < 0]
     if len(was) > 0:

ietf/templates/idrfc/doc_ballot.html

@@ -77,8 +77,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <p>Summary: <i>{{ doc.ietf_process.iesg_ballot_needed }}</i></p>
 {% endif %}
 
-{% for pos in ballot.get_texts %}
-<h2 class="ballot_ad"><a name="{{pos.ad_name|slugify}}">{{pos.ad_name|escape}}</a></h2>
+{% for pos in ballot.get_texts|dictsort:"is_old_ad" %}
+<h2 class="ballot_ad"><a name="{{pos.ad_name|slugify}}">{% if pos.is_old_ad %}[{%endif%}{{pos.ad_name|escape}}{% if pos.is_old_ad %}]{%endif%}</a></h2>
 
 {% ifequal pos.position "Discuss" %}
 <p><b>Discuss ({{pos.discuss_date}})</b> <img src="/images/comment.png" width="14" height="12" alt=""/></p>