diff --git a/vipra-ui/app/html/articles/index.html b/vipra-ui/app/html/articles/index.html
index cbb03f8f0a6eb01fd19bd9aaaf3e8c3ef9a94034..7c5a3a6072caeba2f70963e8af39dfec6312ba4e 100644
--- a/vipra-ui/app/html/articles/index.html
+++ b/vipra-ui/app/html/articles/index.html
@@ -1,6 +1,6 @@
-<p>
- Found <span ng-bind="articlesMeta.total"></span> articles in the database <query-time/>.
-</p>
+<div class="well">
+ Found <span ng-bind="articlesMeta.total"></span> articles in the database <query-time/>.<br>
+</div>
<ul class="dashed">
<li ng-repeat="article in articles">
diff --git a/vipra-ui/app/html/articles/show.html b/vipra-ui/app/html/articles/show.html
index 0f96952ce7629cce21395872647f3292bb23c325..46003bd8b0f80cf99520cbec1bd37701c2cc9b01 100644
--- a/vipra-ui/app/html/articles/show.html
+++ b/vipra-ui/app/html/articles/show.html
@@ -46,7 +46,7 @@
<div class="row" id="topics">
<div class="col-md-4 topic-links text-right">
<topic-link topic="topic.topic" ng-repeat="topic in article.topics">
- <span ng-bind-template="({{topic.share}}%)"></span>
+ <span class="label label-default" ng-bind-template="{{topic.share}}%"></span>
</topic-link>
</div>
<div class="col-md-offset-1 col-md-6">
diff --git a/vipra-ui/app/html/index-menu.html b/vipra-ui/app/html/index-menu.html
new file mode 100644
index 0000000000000000000000000000000000000000..aa1e3f4110b2f193a1dc3ee4ac68ad159ce9e254
--- /dev/null
+++ b/vipra-ui/app/html/index-menu.html
@@ -0,0 +1 @@
+<li><a>Advanced</a></li>
\ No newline at end of file
diff --git a/vipra-ui/app/html/index.html b/vipra-ui/app/html/index.html
index 2a0d0b320f5968179bac173040407c47439c0998..637d554e1ac33d62ca8a249ff0bea74f1415d476 100644
--- a/vipra-ui/app/html/index.html
+++ b/vipra-ui/app/html/index.html
@@ -36,13 +36,8 @@
<div class="row row-spaced">
<div class="col-md-12">
<input type="text" class="form-control input-lg" placeholder="Search..." ng-model="search" ng-model-options="{debounce:500}">
- <p class="text-right">
- <small>
- <a toggle-link target="#advanced">Advanced...</a>
- </small>
- </p>
<div id="advanced" style="display:none">
-
+
</div>
</div>
</div>
diff --git a/vipra-ui/app/html/topics/index.html b/vipra-ui/app/html/topics/index.html
index fa32725749cf67c7a1b940a670e1e54363d7d421..c73784d554b015eedb7bd85777468bb940a0dfa2 100644
--- a/vipra-ui/app/html/topics/index.html
+++ b/vipra-ui/app/html/topics/index.html
@@ -1,6 +1,6 @@
-<p>
- Found <span ng-bind="topicsMeta.total"></span> topics in the database <query-time/>.
-</p>
+<div class="well">
+ Found <span ng-bind="topicsMeta.total"></span> topics in the database <query-time/>.
+</div>
<ul class="dashed">
<li ng-repeat="topic in topics">
diff --git a/vipra-ui/app/html/words/index.html b/vipra-ui/app/html/words/index.html
index 631b2dc2c7ebea7d5a6cda3b4e076d768126113d..d0850631087c163741b71d4adb5c5577feedef64 100644
--- a/vipra-ui/app/html/words/index.html
+++ b/vipra-ui/app/html/words/index.html
@@ -1,6 +1,6 @@
-<p>
+<div class="well">
Found <span ng-bind="wordsMeta.total"></span> words in the database <query-time/>.
-</p>
+</div>
<div class="row">
<div class="col-md-4">
diff --git a/vipra-ui/app/index.html b/vipra-ui/app/index.html
index 215b50a1fc6e371451469ea385141febcce31fcb..e1232a7dc4598262e9687defb374b03946a94a17 100644
--- a/vipra-ui/app/index.html
+++ b/vipra-ui/app/index.html
@@ -55,6 +55,7 @@
<li ui-sref-active="active"><a ui-sref="topics.index">Topics</a></li>
<li ui-sref-active="active"><a ui-sref="words.index">Words</a></li>
</ul>
+ <ul class="nav navbar-nav navbar-right" ui-view="menu"></ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js
index 80a436c1bea713b74b853a50be1cfb36d0501cc0..15ba73eb1637fffb3ced9d254ae0b122d96268ff 100644
--- a/vipra-ui/app/js/controllers.js
+++ b/vipra-ui/app/js/controllers.js
@@ -79,12 +79,13 @@
$scope.page = Math.max($stateParams.page || 1, 1);
$scope.limit = pageSize;
$scope.sort = Store('sortarticles') || 'date';
+ $scope.order = Store('orderarticles') || '';
$scope.reload = function() {
ArticleFactory.query({
skip: ($scope.page-1)*$scope.limit,
limit: $scope.limit,
- sort: $scope.sort
+ sort: $scope.order+$scope.sort
}, function(response) {
$scope.articles = response.data;
$scope.articlesMeta = response.meta;
@@ -154,11 +155,13 @@
$scope.page = Math.max($stateParams.page || 1, 1);
$scope.limit = pageSize;
$scope.sort = Store('sorttopics') || 'name';
+ $scope.order = Store('ordertopics') || '';
$scope.reload = function() {
TopicFactory.query({
skip: ($scope.page-1)*$scope.limit,
- limit: $scope.limit
+ limit: $scope.limit,
+ sort: $scope.order+$scope.sort
}, function(response) {
$scope.topics = response.data;
$scope.topicsMeta = response.meta;
@@ -198,12 +201,14 @@
$scope.page = Math.max($stateParams.page || 1, 1);
$scope.limit = 300;
$scope.sort = Store('sortwords') || 'word';
+ $scope.order = Store('orderwords') || '';
$scope.reload = function() {
WordFactory.query({
skip: ($scope.page-1)*$scope.limit,
limit: $scope.limit,
- sort: $scope.sort
+ sort: $scope.sort,
+ sort: $scope.order+$scope.sort
}, function(response) {
$scope.words = response.data;
$scope.wordsMeta = response.meta;
diff --git a/vipra-ui/app/js/directives.js b/vipra-ui/app/js/directives.js
index d4cee45493d788dfcbecdcc7747eb5dac9d00848..4db6af286da54dc9f4b2f7966d18e2fa75380a4b 100644
--- a/vipra-ui/app/js/directives.js
+++ b/vipra-ui/app/js/directives.js
@@ -282,12 +282,9 @@
app.directive('toggleLink', function() {
return {
link: function($scope, $elem, $attrs) {
- var target = $($attrs.target);
- if(target) {
- $elem.click(function() {
- target.slideToggle();
- });
- }
+ $elem.click(function() {
+ $($attrs.target).slideToggle();
+ });
}
}
});
diff --git a/vipra-ui/app/less/app.less b/vipra-ui/app/less/app.less
index 348c59eef3a204ec6399e7fef0c19f1b933b5254..61a55dc46db6c4951f7abf4679d78b66df4136ee 100644
--- a/vipra-ui/app/less/app.less
+++ b/vipra-ui/app/less/app.less
@@ -170,6 +170,15 @@ ul.dashed {
padding-bottom: 50px;
}
+.form-control-inline {
+ display: inline;
+ width: auto;
+}
+
+#nprogress .spinner {
+ display: none;
+}
+
@-moz-keyframes spin { 100% { -moz-transform: rotateY(360deg); } }
@-webkit-keyframes spin { 100% { -webkit-transform: rotateY(360deg); } }
@keyframes spin { 100% { -webkit-transform: rotateY(360deg); transform:rotateY(360deg); } }
\ No newline at end of file