From 5bdb765152488ceabb2519d78093f2e1165143b6 Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Sat, 2 Jul 2016 10:34:12 +0200
Subject: [PATCH] updated

---
 vipra-ui/app/html/articles/index.html |  6 +++---
 vipra-ui/app/html/entities/index.html |  2 +-
 vipra-ui/app/html/topics/index.html   |  2 +-
 vipra-ui/app/html/words/index.html    |  2 +-
 vipra-ui/app/js/app.js                |  2 +-
 vipra-ui/app/js/controllers.js        | 16 ++++++++--------
 vipra-ui/app/less/app.less            | 22 +++++++++++++++++++++-
 7 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/vipra-ui/app/html/articles/index.html b/vipra-ui/app/html/articles/index.html
index 43276e89..a040fa43 100644
--- a/vipra-ui/app/html/articles/index.html
+++ b/vipra-ui/app/html/articles/index.html
@@ -25,7 +25,7 @@
                 <td>Loading...</td>
               </tr>
               <tr ng-show="!loadingArticles&&!articles.length">
-                <td>No Articles</td>
+                <td class="text-center text-muted">No Articles</td>
               </tr>
             </tbody>
           </table>
@@ -69,13 +69,13 @@
             </div>
             <div class="form-group">
               <label class="control-label">From/to date</label>
-              <div class="input-group date" id="fromDate" bs-datetimepicker ng-model="articlesIndexModels.fromDate">
+              <div class="input-group date from-date" id="fromDate" bs-datetimepicker ng-model="articlesIndexModels.fromDate">
                 <input type="text" class="form-control" placeholder="From date">
                 <span class="input-group-addon">
                   <span class="glyphicon glyphicon-calendar"></span>
                 </span>
               </div>
-              <div class="input-group date" id="toDate" bs-datetimepicker ng-model="articlesIndexModels.toDate">
+              <div class="input-group date to-date" id="toDate" bs-datetimepicker ng-model="articlesIndexModels.toDate">
                 <input type="text" class="form-control" placeholder="To date">
                 <span class="input-group-addon">
                   <span class="glyphicon glyphicon-calendar"></span>
diff --git a/vipra-ui/app/html/entities/index.html b/vipra-ui/app/html/entities/index.html
index b7bb112b..62549943 100644
--- a/vipra-ui/app/html/entities/index.html
+++ b/vipra-ui/app/html/entities/index.html
@@ -26,7 +26,7 @@
                 <td>Loading...</td>
               </tr>
               <tr ng-show="!loadingEntities&&!entities.length">
-                <td>No Entities</td>
+                <td class="text-center text-muted">No Entities</td>
               </tr>
             </tbody>
           </table>
diff --git a/vipra-ui/app/html/topics/index.html b/vipra-ui/app/html/topics/index.html
index 8c9025b5..9472d04a 100644
--- a/vipra-ui/app/html/topics/index.html
+++ b/vipra-ui/app/html/topics/index.html
@@ -26,7 +26,7 @@
                 <td>Loading...</td>
               </tr>
               <tr ng-show="!loadingTopics&&!topics.length">
-                <td>No Topics</td>
+                <td class="text-center text-muted">No Topics</td>
               </tr>
             </tbody>
           </table>
diff --git a/vipra-ui/app/html/words/index.html b/vipra-ui/app/html/words/index.html
index e32d77fb..fd6f30eb 100644
--- a/vipra-ui/app/html/words/index.html
+++ b/vipra-ui/app/html/words/index.html
@@ -26,7 +26,7 @@
                 <td>Loading...</td>
               </tr>
               <tr ng-show="!loadingWords&&!words.length">
-                <td>No Words</td>
+                <td class="text-center text-muted">No Words</td>
               </tr>
             </tbody>
           </table>
diff --git a/vipra-ui/app/js/app.js b/vipra-ui/app/js/app.js
index 22a7d6db..dfdf7e2c 100644
--- a/vipra-ui/app/js/app.js
+++ b/vipra-ui/app/js/app.js
@@ -31,7 +31,7 @@
       // states
 
       $stateProvider.state('index', {
-        url: '/',
+        url: '/?q',
         templateUrl: 'html/index.html',
         controller: 'IndexController',
         reloadOnSearch: false
diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js
index 18e01eb3..50c43a34 100644
--- a/vipra-ui/app/js/controllers.js
+++ b/vipra-ui/app/js/controllers.js
@@ -130,12 +130,12 @@
           if ($state.current.name === 'index')
             $('#searchBox').focus();
           else
-            $('#menuSearchBox').focus();
+            $('#quicksearch').removeClass('search-collapsed').focus().addClass('search-collapsed');
         }
       });
 
       hotkeys.add({
-        combo: 'i',
+        combo: '1',
         description: 'Go to index',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'index')
@@ -144,7 +144,7 @@
       });
 
       hotkeys.add({
-        combo: 'e',
+        combo: '2',
         description: 'Go to explorer',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'explorer')
@@ -153,7 +153,7 @@
       });
 
       hotkeys.add({
-        combo: 'n',
+        combo: '3',
         description: 'Go to network',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'network')
@@ -162,7 +162,7 @@
       });
 
       hotkeys.add({
-        combo: 'a',
+        combo: '4',
         description: 'Go to articles',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'articles')
@@ -171,7 +171,7 @@
       });
 
       hotkeys.add({
-        combo: 't',
+        combo: '5',
         description: 'Go to topics',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'topics')
@@ -180,7 +180,7 @@
       });
 
       hotkeys.add({
-        combo: 't',
+        combo: '6',
         description: 'Go to entities',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'entities')
@@ -189,7 +189,7 @@
       });
 
       hotkeys.add({
-        combo: 'w',
+        combo: '7',
         description: 'Go to words',
         callback: function() {
           if ($scope.rootModels.topicModel && $state.current.name !== 'words')
diff --git a/vipra-ui/app/less/app.less b/vipra-ui/app/less/app.less
index b9a05d2b..0948cf40 100644
--- a/vipra-ui/app/less/app.less
+++ b/vipra-ui/app/less/app.less
@@ -1084,7 +1084,7 @@ entity-menu {
   margin-left: 5px;
 }
 
-.search-collapsed {
+.search-collapsed:not(:focus) {
   width: 1px !important;
   padding-right: 20px !important;
   background: transparent;
@@ -1189,6 +1189,26 @@ entity-menu {
   }
 }
 
+.from-date {
+  .form-control {
+    border-bottom-left-radius: 0;
+  }
+  .input-group-addon {
+    border-bottom-right-radius: 0;
+  }
+}
+
+.to-date {
+  .form-control {
+    border-top-left-radius: 0;
+    border-top: 0;
+  }
+  .input-group-addon {
+    border-top-right-radius: 0;
+    border-top: 0;
+  }
+}
+
 [ng\:cloak], [ng-cloak], .ng-cloak {
   display: none !important;
 }
-- 
GitLab