Skip to content

Commit

Permalink
Fix UI bugs (#5127)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
sharkykh authored and medariox committed Sep 7, 2018
1 parent d1e7f87 commit 0fb8173
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 33 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))

-----

Expand Down
4 changes: 2 additions & 2 deletions themes-default/slim/views/addShows_recommended.mako
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion themes-default/slim/views/home.mako
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
18 changes: 10 additions & 8 deletions themes-default/slim/views/status.mako
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions themes/dark/templates/addShows_recommended.mako

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion themes/dark/templates/home.mako

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions themes/dark/templates/status.mako

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions themes/light/templates/addShows_recommended.mako

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion themes/light/templates/home.mako

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions themes/light/templates/status.mako

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0fb8173

Please sign in to comment.