Skip to content
Snippets Groups Projects
Commit ab37fdb9 authored by Eike Cochu's avatar Eike Cochu
Browse files

update

parent 7c9e0066
Branches
No related tags found
No related merge requests found
<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">
......
......@@ -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">
......
<li><a>Advanced</a></li>
\ No newline at end of file
......@@ -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>
......
<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">
......
<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">
......
......@@ -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>
......
......@@ -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;
......
......@@ -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();
});
}
}
});
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment