From e283f54567039ad23d372141c869fba7236c450f Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Sun, 30 Jun 2013 22:58:38 -0700
Subject: [PATCH] Add series UI changes

Link back to add series
Existing UI less contrasting
---
 UI/AddSeries/AddSeriesLayout.js               |  7 +++-
 UI/AddSeries/AddSeriesTemplate.html           | 16 ++++-----
 .../RootFolders/RootFolderItemTemplate.html   |  2 +-
 UI/AddSeries/addSeries.less                   | 34 +++++++++++++++----
 UI/AddSeries/addSeriesLayoutTemplate.html     | 21 ++++++++++--
 UI/Settings/Indexers/EditTemplate.html        |  2 +-
 UI/Settings/Notifications/EditTemplate.html   |  2 +-
 7 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/UI/AddSeries/AddSeriesLayout.js b/UI/AddSeries/AddSeriesLayout.js
index 656fe814b..9f6a7969c 100644
--- a/UI/AddSeries/AddSeriesLayout.js
+++ b/UI/AddSeries/AddSeriesLayout.js
@@ -19,7 +19,8 @@ define(
             },
 
             events: {
-                'click .x-import': '_importSeries'
+                'click .x-import': '_importSeries',
+                'click .x-add-new': '_addSeries'
             },
 
             attributes: {
@@ -48,6 +49,10 @@ define(
 
             _importSeries: function () {
                 App.modalRegion.show(this.rootFolderLayout);
+            },
+
+            _addSeries: function () {
+                this.workspace.show(new AddSeriesView());
             }
         });
     });
diff --git a/UI/AddSeries/AddSeriesTemplate.html b/UI/AddSeries/AddSeriesTemplate.html
index 51bd1ac32..87715f2b1 100644
--- a/UI/AddSeries/AddSeriesTemplate.html
+++ b/UI/AddSeries/AddSeriesTemplate.html
@@ -1,10 +1,10 @@
-<div class="row unmapped-folder-path">
-    <div class="span11">
-        {{#if folder.path}}
-        {{folder.path}}
-        {{/if}}
+{{#if folder.path}}
+    <div class="row well unmapped-folder-path">
+        <div class="span11">
+            {{folder.path}}
+        </div>
     </div>
-</div>
+{{/if}}
 <div class="row x-search-bar">
     <div class="input-prepend nz-input-large add-series-search span11">
         <i class="add-on icon-search"/>
@@ -14,7 +14,7 @@
 <div class="row">
     <div id="search-result" class="result-list span12"/>
 </div>
-<div class="text-center new-series-loadmore x-load-more" style="display: none;">
+<div class="btn btn-block text-center new-series-loadmore x-load-more" style="display: none;">
     <i class="icon-angle-down"/>
     more
-</div>{{debug}}
+</div>
diff --git a/UI/AddSeries/RootFolders/RootFolderItemTemplate.html b/UI/AddSeries/RootFolders/RootFolderItemTemplate.html
index 0f7737375..140ac5d79 100644
--- a/UI/AddSeries/RootFolders/RootFolderItemTemplate.html
+++ b/UI/AddSeries/RootFolders/RootFolderItemTemplate.html
@@ -5,6 +5,6 @@
     <span>{{Bytes freeSpace}}</span>
 </td>
 <td class="span1 nz-row-action">
-    <div class="btn btn-small btn-danger icon-minus x-remove">
+    <div class="btn btn-small btn-icon-only btn-danger icon-minus x-remove">
     </div>
 </td>
diff --git a/UI/AddSeries/addSeries.less b/UI/AddSeries/addSeries.less
index 0d212e877..a13981338 100644
--- a/UI/AddSeries/addSeries.less
+++ b/UI/AddSeries/addSeries.less
@@ -9,8 +9,6 @@
 
   .existing-series {
 
-    @highLight : rgb(134, 129, 130);
-
     .card();
     margin : 20px 0px;
 
@@ -24,16 +22,13 @@
       font-weight : 100;
       font-size   : 25px;
       text-align  : center;
-      background  : @highLight;
     }
 
     .new-series-loadmore {
-      .clickable;
       font-size      : 30px;
       font-weight    : 300;
       padding-top    : 10px;
       padding-bottom : 10px;
-      background     : @highLight;
     }
   }
 
@@ -92,5 +87,32 @@
       margin-left : 20px;
     }
   }
-
 }
+
+li.add-new {
+  .clickable;
+
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: rgb(51, 51, 51);
+  white-space: nowrap;
+}
+
+li.add-new:hover {
+  text-decoration: none;
+  color: rgb(255, 255, 255);
+  background-color: rgb(0, 129, 194);
+}
+
+.btn-group {
+  .dropdown-menu {
+    right: 0px;
+  }
+
+  .add-series-import-btn {
+    width: 93.3%;
+  }
+}
\ No newline at end of file
diff --git a/UI/AddSeries/addSeriesLayoutTemplate.html b/UI/AddSeries/addSeriesLayoutTemplate.html
index 4d4e55f5b..88dc147aa 100644
--- a/UI/AddSeries/addSeriesLayoutTemplate.html
+++ b/UI/AddSeries/addSeriesLayoutTemplate.html
@@ -1,7 +1,22 @@
 <div class="row operations-row">
-    <div class="btn-block btn btn-large add-series-import-btn x-import">
-        <i class="icon-hdd"/>
-        Import existing series on disk
+    <div class="btn-group btn-block">
+        <div class="btn btn-large add-series-import-btn x-import">
+            <i class="icon-hdd"/>
+            Import existing series on disk
+        </div>
+        <button class="btn btn-large btn-icon-only dropdown-toggle" data-toggle="dropdown">
+            <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+            <li class="add-new x-add-new">
+                Add new series
+            </li>
+        </ul>
     </div>
+
+    <!--<div class="btn btn-block btn-large add-series-import-btn x-import">-->
+        <!--<i class="icon-hdd"/>-->
+        <!--Import existing series on disk-->
+    <!--</div>-->
 </div>
 <div id="add-series-workspace"/>
diff --git a/UI/Settings/Indexers/EditTemplate.html b/UI/Settings/Indexers/EditTemplate.html
index 2786e55c1..e433b1a29 100644
--- a/UI/Settings/Indexers/EditTemplate.html
+++ b/UI/Settings/Indexers/EditTemplate.html
@@ -43,7 +43,7 @@
 
     <div class="btn-group">
         <button class="btn btn-primary x-save">save</button>
-        <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+        <button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
             <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
diff --git a/UI/Settings/Notifications/EditTemplate.html b/UI/Settings/Notifications/EditTemplate.html
index 90b8d0301..dba9e30f9 100644
--- a/UI/Settings/Notifications/EditTemplate.html
+++ b/UI/Settings/Notifications/EditTemplate.html
@@ -71,7 +71,7 @@
 
     <div class="btn-group">
         <button class="btn btn-primary x-save">save</button>
-        <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+        <button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
             <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">