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

use backbone navigation to bring up episode page instead of page reload.
12 years ago · 662ad28cc6
parent 9a42e305ad
commit 662ad28cc6
6 changed files with 98 additions and 67 deletions
--- a/UI/Content/menu.less
+++ b/UI/Content/menu.less
@ -6,3 +6,8 @@
    width: 40px;
  }
 }
+
+#in-sub-nav li a {
+  color: #b9b9b9;
+
+}
--- a/UI/Index.html
+++ b/UI/Index.html
@ -25,7 +25,7 @@
    <link href="/content/base.css" rel='stylesheet' type='text/css'/>
 </head>
 <body>
-    <div id="in-sub-nav">
+<div id="in-sub-nav">
    <div class="container">
        <div class="row">
            <div class="span12">
@ -53,8 +53,19 @@
            </div>
        </div>
    </div>
-    </div>
-    <div class="page">
+</div>
+
+<!--<div style="background: red">
+    awdawdawdawdawdawdadaw
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+    <br/>
+
+</div>-->
+<div class="page">
    <div class="page-container">
        <div class="container">
            <div class="row">
@ -67,8 +78,8 @@
            <div id="modal-region"></div>
        </div>
    </div>
-    </div>
-    <footer>
+</div>
+<footer>
    <div class="container">
        <div class="row">
            <div class="span12">
@ -76,7 +87,7 @@
            </div>
        </div>
    </div>
-    </footer>
+</footer>
 </body>
 <script src="/JsLibraries/jquery.js"></script>
 <script src="/JsLibraries/bootstrap.js"></script>
--- a/UI/MainMenuView.js
+++ b/UI/MainMenuView.js
@ -1,9 +1,6 @@
-define(['app'], function () {
+"use strict";
+define(['app'], function () {
    NzbDrone.MainMenuView = Backbone.Marionette.ItemView.extend({
-        ui: {
-            seriesSearch: '.search input'
-        },
-
        events: {
            'click a': 'onClick'
        },
@ -13,10 +10,9 @@
            event.preventDefault();

            var target = $(event.target);
-            var href = undefined;

            //look down for <a/>
-            href = event.target.getAttribute('href');
+            var href = event.target.getAttribute('href');

            //if couldn't find it look up 
            if (!href && target.parent('a') && target.parent('a')[0]) {
@ -32,7 +28,7 @@
            if (href && href.startsWith('http')) {
                window.location.href = href;
            } else {
-                NzbDrone.Router.navigate(href, { trigger: true, replace: true });
+                NzbDrone.Router.navigate(href, { trigger: true });
            }

        },
--- a/UI/Series/Index/List/ItemTemplate.html
+++ b/UI/Series/Index/List/ItemTemplate.html
@ -8,7 +8,9 @@
        <div class="span10">
            <div class="row">
                <div class="span9">
+                    <a href="/series/details/{{id}}" target="_blank">
                        <h2>{{title}}</h2>
+                    </a>
                </div>
                <div class="span1">
                    <div class="pull-right">
@ -18,9 +20,11 @@
                </div>
            </div>
            <div class="row">
+                <a href="/series/details/{{id}}" target="_blank">
                    <div class="span10">
                        {{overview}}
                    </div>
+                </a>
            </div>
            <div class="row">&nbsp;</div>
            <div class="row">
--- a/UI/Series/Index/List/ItemView.js
+++ b/UI/Series/Index/List/ItemView.js
@ -18,7 +18,8 @@ define([

        events: {
            'click .x-edit'  : 'editSeries',
-            'click .x-remove': 'removeSeries'
+            'click .x-remove': 'removeSeries',
+            'click a'        : 'showEpisodeList'
        },

        initialize: function (options) {
@ -38,6 +39,12 @@ define([
            NzbDrone.vent.trigger(NzbDrone.Events.OpenModalDialog, {
                view: view
            });
+        },
+
+        showEpisodeList: function (e) {
+            e.preventDefault();
+            NzbDrone.Router.navigate('/series/details/' + this.model.get('id'), { trigger: true});
+
        }
    });
 });
--- a/UI/Series/series.less
+++ b/UI/Series/series.less
@ -1,9 +1,17 @@
 .series-item {
-  padding-bottom: 20px;
+  padding-bottom: 30px;
+
+  :hover {
+    text-decoration: none;
+  }

  h2 {
    margin-top: 0px;
  }
+
+  a{
+    color: #000000;
+  }
 }

 .series-posters {