--- a/client/app/app.js Thu Apr 02 12:02:07 2015 +0200
+++ b/client/app/app.js Thu Apr 02 12:06:51 2015 +0200
@@ -32,18 +32,6 @@
controller: 'slideshowCtrl',
templateUrl: 'slideshow/slideshow.html'
}).
- when('/slideshow/edit/:iSlide', {
- controller: 'slideshowCtrl',
- templateUrl: 'slideshow/slideshow.html'
- }).
- when('/slideshow/add/:searched', {
- controller: 'slideshowCtrl',
- templateUrl: 'slideshow/slideshow.html'
- }).
- when('/search', {
- controller: 'searchCtrl',
- templateUrl: 'search/search.html'
- }).
when('/search/:q', {
controller: 'searchCtrl',
templateUrl: 'search/search.html'
--- a/client/app/home/home_controller.js Thu Apr 02 12:02:07 2015 +0200
+++ b/client/app/home/home_controller.js Thu Apr 02 12:06:51 2015 +0200
@@ -17,8 +17,7 @@
_this.books = data;
});
})
- .controller('homeCtrl', function($scope, $location, booksModel){
- $scope.books = booksModel.books;
+ .controller('homeCtrl', function($scope, $location){
$scope.searchSubmit = function(){
$location.path('/search/' + $scope.q);
};
--- a/client/app/search/modal.html Thu Apr 02 12:02:07 2015 +0200
+++ b/client/app/search/modal.html Thu Apr 02 12:06:51 2015 +0200
@@ -1,11 +1,17 @@
-<div class="listBooks">
- <p>A quel Book boulez vous ajoutez cet element ?</p>
+<div class="modal-header ng-scope">
+ <h3 class="modal-title">A quel Book ajouter cet element ?</h3>
+</div>
+<div class="modal-body ng-scope">
<ul class="row ">
- <li class="" ng-repeat="i in books">
+ <li class="" ng-repeat="i in books | orderBy:'-date'">
<div>
<a class="visite" ng-click="addToBook(i.id)">{{ i.title }}</a>
</div>
</li>
</ul>
+</div>
+
+<div class="modal-footer ng-scope">
+ <button ng-click="cancel()" class="btn btn-warning">Cancel</button>
</div>
\ No newline at end of file
--- a/client/app/search/search.css Thu Apr 02 12:02:07 2015 +0200
+++ b/client/app/search/search.css Thu Apr 02 12:06:51 2015 +0200
@@ -21,6 +21,6 @@
margin-top: 20px;
padding: 6px 0 10px;
}
-.listBooks a{
+.modal-body a{
cursor: pointer;
}
\ No newline at end of file
--- a/client/app/search/search.html Thu Apr 02 12:02:07 2015 +0200
+++ b/client/app/search/search.html Thu Apr 02 12:06:51 2015 +0200
@@ -38,7 +38,7 @@
</div>
</div>
<div class="col-md-1">
- <a popover-placement="right" popover-trigger="click" class="btn btn-default" ng-click="toggleModal($index)"><span class="glyphicon glyphicon-plus"></span></a>
+ <a class="btn btn-default" ng-click="toggleModal($index)"><span class="glyphicon glyphicon-plus"></span></a>
<a class="btn btn-default" ng-click="h.imgbig=!h.imgbig"><span class="glyphicon glyphicon-eye-open"></span></a>
</div>
</div>
--- a/client/app/slides/slides_controller.js Thu Apr 02 12:02:07 2015 +0200
+++ b/client/app/slides/slides_controller.js Thu Apr 02 12:06:51 2015 +0200
@@ -3,7 +3,6 @@
angular.module('ammicoSlides',['ngResource', 'ngRoute'])
.controller('slidesCtrl', function($scope, $routeParams, searchApi){
- console.log($scope.currentBook);
$scope.slide = searchApi.slide.get({idSlide:$routeParams.idSlide, format:'json'}, function(data){
data = searchApi.sanitizeUrls(data);