# HG changeset patch # User rougeronj # Date 1432745995 -7200 # Node ID 0afdaa004ee116b452cfd246242c442c79dc5836 # Parent 3542155549e44c04286fa0a9904156383afe5d94 replace all the tab by spaces diff -r 3542155549e4 -r 0afdaa004ee1 client/app/books/add_modal.html --- a/client/app/books/add_modal.html Wed May 27 18:58:39 2015 +0200 +++ b/client/app/books/add_modal.html Wed May 27 18:59:55 2015 +0200 @@ -1,14 +1,14 @@
- - - + + +
\ No newline at end of file diff -r 3542155549e4 -r 0afdaa004ee1 client/app/home/home_controller.js --- a/client/app/home/home_controller.js Wed May 27 18:58:39 2015 +0200 +++ b/client/app/home/home_controller.js Wed May 27 18:59:55 2015 +0200 @@ -1,32 +1,32 @@ (function(){ - 'use strict'; + 'use strict'; - angular.module('ammicoHome',['ngRoute']) - .config(function ($routeProvider) { - $routeProvider - .when('/', { - templateUrl: 'home/home.html', - controller: 'homeCtrl' - }); - }) - .controller('homeCtrl', function($scope, $location){ - $scope.searchSubmit = function(){ - $location.path('/search/' + $scope.q); - }; - }) - .filter('meta', function() { - return function(input, metaName) { - var nb = input.length, i = 0, found = false; - while(found===false && i - + \ No newline at end of file diff -r 3542155549e4 -r 0afdaa004ee1 client/app/search/search_controller.js --- a/client/app/search/search_controller.js Wed May 27 18:58:39 2015 +0200 +++ b/client/app/search/search_controller.js Wed May 27 18:59:55 2015 +0200 @@ -1,44 +1,44 @@ (function(){ - 'use strict'; + 'use strict'; - angular.module('ammicoSearch',['ngResource', 'ngRoute', 'ui.bootstrap']) - .config(function ($routeProvider) { - $routeProvider - .when('/', { - templateUrl: 'search/search.html', - controller: 'searchCtrl' - }); - }) - .controller('searchCtrl', function($scope, $location, $routeParams, searchApi, ammicoApi, $modal){ - $scope.q = $routeParams.q || ''; - $scope.results = searchApi.searchResource({q:$scope.q, of: 'json', synthesis: 'false', nresults:'10', callback: 'JSON_CALLBACK'}).getJsonp(); - - $scope.toggleModal = function (index) { + angular.module('ammicoSearch',['ngResource', 'ngRoute', 'ui.bootstrap']) + .config(function ($routeProvider) { + $routeProvider + .when('/', { + templateUrl: 'search/search.html', + controller: 'searchCtrl' + }); + }) + .controller('searchCtrl', function($scope, $location, $routeParams, searchApi, $modal, Slide){ + $scope.q = $routeParams.q || ''; + $scope.results = searchApi.searchResource({q:$scope.q, of: 'json', synthesis: 'false', nresults:'10', callback: 'JSON_CALLBACK'}).getJsonp(); + + $scope.toggleModal = function (index) { - var modalInstance = $modal.open({ - templateUrl: 'search/modal.html', - controller: 'ModalInstanceCtrl', - size: 'sm' - }); + var modalInstance = $modal.open({ + templateUrl: 'search/modal.html', + controller: 'ModalInstanceCtrl', + size: 'sm' + }); - modalInstance.result.then(function (idBook) { - var newSlide = { - book: idBook, - idInventory: $scope.results.hits[index].metas_dict.inventorynumber - }; - ammicoApi.listSlides.save(newSlide); - }); - }; - }) - .controller('ModalInstanceCtrl', function ($scope, ammicoApi, $modalInstance) { - $scope.books = ammicoApi.listBooks.query({format:'json'}); - - $scope.addToBook = function(idBook){ - $modalInstance.close(idBook); - }; + modalInstance.result.then(function (idBook) { + var newSlide = { + book: idBook, + idInventory: $scope.results.hits[index].metas_dict.inventorynumber + }; + Slide.save(newSlide); + }); + }; + }) + .controller('ModalInstanceCtrl', function ($scope, $modalInstance, Book) { + $scope.books = Book.query({format:'json'}); + + $scope.addToBook = function(idBook){ + $modalInstance.close(idBook); + }; - $scope.cancel = function () { - $modalInstance.dismiss('cancel'); - }; - }); + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + }); })(); diff -r 3542155549e4 -r 0afdaa004ee1 client/app/slideshow/slideshow.css --- a/client/app/slideshow/slideshow.css Wed May 27 18:58:39 2015 +0200 +++ b/client/app/slideshow/slideshow.css Wed May 27 18:59:55 2015 +0200 @@ -1,5 +1,5 @@ .slideshow{ - margin-top:-20px; + margin-top:-20px; } .carousel-caption { color: #000; @@ -22,7 +22,7 @@ .carousel-holder img{ max-height: 500px; - max-width: 100%; + max-width: 100%; } .original-text { @@ -34,9 +34,9 @@ } ul.insight{ - overflow-x: hidden; - overflow-y: scroll; - height: 170px; + overflow-x: hidden; + overflow-y: scroll; + height: 170px; } ul.insight li { @@ -45,6 +45,6 @@ } ul.insight li img{ - height: 100%; - width: 100%; + height: 100%; + width: 100%; } \ No newline at end of file