diff --git a/vipra-ui/app/html/articles/index.html b/vipra-ui/app/html/articles/index.html index 43276e8928371e99c4ab58414aaa9f7ddf09e08e..a040fa437a99e397fa9d880fc6962f9ac9af5ee9 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 b7bb112bc9a9d6b1dc471d68960db9ac48cd5833..625499434be1ab3cb2e75cab1cf69c78092b1670 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 8c9025b57515d175f858e42fc1c8e644564387a4..9472d04a792118eba70c54b5742f39faa8a83dc9 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 e32d77fb568a56ff7d29f3084466381f7e76aba5..fd6f30eb356357884a0cb8c00862770674df13ec 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 22a7d6db21dff71f4923950f3f04358e1fff3fb2..dfdf7e2c923412d0fc2f410c808f0f3e39bf5132 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 18e01eb32771ddf01a8a77859dd9f1f93a962342..50c43a34748e78317ef38b6f7b833e1ea51c06bd 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 b9a05d2bcdf4784b14508d2e35e1a247f0b6ee6c..0948cf40f1dca0dfff2a6bbac21802168764ead3 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; }