Merge pull request #380 from zobe123/patch-1

Added Statusbar hover effect with percentage
This commit is contained in:
JonnyWong16 2015-12-17 23:18:22 -08:00
commit cf081ee291
2 changed files with 39 additions and 7 deletions

View file

@ -737,6 +737,9 @@ a:hover .dashboard-activity-poster {
transition: all 0s; transition: all 0s;
} }
.dashboard-activity-progress .bufferbar { .dashboard-activity-progress .bufferbar {
padding-right: 2px;
font-size: x-small;
text-align: right;
padding-top: 6px; padding-top: 6px;
background-color: #444; background-color: #444;
position: absolute; position: absolute;
@ -744,6 +747,9 @@ a:hover .dashboard-activity-poster {
overflow: hidden; overflow: hidden;
} }
.dashboard-activity-progress .bar { .dashboard-activity-progress .bar {
padding-right: 2px;
font-size: x-small;
text-align: right;
padding-top: 6px; padding-top: 6px;
background-color: #faa732; background-color: #faa732;
background-image: -moz-linear-gradient(top, #fbb450, #f89406); background-image: -moz-linear-gradient(top, #fbb450, #f89406);
@ -757,6 +763,32 @@ a:hover .dashboard-activity-poster {
height: 6px; height: 6px;
overflow: hidden; overflow: hidden;
} }
.dashboard-activity-progress:hover .bar {
height: 14px;
padding-top: 0px;
transform-origin: top;
transition: all .2s ease;
border-radius: 0px 0px 3px 3px;
}
.dashboard-activity-progress:hover .dashboard-activity-progress-bar {
height: 14px;
transform-origin: top;
transition: all .2s ease;
border-radius: 0px 0px 3px 3px;
}
.dashboard-activity-progress:hover .bufferbar {
height: 14px;
padding-top: 0px;
transform-origin: top;
transition: all .2s ease;
border-radius: 0px 0px 3px 3px;
}
.dashboard-activity-progress:hover+.dashboard-activity-metadata-wrapper {
margin-top: 8px;
transform-origin: top;
transition: all .2s ease;
}
.dashboard-activity-metadata-wrapper { .dashboard-activity-metadata-wrapper {
position: relative; position: relative;
width: 100%; width: 100%;
@ -2554,4 +2586,4 @@ table[id^='history_child'] thead th {
margin: 0; margin: 0;
width: 75px; width: 75px;
height: 34px; height: 34px;
} }

View file

@ -815,7 +815,7 @@ class PmsConnect(object):
'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'), 'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
'throttled': throttled, 'throttled': throttled,
'transcode_progress': transcode_progress, 'transcode_progress': int(round(helpers.cast_to_float(transcode_progress), 0)),
'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)), 'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
'audio_decision': audio_decision, 'audio_decision': audio_decision,
'audio_channels': audio_channels, 'audio_channels': audio_channels,
@ -937,7 +937,7 @@ class PmsConnect(object):
'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'), 'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
'throttled': throttled, 'throttled': throttled,
'transcode_progress': transcode_progress, 'transcode_progress': int(round(helpers.cast_to_float(transcode_progress), 0)),
'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)), 'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
'audio_decision': audio_decision, 'audio_decision': audio_decision,
'audio_channels': audio_channels, 'audio_channels': audio_channels,
@ -994,7 +994,7 @@ class PmsConnect(object):
'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'), 'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
'throttled': throttled, 'throttled': throttled,
'transcode_progress': transcode_progress, 'transcode_progress': int(round(helpers.cast_to_float(transcode_progress), 0)),
'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)), 'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
'audio_decision': audio_decision, 'audio_decision': audio_decision,
'audio_channels': audio_channels, 'audio_channels': audio_channels,
@ -1051,7 +1051,7 @@ class PmsConnect(object):
'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'), 'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
'throttled': throttled, 'throttled': throttled,
'transcode_progress': transcode_progress, 'transcode_progress': int(round(helpers.cast_to_float(transcode_progress), 0)),
'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)), 'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
'audio_decision': audio_decision, 'audio_decision': audio_decision,
'audio_channels': audio_channels, 'audio_channels': audio_channels,
@ -1141,7 +1141,7 @@ class PmsConnect(object):
'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'), 'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'), 'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
'throttled': throttled, 'throttled': throttled,
'transcode_progress': transcode_progress, 'transcode_progress': int(round(helpers.cast_to_float(transcode_progress), 0)),
'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)), 'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
'audio_decision': '', 'audio_decision': '',
'audio_channels': '', 'audio_channels': '',
@ -1700,4 +1700,4 @@ class PmsConnect(object):
'public_port': helpers.get_xml_attr(a, 'publicPort') 'public_port': helpers.get_xml_attr(a, 'publicPort')
} }
return server_response return server_response