mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

overview and series title in series list is now click-able, 

use backbone navigation to bring up episode page instead of page reload.
This commit is contained in:
kay.one 2013-04-22 21:55:08 -07:00 committed by Keivan Beigi
parent 9a42e305ad
commit 662ad28cc6
6 changed files with 100 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UI/Content/menu.less
View File

@ -5,4 +5,9 @@
i { i {
width: 40px; width: 40px;
} }
} }
#in-sub-nav li a {
color: #b9b9b9;
}

101
UI/Index.html
View File

@ -25,58 +25,69 @@
<link href="/content/base.css" rel='stylesheet' type='text/css'/> <link href="/content/base.css" rel='stylesheet' type='text/css'/>
</head> </head>
<body> <body>
<div id="in-sub-nav"> <div id="in-sub-nav">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
<ul id="main-menu-region"> <ul id="main-menu-region">
<li><a href="/"><i class="icon-film"></i> <li><a href="/"><i class="icon-film"></i>
<br> <br>
Series</a></li> Series</a></li>
<li><a href="/calendar"><i class="icon-calendar"></i> <li><a href="/calendar"><i class="icon-calendar"></i>
<br> <br>
Calendar</a></li> Calendar</a></li>
<li><span class="label label-important pull-right">08</span><a href="history"><i class="icon-time"></i><br> <li><span class="label label-important pull-right">08</span><a href="history"><i class="icon-time"></i><br>
History</a></li> History</a></li>
<li><span class="label label-important pull-right">04</span><a href="missing"><i class="icon-folder-open"></i><br> <li><span class="label label-important pull-right">04</span><a href="missing"><i class="icon-folder-open"></i><br>
Missing</a></li> Missing</a></li>
<li><a href="settings"><i class="icon-cogs"></i> <li><a href="settings"><i class="icon-cogs"></i>
<br> <br>
Settings</a></li> Settings</a></li>
<li><a href="system"><i class="icon-plane"></i> <li><a href="system"><i class="icon-plane"></i>
<br> <br>
System</a></li> System</a></li>
<li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KRTE52U3XJDSQ" target="_blank"><i class="icon-star"></i> <li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KRTE52U3XJDSQ" target="_blank"><i class="icon-star"></i>
<br> <br>
Donate</a></li> Donate</a></li>
</ul> </ul>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="page"> </div>
<div class="page-container">
<div class="container"> <!--<div style="background: red">
<div class="row"> awdawdawdawdawdawdadaw
<div class="span12 header"> <br/>
<h4 id="title-region">NZBDRONE</h4> <br/>
</div> <br/>
<div class="span12" id="notification-region"/> <br/>
<br/>
<br/>
</div>-->
<div class="page">
<div class="page-container">
<div class="container">
<div class="row">
<div class="span12 header">
<h4 id="title-region">NZBDRONE</h4>
</div> </div>
<div class="span12" id="main-region"></div> <div class="span12" id="notification-region"/>
<div id="modal-region"></div> </div>
<div class="span12" id="main-region"></div>
<div id="modal-region"></div>
</div>
</div>
</div>
<footer>
<div class="container">
<div class="row">
<div class="span12">
<p>&copy; Copyright 2013 NzbDrone</p>
</div> </div>
</div> </div>
</div> </div>
<footer> </footer>
<div class="container">
<div class="row">
<div class="span12">
<p>&copy; Copyright 2013 NzbDrone</p>
</div>
</div>
</div>
</footer>
</body> </body>
<script src="/JsLibraries/jquery.js"></script> <script src="/JsLibraries/jquery.js"></script>
<script src="/JsLibraries/bootstrap.js"></script> <script src="/JsLibraries/bootstrap.js"></script>

12
UI/MainMenuView.js
View File

@ -1,9 +1,6 @@
define(['app'], function () { "use strict";
define(['app'], function () {
NzbDrone.MainMenuView = Backbone.Marionette.ItemView.extend({ NzbDrone.MainMenuView = Backbone.Marionette.ItemView.extend({
ui: {
seriesSearch: '.search input'
},
events: { events: {
'click a': 'onClick' 'click a': 'onClick'
}, },
@ -13,10 +10,9 @@
event.preventDefault(); event.preventDefault();
var target = $(event.target); var target = $(event.target);
var href = undefined;
//look down for <a/> //look down for <a/>
href = event.target.getAttribute('href'); var href = event.target.getAttribute('href');
//if couldn't find it look up //if couldn't find it look up
if (!href && target.parent('a') && target.parent('a')[0]) { if (!href && target.parent('a') && target.parent('a')[0]) {
@ -32,7 +28,7 @@
if (href && href.startsWith('http')) { if (href && href.startsWith('http')) {
window.location.href = href; window.location.href = href;
} else { } else {
NzbDrone.Router.navigate(href, { trigger: true, replace: true }); NzbDrone.Router.navigate(href, { trigger: true });
} }
}, },

30
UI/Series/Index/List/ItemTemplate.html
View File

@ -8,7 +8,9 @@
<div class="span10"> <div class="span10">
<div class="row"> <div class="row">
<div class="span9"> <div class="span9">
<h2>{{title}}</h2> <a href="/series/details/{{id}}" target="_blank">
<h2>{{title}}</h2>
</a>
</div> </div>
<div class="span1"> <div class="span1">
<div class="pull-right"> <div class="pull-right">
@ -18,23 +20,25 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="span10"> <a href="/series/details/{{id}}" target="_blank">
{{overview}} <div class="span10">
</div> {{overview}}
</div>
</a>
</div> </div>
<div class="row">&nbsp;</div> <div class="row">&nbsp;</div>
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">
{{#if isContinuing}} {{#if isContinuing}}
{{#if bestDateString}} {{#if bestDateString}}
<span class="label">{{bestDateString}}</span> <span class="label">{{bestDateString}}</span>
{{else}}
<span class="label label-inverse">{{statusText}}</span>
{{/if}}
<span class="label label-info">Season {{seasonCount}}</span>
{{else}} {{else}}
<span class="label label-important">{{statusText}}</span> <span class="label label-inverse">{{statusText}}</span>
<span class="label label-info">{{seasonCount}} Seasons</span> {{/if}}
<span class="label label-info">Season {{seasonCount}}</span>
{{else}}
<span class="label label-important">{{statusText}}</span>
<span class="label label-info">{{seasonCount}} Seasons</span>
{{/if}} {{/if}}
</div> </div>
<div class="span2"> <div class="span2">
@ -47,4 +51,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

9
UI/Series/Index/List/ItemView.js
View File

@ -18,7 +18,8 @@ define([
events: { events: {
'click .x-edit' : 'editSeries', 'click .x-edit' : 'editSeries',
'click .x-remove': 'removeSeries' 'click .x-remove': 'removeSeries',
'click a' : 'showEpisodeList'
}, },
initialize: function (options) { initialize: function (options) {
@ -38,6 +39,12 @@ define([
NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, { NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
view: view view: view
}); });
},
showEpisodeList: function (e) {
e.preventDefault();
NzbDrone.Router.navigate('/series/details/' + this.model.get('id'), { trigger: true});
} }
}); });
}); });

10
UI/Series/series.less
View File

@ -1,9 +1,17 @@
.series-item { .series-item {
padding-bottom: 20px; padding-bottom: 30px;
:hover {
text-decoration: none;
}
h2 { h2 {
margin-top: 0px; margin-top: 0px;
} }
a{
color: #000000;
}
} }
.series-posters { .series-posters {