From d32bb22e2d61c709e166967324d50d028e27da02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20V=C3=A9zina?=
 <5130500+morpheus65535@users.noreply.github.com>
Date: Sun, 9 Feb 2020 22:36:40 -0500
Subject: [PATCH] WIP

---
 views/episodes.html      |  6 ++--
 views/historymovies.html | 49 ++++++++++++++++++++----------
 views/historyseries.html | 64 +++++++++++++++++++++++++---------------
 views/series.html        | 20 ++++++-------
 4 files changed, 86 insertions(+), 53 deletions(-)

diff --git a/views/episodes.html b/views/episodes.html
index 78f2cadd0..2bfd9836a 100644
--- a/views/episodes.html
+++ b/views/episodes.html
@@ -426,7 +426,7 @@
 				sonarrEpisodeId: $(this).attr("data-sonarrEpisodeId"),
 				tvdbid: seriesDetails['tvdbId']
 			};
-			var cell = $(this).closest('td');
+			var cell = $(this).parent();
 			$.ajax({
 				url: "{{ url_for('api.episodessubtitlesdelete') }}",
 				type: "DELETE",
@@ -451,7 +451,7 @@
 				sonarrEpisodeId: $(this).attr('data-sonarrepisodeid'),
 				title: seriesDetails['title']
 			};
-			var cell = $(this).closest('td');
+			var cell = $(this).parent();
 			$.ajax({
 				url: "{{ url_for('api.episodessubtitlesdownload') }}",
 				type: "POST",
@@ -588,7 +588,7 @@
 				sonarrEpisodeId: $(this).attr('data-sonarrepisodeid'),
 				title: seriesDetails['title']
 			};
-			var cell = $(this).closest('td');
+			var cell = $(this).parent();
 			$.ajax({
 				url: "{{ url_for('api.episodessubtitlesmanualdownload') }}",
 				type: "POST",
diff --git a/views/historymovies.html b/views/historymovies.html
index 959555033..bbf187ed9 100644
--- a/views/historymovies.html
+++ b/views/historymovies.html
@@ -1,20 +1,13 @@
 {% extends '_main.html' %}
 
-{% block title %}History (Series) - Bazarr{% endblock %}
+{% block title %}History (Movies) - Bazarr{% endblock %}
 
 {% block bcleft %}
-    <div class="d-flex">
-        <button class="btn btn-outline">
-            <i class="fas fa-sync align-top text-themecolor text-center" aria-hidden="true"></i>
-            <span class="align-bottom">Update</span>
-        </button>
-    </div>
+
 {% endblock bcleft %}
 
 {% block bcright %}
-    <div class="d-flex m-t-5 justify-content-end">
-        <h5 class="m-t-0 text-themecolor">Some page settings</h5>
-    </div>
+
 {% endblock bcright %}
 
 {% block body %}
@@ -34,21 +27,45 @@
     <script>
         $(document).ready(function () {
             var table = $('#history_movies').DataTable({
-                "dom":"<'row'<'col-sm-12'tr>>" +
-                    "<'row'<'col-sm-5'i><'col-sm-7'p>>",
                 "processing": false,
                 "serverSide": true,
                 "searching": false,
                 "ordering": false,
                 "responsive": true,
-                "lengthChange": true,
+                "lengthChange": false,
                 "pageLength": {{ settings.general.page_size }},
                 "ajax": "{{ url_for('api.historymovies') }}",
                 "columns": [
-                    {"data": "action"},
-                    {"data": "title"},
+                    {"data": "action",
+						"render": function(data) {
+                            if (data === 0) {
+                                return "<i class='fas fa-trash' title='Subtitle file has been erased.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 1) {
+                                return "<i class='fas fa-download' title='Subtitle file has been downloaded.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 2) {
+                                return "<i class='fas fa-user' title='Subtitle file has been manually downloaded.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 3) {
+                                return "<i class='fas fa-recycle' title='Subtitle file has been upgraded.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 4) {
+                                return "<i class='fas fa-cloud-upload-alt' title='Subtitle file has been manually uploaded.' data-toggle='tooltip' data-placement='right'></i>";
+                            }
+                        }
+                    },
+                    {"data": null,
+                        "render": function (data) {
+                            return '<a href="' + "{{ url_for( 'movie', no='tempvalue' ) }}".replace("tempvalue", data.radarrId) + '">' + data.title + '</a>';
+                        }
+                    },
                     {"data": "timestamp"},
-                    {"data": "description"}
+                    {"data": null,
+                        "render": function (data) {
+                            if (data.upgradable) {
+                                return "<i class='fas fa-recycle' title='This Subtitles File Is Eligible For An Upgrade.' style='color: green;' data-toggle='tooltip' data-placement='right'></i> " + data.description;
+                            } else {
+                                return data.description;
+                            }
+                        }
+                    }
                 ]
             });
         });
diff --git a/views/historyseries.html b/views/historyseries.html
index 264d4b59e..e8da900b3 100644
--- a/views/historyseries.html
+++ b/views/historyseries.html
@@ -3,31 +3,24 @@
 {% block title %}History (Series) - Bazarr{% endblock %}
 
 {% block bcleft %}
-    <div class="d-flex">
-        <button class="btn btn-outline">
-            <i class="fas fa-sync align-top text-themecolor text-center" aria-hidden="true"></i>
-            <span class="align-bottom">Update</span>
-        </button>
-    </div>
+
 {% endblock bcleft %}
 
 {% block bcright %}
-    <div class="d-flex m-t-5 justify-content-end">
-        <h5 class="m-t-0 text-themecolor">Some page settings</h5>
-    </div>
+
 {% endblock bcright %}
 
 {% block body %}
     <table id="history_series" class="table table-striped" style="width:100%">
         <thead>
-        <tr>
-            <th>Action</th>
-            <th>Name</th>
-            <th>Episode</th>
-            <th>Episode Title</th>
-            <th>Date</th>
-            <th>Description</th>
-        </tr>
+            <tr>
+                <th>Action</th>
+                <th>Name</th>
+                <th>Episode</th>
+                <th>Episode Title</th>
+                <th>Date</th>
+                <th>Description</th>
+            </tr>
         </thead>
     </table>
 {% endblock body %}
@@ -36,23 +29,46 @@
     <script>
         $(document).ready(function () {
             var table = $('#history_series').DataTable({
-                "dom":
-                    "<'row'<'col-sm-12'tr>>" +
-                    "<'row'<'col-sm-5'i><'col-sm-7'p>>",
                 "processing": true,
                 "serverSide": true,
                 "searching": false,
                 "ordering": false,
-                "lengthChange": true,
+                "lengthChange": false,
                 "pageLength": {{ settings.general.page_size }},
                 "ajax": "{{ url_for('api.historyseries') }}",
                 "columns": [
-                    {"data": "action"},
-                    {"data": "seriesTitle"},
+                    {"data": "action",
+						"render": function(data) {
+                            if (data === 0) {
+                                return "<i class='fas fa-trash' title='Subtitle file has been erased.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 1) {
+                                return "<i class='fas fa-download' title='Subtitle file has been downloaded.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 2) {
+                                return "<i class='fas fa-user' title='Subtitle file has been manually downloaded.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 3) {
+                                return "<i class='fas fa-recycle' title='Subtitle file has been upgraded.' data-toggle='tooltip' data-placement='right'></i>";
+                            } else if (data === 4) {
+                                return "<i class='fas fa-cloud-upload-alt' title='Subtitle file has been manually uploaded.' data-toggle='tooltip' data-placement='right'></i>";
+                            }
+                        }
+                    },
+                    {"data": null,
+                        "render": function (data) {
+                            return '<a href="' + "{{ url_for( 'episodes', no='tempvalue' ) }}".replace("tempvalue", data.sonarrSeriesId) + '">' + data.seriesTitle + '</a>';
+                        }
+                    },
                     {"data": "episode_number"},
                     {"data": "episodeTitle"},
                     {"data": "timestamp"},
-                    {"data": "description"}
+                    {"data": null,
+                        "render": function (data) {
+                            if (data.upgradable) {
+                                return "<i class='fas fa-recycle' title='This Subtitles File Is Eligible For An Upgrade.' style='color: green;' data-toggle='tooltip' data-placement='right'></i> " + data.description;
+                            } else {
+                                return data.description;
+                            }
+                        }
+                    }
                 ]
             });
         });
diff --git a/views/series.html b/views/series.html
index 5bc43b58e..42a877849 100644
--- a/views/series.html
+++ b/views/series.html
@@ -18,16 +18,16 @@
 {% block body %}
     <table id="series" class="table table-striped" style="width:100%">
         <thead>
-        <tr>
-            <th>Name</th>
-            <th>Path Exist</th>
-            <th>Audio Language</th>
-            <th>Subtitles Languages</th>
-            <th>Hearing-Impaired</th>
-            <th>Forced</th>
-            <th>Subtitles</th>
-            <th></th>
-        </tr>
+            <tr>
+                <th>Name</th>
+                <th>Path Exist</th>
+                <th>Audio Language</th>
+                <th>Subtitles Languages</th>
+                <th>Hearing-Impaired</th>
+                <th>Forced</th>
+                <th>Subtitles</th>
+                <th></th>
+            </tr>
         </thead>
     </table>