--- 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 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">Ajouter un nouveau Book</h3>
+ <h3 class="modal-title">Ajouter un nouveau Book</h3>
</div>
<form ng-submit="add()" novalidate>
- <div class="modal-body ng-scope">
- <input type="text" class="form-control" ng-model='title' placeholder="Titre"></input>
- </div>
-
- <div class="modal-footer ng-scope">
- <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
- <button type="submit" class="btn btn-primary">Create</button>
- </div>
+ <div class="modal-body ng-scope">
+ <input type="text" class="form-control" ng-model='title' placeholder="Titre"></input>
+ </div>
+
+ <div class="modal-footer ng-scope">
+ <button type="button" ng-click="cancel()" class="btn btn-warning">Cancel</button>
+ <button type="submit" class="btn btn-primary">Create</button>
+ </div>
</form>
\ No newline at end of file
--- 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<nb){
- if(input[i].name===metaName){
- found = true;
- return input[i].value;
- }
- i++;
- }
- return '';
- };
- });
+ 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<nb){
+ if(input[i].name===metaName){
+ found = true;
+ return input[i].value;
+ }
+ i++;
+ }
+ return '';
+ };
+ });
})();
--- a/client/app/search/modal.html Wed May 27 18:58:39 2015 +0200
+++ b/client/app/search/modal.html Wed May 27 18:59:55 2015 +0200
@@ -1,24 +1,24 @@
<div class="modal-header ng-scope">
- <h3 class="modal-title">A quel Book ajouter cet element ?</h3>
+ <h3 class="modal-title">A quel Book ajouter cet element ?</h3>
</div>
<div class="modal-body ng-scope">
- <ul class="row ">
- Les books de vos visites:
- <li class="" ng-repeat="i in books | filter:{parent_visit:'!null'}:filter:{ parent_visit: 'null', idArticle: 'null' }">
- <div>
- <a ng-click="addToBook(i.id)">{{ i.title }}</a>
- </div>
- </li>
- Autres Books:
- <li class="" ng-repeat="i in books | filter:{ parent_visit: 'null', idArticle: 'null' }">
- <div>
- <a ng-click="addToBook(i.id)">{{ i.title }}</a>
- </div>
- </li>
- </ul>
+ <ul class="row ">
+ Les books de vos visites:
+ <li class="" ng-repeat="i in books | filter:{parent_visit:'!null'}:filter:{ parent_visit: 'null', idArticle: 'null' }">
+ <div>
+ <a ng-click="addToBook(i.id)">{{ i.title }}</a>
+ </div>
+ </li>
+ Autres Books:
+ <li class="" ng-repeat="i in books | filter:{ parent_visit: 'null', idArticle: 'null' }">
+ <div>
+ <a 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>
+ <button ng-click="cancel()" class="btn btn-warning">Cancel</button>
</div>
\ No newline at end of file
--- 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');
+ };
+ });
})();
--- 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