Skip to content

Commit

Permalink
More fixes to styling and hover support
Browse files Browse the repository at this point in the history
  • Loading branch information
@shmichael
shmichael committed Jun 3, 2011
1 parent 350ad3c commit 4b57f4d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
23 changes: 8 additions & 15 deletions src/knesset/templates/laws/embed_bill_detail.html
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@
if (ind === 0) { if (ind === 0) {
$li.addClass('first'); $li.addClass('first');
} }
if (ind === ids.length - 1) {
$li.addClass('last');
}
if ((ind % 2) === 1) { if ((ind % 2) === 1) {
$li.addClass('odd'); $li.addClass('odd');
} }
Expand Down Expand Up @@ -105,7 +108,7 @@
$tooltip_score.append($balance); $tooltip_score.append($balance);
$tooltip_score.hide(); $tooltip_score.hide();


$ok_icon.hover(function() {$tooltip_score.show();}, function() {$tooltip_score.hide()}); $li.hover(function() {$tooltip_score.show();}, function() {$tooltip_score.hide()});


$stepdiv.append($tooltip_score); $stepdiv.append($tooltip_score);
$li.addClass('voted'); $li.addClass('voted');
Expand All @@ -117,7 +120,7 @@
$tooltip.hide(); $tooltip.hide();
$stepdiv.append($tooltip); $stepdiv.append($tooltip);


$ok_icon.hover(function() { $li.hover(function() {
$tooltip.show(); $tooltip.show();
$ok_link.show(); $ok_link.show();
$ok_info.show(); $ok_info.show();
Expand Down Expand Up @@ -252,7 +255,7 @@
var wasFirstVoted, wasPreVoted, wasApprovalVoted; var wasFirstVoted, wasPreVoted, wasApprovalVoted;


switch (verb) { switch (verb) {
case 'was-approval-voted': case 'approval-voted':
$('ul#steps li#vote-2 .date, ul#steps li#vote-3 .date').html(dateHtml); $('ul#steps li#vote-2 .date, ul#steps li#vote-3 .date').html(dateHtml);
$('ul#steps li#committee-2').addClass('passed'); $('ul#steps li#committee-2').addClass('passed');
$('ul#steps li#summoned-2').addClass('passed'); $('ul#steps li#summoned-2').addClass('passed');
Expand All @@ -266,7 +269,7 @@
} }
wasApprovalVoted = true; wasApprovalVoted = true;
break; break;
case 'was-first-voted': case 'first-voted':
$('ul#steps li#vote-1 .date').html(dateHtml); $('ul#steps li#vote-1 .date').html(dateHtml);
$('ul#steps li#committee-1').addClass('passed'); $('ul#steps li#committee-1').addClass('passed');
$('ul#steps li#summoned-1').addClass('passed'); $('ul#steps li#summoned-1').addClass('passed');
Expand All @@ -278,7 +281,7 @@
} }
wasFirstVoted = true; wasFirstVoted = true;
break; break;
case 'was-pre-voted': case 'pre-voted':
$('ul#steps li#pre-vote .date').html(dateHtml); $('ul#steps li#pre-vote .date').html(dateHtml);
if (stream[a]['note'] == 'True') { if (stream[a]['note'] == 'True') {
$('ul#steps li#pre-vote').addClass('passed'); $('ul#steps li#pre-vote').addClass('passed');
Expand All @@ -291,16 +294,6 @@
case 'was-proposed': case 'was-proposed':
$('ul#steps li#initiated .date').html(dateHtml); $('ul#steps li#initiated .date').html(dateHtml);
$('ul#steps li#initiated').addClass('passed'); $('ul#steps li#initiated').addClass('passed');
break;
case 'was-discussed':
// there cannot be a failure in a committee discussion, only success
if (stream[a].note == '1') {
$("ul#steps li#committee-1, ul#steps li#summoned-1").addClass('passed');
$("ul#steps li#committee-1 .date").html(dateHtml);
} else {
$("ul#steps li#committee-2, ul#steps li#summoned-2").addClass('passed');
$("ul#steps li#committee-2 .date").html(dateHtml);
}
default: default:
break; break;
} }
Expand Down
33 changes: 20 additions & 13 deletions static/css/embed_bill.css
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -308,31 +308,38 @@ a{
background-image: url(../img/embed_icons_failed.png); background-image: url(../img/embed_icons_failed.png);
} }
ul#steps li .tooltip{ ul#steps li .tooltip{
height: 30px; height: 30px;
position: absolute; position: absolute;
text-align: center; text-align: center;
top: 155px; top: 155px;
left: -150%; left: -25px;
width: 400%; z-index: 200;
z-index: 200; width: 100px;
overflow: hidden;
} }
.tooltip .bubble { .tooltip .bubble {
background: url(../img/embed_tooltip_pending.png) center; background: url(../img/embed_tooltip_pending.png) center;
margin: 0 auto; margin: 0 auto;
padding: 11px 4px 4px; padding: 11px 4px 4px;
font-size: 13px; font-size: 13px;
height: 20px; height: 16px;
} }
ul#steps li.first .tooltip{ ul#steps li.first .tooltip{
left: -310%; right: 5px;
text-align: right; text-align: left;
} }
ul#steps li .tooltip .bubble{ ul#steps li .tooltip .bubble{
background-position: 40% 0; background-position: 50% top;
}
ul#steps li.first .tooltip .bubble {
background-position: -20px top;
} }
ul#steps li.last .tooltip{ ul#steps li.last .tooltip{
right: -310%; left: 5px;
text-align: left; text-align: right;
}
ul#steps li.last .tooltip .bubble {
background-position: 120px;
} }
ul#steps li.passed .tooltip span{ ul#steps li.passed .tooltip span{
background-image: url(../img/embed_tooltip_passed.png); background-image: url(../img/embed_tooltip_passed.png);
Expand Down

0 comments on commit 4b57f4d

Please sign in to comment.