github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-21 05:43:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Manual merge of v1.4.16 into v2

Browse source
This commit is contained in:
JonnyWong16 2016-11-25 19:16:43 -08:00
commit d7cef5add7
5 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/edit_user.html
View file

@ -45,7 +45,7 @@ DOCUMENTATION :: END
<input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${data['friendly_name']}" size="30">
</div>
</div>
<p class="help-block">Replace all occurances of the username with this name.</p>
<p class="help-block">Replace all occurrences of the username with this name.</p>
</div>
<div class="form-group">
<label for="profile_url">Profile Picture URL</label>

7
data/interfaces/default/index.html
View file

@ -221,8 +221,11 @@
// update the progress bars
// percent - 3 because of 3px padding-right
$('#bufferbar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%');
$('#bar-' + key).width(parseInt(s.progress_percent) - 3 + '%').html(s.progress_percent + '%');
$('#bufferbar-' + key).width(parseInt(s.transcode_progress) - 3 + '%').html(s.transcode_progress + '%')
.attr('data-original-title', 'Transcoder Progress ' + s.transcode_progress + '%');
$('#bar-' + key).width(parseInt(s.progress_percent) - 3 + '%').html(s.progress_percent + '%')
.attr('data-original-title', 'Stream Progress ' + s.progress_percent + '%');
// add temporary class so we know which instances are still active
instance.addClass('updated-temp');