Merge branch 'master' into ios-downloads

components/tables/CollectionBooksTable.vue

@@ -1,12 +1,14 @@
 <template>
   <div class="w-full bg-primary bg-opacity-40">
     <div class="w-full h-14 flex items-center px-4 bg-primary">
-      <p>Collection List</p>
-      <div class="w-6 h-6 bg-white bg-opacity-10 flex items-center justify-center rounded-full ml-2">
-        <p class="font-mono text-sm">{{ books.length }}</p>
+      <p class="pr-4">Collection List</p>
+
+      <div class="w-6 h-6 md:w-7 md:h-7 bg-white bg-opacity-10 rounded-full flex items-center justify-center">
+        <span class="text-xs md:text-sm font-mono leading-none">{{ books.length }}</span>
       </div>
+
       <div class="flex-grow" />
-      <p v-if="totalDuration">{{ totalDurationPretty }}</p>
+      <p v-if="totalDuration" class="text-sm text-gray-200">{{ totalDurationPretty }}</p>
     </div>
     <template v-for="book in booksCopy">
       <tables-collection-book-table-row :key="book.id" :book="book" :collection-id="collectionId" class="item collection-book-item" @edit="editBook" />
@@ -39,12 +41,12 @@ export default {
     totalDuration() {
       var _total = 0
       this.books.forEach((book) => {
-        _total += book.duration
+        _total += book.media.duration
       })
       return _total
     },
     totalDurationPretty() {
-      return this.$elapsedPretty(this.totalDuration)
+      return this.$elapsedPrettyExtended(this.totalDuration)
     }
   },
   methods: {

components/tables/podcast/EpisodeRow.vue

@@ -211,7 +211,9 @@ export default {
 
           this.$eventBus.$emit('play-item', {
             libraryItemId: this.localLibraryItemId,
-            episodeId: this.localEpisode.id
+            episodeId: this.localEpisode.id,
+            serverLibraryItemId: this.libraryItemId,
+            serverEpisodeId: this.episode.id
           })
         } else {
           this.$eventBus.$emit('play-item', {

components/tables/podcast/EpisodesTable.vue

@@ -46,7 +46,7 @@ export default {
       episodesCopy: [],
       showFiltersModal: false,
       sortKey: 'publishedAt',
-      sortDesc: false,
+      sortDesc: true,
       filterKey: 'incomplete',
       episodeSortItems: [
         {