Merge branch 'dev'

Tautulli · Sep 7, 2015 · 3fcc44a · 3fcc44a
2 parents 29204cb + fcc4575
commit 3fcc44a
Show file tree

Hide file tree

Showing 14 changed files with 177 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## v1.1.7 (2015-09-07)
+
+* Show tagline in info screens for movies. Thanks @JonnyWong.
+* Add play/pause/buffer icon to activity pane. Thanks @JonnyWong.
+* Add transcoder info in activity pane info. Thanks @JonnyWong.
+* Show transcoder progress on activity progress bar. Thanks @JonnyWong.
+* Fix bug where custom notification strings would be ignored if unicode characters were present.
+* Fix text overflow issue on home stats cards. Thanks @JonnyWong.
+* Fix regression with user friendly name change input in edit screen. Thanks @JonnyWong.
+
+
 ## v1.1.6 (2015-09-06)
 
 * Home stats cards are now expandable to show multiple items. Configurable in settings. Thanks @JonnyWong.

diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
@@ -683,6 +683,13 @@ a:hover .dashboard-activity-poster {
     -webkit-transition: all 0s;
     transition: all 0s;
 }
+.dashboard-activity-progress .bufferbar {
+    padding-top: 6px;
+    background-color: #444;
+    position: absolute;
+    height: 6px;
+    overflow: hidden;
+}
 .dashboard-activity-progress .bar {
     padding-top: 6px;
     background-color: #faa732;
@@ -693,6 +700,9 @@ a:hover .dashboard-activity-poster {
     background-image: linear-gradient(to bottom, #fbb450, #f89406);
     background-repeat: repeat-x;
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+    position: absolute;
+    height: 6px;
+    overflow: hidden;
 }
 .dashboard-activity-metadata-wrapper {
     position: relative;
@@ -1541,6 +1551,7 @@ a .season-episodes-card-overlay:hover {
     -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
     -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
     box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    white-space: nowrap;
 }
 .home-platforms-instance li {
     position: relative;
@@ -1553,7 +1564,6 @@ a .season-episodes-card-overlay:hover {
     height: 120px;
 }
 .home-platforms-instance-name {
-    float: left;
     color: #fff;
     text-overflow: ellipsis;
     overflow: hidden;
@@ -1565,54 +1575,21 @@ a .season-episodes-card-overlay:hover {
     padding: 0 0 0 20px;
 }
 .home-platforms-instance-name h4 {
-    margin: 10px 0 20px 0;
+    margin: 10px 0 4px 0;
 }
-.home-platforms-instance-name h5 {
-    font-size: 14px;
-    line-height: 16px;
-    margin: 15px 0 2px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-name2 {
-    position: absolute;
-    top: 34px;
-    left: 215px;
+.home-platforms-instance-playcount {
+    display: inline-block;
+    position: relative;
+    padding: 6px 0 0 20px;
 }
-.home-platforms-instance-name2 h5 {
+.home-platforms-instance-playcount h4 {
     font-size: 14px;
     line-height: 16px;
-    margin: 15px 0 2px 0;
+    margin: 10px 0 10px 0;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 }
-.home-platforms-instance-name2 h3 {
-    font-size: 30px;
-    font-weight: bold;
-    color: #F9AA03;
-    line-height: 22px;
-    position: relative;
-    top: 5px;
-    margin: 0 5px 0 0;
-    padding-top: 6px;
-    float: left;
-}
-.home-platforms-instance-name2 p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    position: relative;
-    top: 21px;
-    left: 0px;
-}
-.home-platforms-instance-playcount {
-    float: left;
-    position: relative;
-    padding: 6px 0 0 20px;
-    width: 100%;
-}
 .home-platforms-instance-playcount h3 {
     font-size: 30px;
     font-weight: bold;
@@ -1638,6 +1615,14 @@ a .season-episodes-card-overlay:hover {
     padding: 6px 0 0 20px;
     width: 100%;
 }
+.home-platforms-instance-last-user h4 {
+    font-size: 14px;
+    line-height: 16px;
+    margin: 10px 0 10px 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
 .home-platforms-instance-last-user h5 {
     font-size: 12px;
     position: relative;
@@ -2220,6 +2205,9 @@ a .home-platforms-instance-list-oval:hover,
     color: #fff;
     cursor: pointer;
 }
+.edit-user-name > input[type='text'] {
+    margin: 0;
+}
 .popover {
     z-index: 2;
 }

diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html
@@ -34,6 +34,9 @@
 year                        Returns the year of the episode, movie, or clip.
 player                      Returns the name of the platform used to play the stream.
 platform                    Returns the type of platform used to play the stream.
+throttled                   Returns true if the transcode session is throttled.
+transcode_progress          Returns the current transcode progress of the item. 0 to 100.
+transcode_speed             Returns the current transcode speed of the item.
 audio_decision              Returns the audio transcode decision. Either 'transcode', 'copy' or 'direct play'.
 audio_codec                 Returns the name of the audio codec.
 audio_channels              Returns the number of audio channels.
@@ -68,7 +71,6 @@
     <a href="info?item_id=${a['rating_key']}">
     % endif
         <div class="dashboard-activity-poster">
-            <script>console.log('${a['indexes']}');</script>
             % if a['type'] == 'movie' and not a['indexes']:
             <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
             % elif a['type'] == 'episode' and not a['indexes']:
@@ -116,7 +118,12 @@
                         % if a['audio_decision'] == 'direct play':
                         Stream &nbsp;<strong>Direct Play</strong>
                         % else:
-                        Stream &nbsp;<strong>Transcoding</strong>
+                        Stream &nbsp;<strong>Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
                         % endif
                         <br />
                         % if a['audio_decision'] == 'direct play':
@@ -130,7 +137,12 @@
                         % if a['video_decision'] == 'direct play':
                         Stream &nbsp;<strong>Direct Play</strong>
                         % else:
-                        Stream &nbsp;<strong>Transcoding</strong>
+                        Stream &nbsp;<strong>Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
                         % endif
                         <br />
                         % if a['video_decision'] == 'direct play':
@@ -163,6 +175,7 @@
     % endif
     <div class="dashboard-activity-progress">
         <div class="dashboard-activity-progress-bar">
+            <div class="bufferbar" style="width: ${a['transcode_progress']}%">${a['transcode_progress']}%</div>
             <div class="bar" style="width: ${a['progress_percent']}%">${a['progress_percent']}%</div>
         </div>
     </div>
@@ -171,6 +184,13 @@
             <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${a['user_thumb']});"></div>
         </a>
         <div class="dashboard-activity-metadata-title">
+            % if a['state'] == 'playing':
+            <i class="fa fa-play"></i>&nbsp;
+            % elif a['state'] == 'paused':
+            <i class="fa fa-pause"></i>&nbsp;
+            % elif a['state'] == 'buffering':
+            <i class="fa fa-spinner"></i>&nbsp;
+            % endif
             % if a['type'] == 'episode':
             <a href="info?item_id=${a['rating_key']}">${a['grandparent_title']} - ${a['title']}</a>
             % elif a['type'] == 'movie':

diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
@@ -73,13 +73,13 @@
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Watched TV</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
-                </div>
-                <div class="home-platforms-instance-playcount">
+                    </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -153,13 +153,13 @@ <h4>${loop.index + 1}</h4>
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Popular TV</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
-                </div>
-                <div class="home-platforms-instance-playcount">
+                    </h4>
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
@@ -225,13 +225,13 @@ <h4>${loop.index + 1}</h4>
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Watched Movie</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
-                </div>
-                <div class="home-platforms-instance-playcount">
+                    </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -305,13 +305,13 @@ <h4>${loop.index + 1}</h4>
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Popular Movie</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
                         <a href="info?item_id=${top_stat['rows'][0]['rating_key']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
-                </div>
-                <div class="home-platforms-instance-playcount">
+                    </h4>
                     <h3>${top_stat['rows'][0]['users_watched']}</h3>
                     <p> users</p>
                 </div>
@@ -377,17 +377,17 @@ <h4>${loop.index + 1}</h4>
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Active User</h4>
-                    <h5>
-                        % if top_stat['rows'][0]['user_id']:
-                        <a href="user?user_id=${top_stat['rows'][0]['user_id']}">
-                        % else:
-                        <a href="user?user=${top_stat['rows'][0]['user']}">
-                        % endif
-                            ${top_stat['rows'][0]['friendly_name']}
-                        </a>
-                    </h5>
                 </div>
                 <div class="home-platforms-instance-playcount">
+                    <h4>
+                        % if top_stat['rows'][0]['user_id']:
+                        <a href="user?user_id=${top_stat['rows'][0]['user_id']}">
+                            % else:
+                            <a href="user?user=${top_stat['rows'][0]['user']}">
+                                % endif
+                                ${top_stat['rows'][0]['friendly_name']}
+                            </a>
+                    </h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -473,9 +473,9 @@ <h4>${loop.index + 1}</h4>
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Most Active Platform</h4>
-                    <h5>${top_stat['rows'][0]['platform_type']}</h5>
                 </div>
                 <div class="home-platforms-instance-playcount">
+                    <h4>${top_stat['rows'][0]['platform_type']}</h4>
                     % if top_stat['stat_type'] == 'total_plays':
                     <h3>${top_stat['rows'][0]['total_plays']}</h3>
                     <p> plays</p>
@@ -535,13 +535,13 @@ <h4>${loop.index + 1}</h4>
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>Last Watched</h4>
-                    <h5>
+                </div>
+                <div class="home-platforms-instance-last-user">
+                    <h4>
                         <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}">
                             ${top_stat['rows'][0]['title']}
                         </a>
-                    </h5>
-                </div>
-                <div class="home-platforms-instance-last-user">
+                    </h4>
                     <h5>
                         % if top_stat['rows'][0]['user_id']:
                         <a href="user?user_id=${top_stat['rows'][0]['user_id']}">

diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
@@ -144,6 +144,11 @@ <h3 class="hidden-xs">S${data['parent_index']} &middot; E${data['index']}</h3>
                                 % endif
                             </div>
                         </div>
+                        % if data['type'] == 'movie' and data['tagline']:
+                        <div class="summary-content-summary">
+                            <p><strong> ${data['tagline']} </strong></p>
+                        </div>
+                        % endif
                         <div class="summary-content-summary">
                             <p> ${data['summary']} </p>
                         </div>

diff --git a/data/interfaces/default/library_stats.html b/data/interfaces/default/library_stats.html
@@ -38,21 +38,21 @@
             <div class="home-platforms-instance-info">
                 <div class="home-platforms-instance-name">
                     <h4>${library['rows']['title']}</h4>
-                    <h5>${library['rows']['count_type']}</h5>
                 </div>
                 <div class="home-platforms-instance-playcount">
+                    <h5>${library['rows']['count_type']}</h5>
                     <h3>${library['rows']['count']}</h3>
                     <p> items</p>
                 </div>
                 % if library['type'] == 'show':
-                <div class="home-platforms-instance-name2">
+                <div class="home-platforms-instance-playcount" style="padding-left: 10px;">
                     <h5>${library['rows']['episode_count_type']}</h5>
                     <h3>${library['rows']['episode_count']}</h3>
                     <p> items</p>
                 </div>
                 % endif
                 % if library['type'] == 'artist':
-                <div class="home-platforms-instance-name2">
+                <div class="home-platforms-instance-playcount" style="padding-left: 10px;">
                     <h5>${library['rows']['album_count_type']}</h5>
                     <h3>${library['rows']['album_count']}</h3>
                     <p> items</p>

diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
@@ -321,7 +321,7 @@ <h3>Extra Settings</h3>
 
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="pms_use_bif" name="pms_use_bif" value="1" ${config['pms_use_bif']}> Use BIF thumbs
+                                <input type="checkbox" id="pms_use_bif" name="pms_use_bif" value="1" ${config['pms_use_bif']}> Use video preview thumbnails (BIF)
                             </label>
                             <p class="help-block">If you have media indexing enabled on your server, use these on the activity pane.</p>
                         </div>