altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

IESG ballot grid icon: show 'abstain' as yellow instead of gray

Browse source 
- Legacy-Id: 2001
This commit is contained in:
Pasi Eronen 2010-02-18 20:23:47 +00:00
parent a4cc886f60
commit 08ed369b4a
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ietf/idrfc/templatetags/ballot_icon.py
View file

@ -57,6 +57,7 @@ def render_ballot_icon(context, doc):
adId = get_user_adid(context)
red = 0
green = 0
yellow = 0
gray = 0
blank = 0
my = None
@ -67,18 +68,20 @@ def render_ballot_icon(context, doc):
green = green + 1
elif (p['pos'].discuss > 0):
red = red + 1
elif (p['pos'].recuse > 0) or (p['pos'].abstain > 0):
elif (p['pos'].abstain > 0):
yellow = yellow + 1
elif (p['pos'].recuse > 0):
gray = gray + 1
else:
blank = blank + 1
if adId and (p['ad'].id == adId):
my = position_to_string(p['pos'])
if doc.is_rfc_wrapper:
return render_ballot_icon2("rfc"+str(doc.rfc_number), doc.rfc_number, red,green,gray,blank,my,adId)+"<!-- adId="+str(adId)+" my="+str(my)+"-->"
return render_ballot_icon2("rfc"+str(doc.rfc_number), doc.rfc_number, red,yellow,green,gray,blank, my, adId)+"<!-- adId="+str(adId)+" my="+str(my)+"-->"
else:
return render_ballot_icon2(doc.draft_name, doc.tracker_id, red,green,gray,blank,my,adId)+"<!-- adId="+str(adId)+" my="+str(my)+"-->"
return render_ballot_icon2(doc.draft_name, doc.tracker_id, red,yellow,green,gray,blank, my, adId)+"<!-- adId="+str(adId)+" my="+str(my)+"-->"
def render_ballot_icon2(draft_name, tracker_id, red,green,gray,blank,my,adId):
def render_ballot_icon2(draft_name, tracker_id, red,yellow,green,gray,blank, my,adId):
if adId:
res_cm = ' oncontextmenu="editBallot('+str(tracker_id)+');return false;"'
else:
@ -92,6 +95,10 @@ def render_ballot_icon2(draft_name, tracker_id, red,green,gray,blank,my,adId):
c = "ballot_icon_red"
red = red - 1
myMark = (my == "Discuss")
elif yellow > 0:
c = "ballot_icon_yellow"
yellow = yellow - 1
myMark = (my == "Abstain")
elif green > 0:
c = "ballot_icon_green"
green = green - 1
@ -99,7 +106,7 @@ def render_ballot_icon2(draft_name, tracker_id, red,green,gray,blank,my,adId):
elif gray > 0:
c = "ballot_icon_gray"
gray = gray - 1
myMark = (my == "Abstain") or (my == "Recuse")
myMark = (my == "Recuse")
else:
c = ""
myMark = (y == 2) and (x == 4) and (my == "No Record")

2
ietf/templates/idrfc/doc_ballot.html
View file

@ -52,7 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<p><span class="square" style="background:#80ff80;"></span><b>No Objection</b><br/>
{% with ballot.get_no_objection as positions %}{% include "idrfc/doc_ballot_list.html" %}{% endwith %}</p>
<p><span class="square" style="background:#c0c0c0;"></span><b>Abstain</b><br/>
<p><span class="square" style="background:#ffff00;"></span><b>Abstain</b><br/>
{% with ballot.get_abstain as positions %}{% include "idrfc/doc_ballot_list.html" %}{% endwith %}</p>
<p><span class="square" style="background:#c0c0c0;"></span><b>Recuse</b><br/>

1
static/css/base2.css
View file

@ -109,6 +109,7 @@ table.ballot_icon td { border: 1px solid black; height: 7px; width: 6px; padding
td.ballot_icon_green { background:#80ff80; }
td.ballot_icon_red { background: #c00000; color: yellow; }
td.ballot_icon_gray { background: #c0c0c0; }
td.ballot_icon_yellow { background: #ffff00; }
table.ballot_icon td.ballot_icon_my { border: 3px outset black;}
.ietf-highlight-y { padding:0 2px;background:yellow;font-size:85%;}