From 0fb8173f1f5b27f5a764a419b51321eb713d549d Mon Sep 17 00:00:00 2001
From: sharkykh <sharkykh@gmail.com>
Date: Fri, 7 Sep 2018 17:56:55 +0300
Subject: [PATCH] Fix UI bugs (#5127)

* Fix home tabs bug (tested)

* Fix recommended shows tabs bug (pre-emptive)

* Fix status page with 3 or more root dirs is malformed

* Update changelog
---
 CHANGELOG.md                                   |  1 +
 .../slim/views/addShows_recommended.mako       |  4 ++--
 themes-default/slim/views/home.mako            |  2 +-
 themes-default/slim/views/status.mako          | 18 ++++++++++--------
 .../dark/templates/addShows_recommended.mako   |  4 ++--
 themes/dark/templates/home.mako                |  2 +-
 themes/dark/templates/status.mako              | 18 ++++++++++--------
 .../light/templates/addShows_recommended.mako  |  4 ++--
 themes/light/templates/home.mako               |  2 +-
 themes/light/templates/status.mako             | 18 ++++++++++--------
 10 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8574d3c59a..c9c1afe145 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 #### Fixes
 - Fixed many release name parsing issues as a result of updating `guessit` ([#4244](https://github.com/pymedusa/Medusa/pull/4244))
+- Fixed UI bugs in home page (when using "split home in tabs") and status page ([#5126](https://github.com/pymedusa/Medusa/pull/5126) + [#5127](https://github.com/pymedusa/Medusa/pull/5127))
 
 -----
 
diff --git a/themes-default/slim/views/addShows_recommended.mako b/themes-default/slim/views/addShows_recommended.mako
index 9ec0589069..5027aa84af 100644
--- a/themes-default/slim/views/addShows_recommended.mako
+++ b/themes-default/slim/views/addShows_recommended.mako
@@ -41,8 +41,8 @@ window.app = new Vue({
                     <div class="field-pair">
                         <label class="clearfix" for="configure_show_options">
                             <ul>
-                                <li><app-link href="addShows/${realpage + '/'}#tabs-1">Manage Directories</app-link></li>
-                                <li><app-link href="addShows/${realpage + '/'}#tabs-2">Customize Options</app-link></li>
+                                <li><app-link href="#tabs-1">Manage Directories</app-link></li>
+                                <li><app-link href="#tabs-2">Customize Options</app-link></li>
                             </ul>
                             <div id="tabs-1" class="existingtabs">
                                 <root-dirs @update="rootDirs = $event"></root-dirs>
diff --git a/themes-default/slim/views/home.mako b/themes-default/slim/views/home.mako
index 3cfed6a20a..f29741b67a 100644
--- a/themes-default/slim/views/home.mako
+++ b/themes-default/slim/views/home.mako
@@ -90,7 +90,7 @@
                 <!-- Nav tabs -->
                 <ul>
                 % for cur_show_list in show_lists:
-                    <li><app-link href="home/#${cur_show_list[0].lower()}TabContent" id="${cur_show_list[0].lower()}Tab">${cur_show_list[0]}</app-link></li>
+                    <li><app-link href="#${cur_show_list[0].lower()}TabContent" id="${cur_show_list[0].lower()}Tab">${cur_show_list[0]}</app-link></li>
                 % endfor
                 </ul>
                 <!-- Tab panes -->
diff --git a/themes-default/slim/views/status.mako b/themes-default/slim/views/status.mako
index 60209e591b..eb89d3cd54 100644
--- a/themes-default/slim/views/status.mako
+++ b/themes-default/slim/views/status.mako
@@ -212,15 +212,17 @@
                     % endif
                 </tr>
                 % endif
+                % for cur_index, cur_dir in enumerate(rootDir):
                 <tr>
-                    <td rowspan=${len(rootDir)}>Media Root Directories</td>
-                    % for cur_dir in rootDir:
-                        <td>${cur_dir}</td>
-                        % if rootDir[cur_dir] is not False:
-                            <td align="middle">${rootDir[cur_dir]}</td>
-                        % else:
-                            <td align="middle"><i>Missing</i></td>
-                        % endif
+                    % if cur_index == 0:
+                    <td rowspan="${len(rootDir)}">Media Root Directories</td>
+                    % endif
+                    <td>${cur_dir}</td>
+                    % if rootDir[cur_dir] is not False:
+                        <td align="middle">${rootDir[cur_dir]}</td>
+                    % else:
+                        <td align="middle"><i>Missing</i></td>
+                    % endif
                 </tr>
                 % endfor
             </tbody>
diff --git a/themes/dark/templates/addShows_recommended.mako b/themes/dark/templates/addShows_recommended.mako
index 9ec0589069..5027aa84af 100644
--- a/themes/dark/templates/addShows_recommended.mako
+++ b/themes/dark/templates/addShows_recommended.mako
@@ -41,8 +41,8 @@ window.app = new Vue({
                     <div class="field-pair">
                         <label class="clearfix" for="configure_show_options">
                             <ul>
-                                <li><app-link href="addShows/${realpage + '/'}#tabs-1">Manage Directories</app-link></li>
-                                <li><app-link href="addShows/${realpage + '/'}#tabs-2">Customize Options</app-link></li>
+                                <li><app-link href="#tabs-1">Manage Directories</app-link></li>
+                                <li><app-link href="#tabs-2">Customize Options</app-link></li>
                             </ul>
                             <div id="tabs-1" class="existingtabs">
                                 <root-dirs @update="rootDirs = $event"></root-dirs>
diff --git a/themes/dark/templates/home.mako b/themes/dark/templates/home.mako
index 3cfed6a20a..f29741b67a 100644
--- a/themes/dark/templates/home.mako
+++ b/themes/dark/templates/home.mako
@@ -90,7 +90,7 @@
                 <!-- Nav tabs -->
                 <ul>
                 % for cur_show_list in show_lists:
-                    <li><app-link href="home/#${cur_show_list[0].lower()}TabContent" id="${cur_show_list[0].lower()}Tab">${cur_show_list[0]}</app-link></li>
+                    <li><app-link href="#${cur_show_list[0].lower()}TabContent" id="${cur_show_list[0].lower()}Tab">${cur_show_list[0]}</app-link></li>
                 % endfor
                 </ul>
                 <!-- Tab panes -->
diff --git a/themes/dark/templates/status.mako b/themes/dark/templates/status.mako
index 60209e591b..eb89d3cd54 100644
--- a/themes/dark/templates/status.mako
+++ b/themes/dark/templates/status.mako
@@ -212,15 +212,17 @@
                     % endif
                 </tr>
                 % endif
+                % for cur_index, cur_dir in enumerate(rootDir):
                 <tr>
-                    <td rowspan=${len(rootDir)}>Media Root Directories</td>
-                    % for cur_dir in rootDir:
-                        <td>${cur_dir}</td>
-                        % if rootDir[cur_dir] is not False:
-                            <td align="middle">${rootDir[cur_dir]}</td>
-                        % else:
-                            <td align="middle"><i>Missing</i></td>
-                        % endif
+                    % if cur_index == 0:
+                    <td rowspan="${len(rootDir)}">Media Root Directories</td>
+                    % endif
+                    <td>${cur_dir}</td>
+                    % if rootDir[cur_dir] is not False:
+                        <td align="middle">${rootDir[cur_dir]}</td>
+                    % else:
+                        <td align="middle"><i>Missing</i></td>
+                    % endif
                 </tr>
                 % endfor
             </tbody>
diff --git a/themes/light/templates/addShows_recommended.mako b/themes/light/templates/addShows_recommended.mako
index 9ec0589069..5027aa84af 100644
--- a/themes/light/templates/addShows_recommended.mako
+++ b/themes/light/templates/addShows_recommended.mako
@@ -41,8 +41,8 @@ window.app = new Vue({
                     <div class="field-pair">
                         <label class="clearfix" for="configure_show_options">
                             <ul>
-                                <li><app-link href="addShows/${realpage + '/'}#tabs-1">Manage Directories</app-link></li>
-                                <li><app-link href="addShows/${realpage + '/'}#tabs-2">Customize Options</app-link></li>
+                                <li><app-link href="#tabs-1">Manage Directories</app-link></li>
+                                <li><app-link href="#tabs-2">Customize Options</app-link></li>
                             </ul>
                             <div id="tabs-1" class="existingtabs">
                                 <root-dirs @update="rootDirs = $event"></root-dirs>
diff --git a/themes/light/templates/home.mako b/themes/light/templates/home.mako
index 3cfed6a20a..f29741b67a 100644
--- a/themes/light/templates/home.mako
+++ b/themes/light/templates/home.mako
@@ -90,7 +90,7 @@
                 <!-- Nav tabs -->
                 <ul>
                 % for cur_show_list in show_lists:
-                    <li><app-link href="home/#${cur_show_list[0].lower()}TabContent" id="${cur_show_list[0].lower()}Tab">${cur_show_list[0]}</app-link></li>
+                    <li><app-link href="#${cur_show_list[0].lower()}TabContent" id="${cur_show_list[0].lower()}Tab">${cur_show_list[0]}</app-link></li>
                 % endfor
                 </ul>
                 <!-- Tab panes -->
diff --git a/themes/light/templates/status.mako b/themes/light/templates/status.mako
index 60209e591b..eb89d3cd54 100644
--- a/themes/light/templates/status.mako
+++ b/themes/light/templates/status.mako
@@ -212,15 +212,17 @@
                     % endif
                 </tr>
                 % endif
+                % for cur_index, cur_dir in enumerate(rootDir):
                 <tr>
-                    <td rowspan=${len(rootDir)}>Media Root Directories</td>
-                    % for cur_dir in rootDir:
-                        <td>${cur_dir}</td>
-                        % if rootDir[cur_dir] is not False:
-                            <td align="middle">${rootDir[cur_dir]}</td>
-                        % else:
-                            <td align="middle"><i>Missing</i></td>
-                        % endif
+                    % if cur_index == 0:
+                    <td rowspan="${len(rootDir)}">Media Root Directories</td>
+                    % endif
+                    <td>${cur_dir}</td>
+                    % if rootDir[cur_dir] is not False:
+                        <td align="middle">${rootDir[cur_dir]}</td>
+                    % else:
+                        <td align="middle"><i>Missing</i></td>
+                    % endif
                 </tr>
                 % endfor
             </tbody>