# HG changeset patch # User rougeronj # Date 1428506675 -7200 # Node ID 5c8d95d96c58fe7c442d1973df02cafe1d9ff68f # Parent 57a60c21a059b2f21a0b7fc04a07c07b1db84d28 gulp copy-server to update the ammico app on the server diff -r 57a60c21a059 -r 5c8d95d96c58 server/ammico/static/ammico/js/app.js --- a/server/ammico/static/ammico/js/app.js Wed Apr 08 17:16:31 2015 +0200 +++ b/server/ammico/static/ammico/js/app.js Wed Apr 08 17:24:35 2015 +0200 @@ -308,7 +308,7 @@ controller: 'searchCtrl' }); }) - .controller('searchCtrl', function($scope, $location, $routeParams, searchApi, $modal){ + .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(); @@ -325,7 +325,7 @@ book: idBook, idInventory: $scope.results.hits[index].metas_dict.inventorynumber }; - searchApi.listSlides.save(newSlide); + ammicoApi.listSlides.save(newSlide); }); }; }) diff -r 57a60c21a059 -r 5c8d95d96c58 server/ammico/static/ammico/js/app.min.js --- a/server/ammico/static/ammico/js/app.min.js Wed Apr 08 17:16:31 2015 +0200 +++ b/server/ammico/static/ammico/js/app.min.js Wed Apr 08 17:24:35 2015 +0200 @@ -1,1 +1,1 @@ -!function(){"use strict";angular.module("ammico",["ngRoute","ammicoHome","ammicoBooks","ammicoSlides","ammicoSlideshow","ammicoSearch","ammicoAuth","templates"]).config(function(o){o.when("/",{controller:"homeCtrl",templateUrl:"home/home.html",authRequired:!1}).when("/books",{controller:"booksCtrl",templateUrl:"books/books.html",authRequired:!0}).when("/books/:idBook",{controller:"bookCtrl",templateUrl:"books/book.html",authRequired:!0}).when("/slide/:idSlide",{controller:"slidesCtrl",templateUrl:"slides/slides.html",authRequired:!0}).when("/slideshow/",{controller:"slideshowCtrl",templateUrl:"slideshow/slideshow.html",authRequired:!0}).when("/slideshow/:iSlide",{controller:"slideshowCtrl",templateUrl:"slideshow/slideshow.html",authRequired:!0}).when("/search/:q",{controller:"searchCtrl",templateUrl:"search/search.html",authRequired:!0}).when("/auth/:action",{controller:"authCtrl",templateUrl:"home/home.html",authRequired:!1}).otherwise({redirectTo:"/"})}).run(function(o,e,t,s){o.globals={},t.sessionStorage.token&&(o.globals.userLogged=!0,s.defaults.headers.common.Authorization="Token "+t.sessionStorage.token),o.$on("$routeChangeStart",function(t,s){s.authRequired&&!o.globals.userLogged&&e.path("/auth/login")})}).service("searchApi",function(o,e){this.searchResource=function(t){return o(e.urls.searchUrl,{callback:"JSON_CALLBACK"},{getJsonp:{method:"JSONP",params:t,isArray:!1,transformResponse:function(o){for(var e=o.hits.length,t=0;e>t;t++){var s=o.hits[t].metas.length;o.hits[t].metas_dict={};for(var i=0;s>i;i++)"undefined"==typeof o.hits[t].metas[i].images?o.hits[t].metas_dict[o.hits[t].metas[i].name]=o.hits[t].metas[i].value:o.hits[t].metas_dict.images=o.hits[t].metas[i].images[0].value}return o}}})}}).service("ammicoApi",function(o,e,t){this.listBooks=o(e.urls.ammicoUrl+"/books"),this.book=o(e.urls.ammicoUrl+"/books/:idBook",{idBook:"@idBook"}),this.order=o(e.urls.ammicoUrl+"/books/:idBook/order",{idBook:"@idBook"}),this.booksSlides=o(e.urls.ammicoUrl+"/books/:idBook/slides",{idBook:"@idBook"}),this.listSlides=o(e.urls.ammicoUrl+"/slides"),this.slide=o(e.urls.ammicoUrl+"/slides/:idSlide",{idSlide:"@idSlide"}),this.sanitizeUrls=function(o){return o.details.audio=t.trustAsResourceUrl(o.details.audio),o.details.video=t.trustAsResourceUrl(o.details.video),o.audio=t.trustAsResourceUrl(o.audio),o.video=t.trustAsResourceUrl(o.video),o}}).service("authApi",function(o,e){this.login=o(e.urls.ammicoUrl+"/auth/api-token-auth"),this.logout=o(e.urls.ammicoUrl+"/auth/logout"),this.user=o(e.urls.ammicoUrl+"/auth/user"),this.test=o(e.urls.ammicoUrl+"/auth/auth")})}(),function(){"use strict";angular.module("ammico").controller("routeClassCtrl",function(o,e){o.isActive=function(o){return o===e.path()}})}(),function(){"use strict";angular.module("ammicoAuth",["ngRoute"]).controller("authCtrl",function(o,e,t,s){s.open({templateUrl:"auth/"+t.action+"_modal.html",controller:"auth"+t.action+"Ctrl"}).result.then(function(e){o.path(e)},function(){o.path("/")})}).controller("authloginCtrl",function(o,e,t,s,i,l){e.login=function(){t.login.save({username:e.username,password:e.password},function(e){l.globals.userLogged=!0,s.sessionStorage.token=e.token,i.defaults.headers.common.Authorization="Token "+s.sessionStorage.token,o.close("/books")})},e.register=function(){o.close("/auth/register")},e.cancel=function(){o.close("/")}}).controller("authlogoutCtrl",function(o,e,t,s,i){delete t.sessionStorage.token,i.globals.userLogged=!1,delete s.defaults.headers.common.Authorization,e.cancel=function(){o.close("/")}}).controller("authregisterCtrl",function(o,e,t){o.register=function(){t.user.save({username:o.username,email:o.email,password:o.password},function(){e.close("/auth/login")})},o.back=function(){e.close("/auth/login")}})}(),function(){"use strict";angular.module("ammicoBooks",["ngRoute","ui.sortable"]).controller("booksCtrl",function(o,e,t,s){o.books=s.listBooks.query({format:"json"},function(o){o.sort(function(o,e){return o.datee.orderIndex})}),o.sortableOptions={stop:function(){var s=o.slides.map(function(o){return o.id});e.order.save({idBook:t.idBook},{order:s})}},o.deleteItem=function(t){t>=0&&ts;){if(o[s].name===e)return i=!0,o[s].value;s++}return""}})}(),function(){"use strict";angular.module("ammicoSearch",["ngResource","ngRoute","ui.bootstrap"]).config(function(o){o.when("/",{templateUrl:"search/search.html",controller:"searchCtrl"})}).controller("searchCtrl",function(o,e,t,s,i){o.q=t.q||"",o.results=s.searchResource({q:o.q,of:"json",synthesis:"false",nresults:"10",callback:"JSON_CALLBACK"}).getJsonp(),o.toggleModal=function(e){var t=i.open({templateUrl:"search/modal.html",controller:"ModalInstanceCtrl",size:"sm"});t.result.then(function(t){var i={book:t,idInventory:o.results.hits[e].metas_dict.inventorynumber};s.listSlides.save(i)})}}).controller("ModalInstanceCtrl",function(o,e,t){o.books=e.listBooks.query({format:"json"}),o.addToBook=function(o){t.close(o)},o.cancel=function(){t.dismiss("cancel")}})}(),function(){"use strict";angular.module("ammicoSlides",["ngResource","ngRoute"]).controller("slidesCtrl",function(o,e,t){o.slide=t.slide.get({idSlide:e.idSlide,format:"json"},function(o){o=t.sanitizeUrls(o)})}).directive("slideEditor",function(){return{restrict:"AE",replace:!0,scope:!1,templateUrl:"slides/data_editor.html",controller:function(o){o.slidesave=function(){if("string"==typeof o.slide.tags){o.slide.tags=o.slide.tags.split(",");for(var e=o.slide.tags.length-1;e>=0;e--)o.slide.tags[e]=o.slide.tags[e].trim()}o.slide.editMode=!1,o.slide.$save({idSlide:o.slide.id,format:"json"})},o.doubleClick=function(){o.slide.editMode=!0}}}})}(),function(){"use strict";angular.module("ammicoSlideshow",["ngResource","ngRoute","ui.bootstrap"]).controller("slideshowCtrl",function(o,e,t){o.slideshow=e.booksSlides.query({idBook:t.iSlide,format:"json"},function(o){o=e.sanitizeUrls(o)}),o.book=e.book.get({idBook:t.iSlide,format:"json"})})}(); \ No newline at end of file +!function(){"use strict";angular.module("ammico",["ngRoute","ammicoHome","ammicoBooks","ammicoSlides","ammicoSlideshow","ammicoSearch","ammicoAuth","templates"]).config(function(o){o.when("/",{controller:"homeCtrl",templateUrl:"home/home.html",authRequired:!1}).when("/books",{controller:"booksCtrl",templateUrl:"books/books.html",authRequired:!0}).when("/books/:idBook",{controller:"bookCtrl",templateUrl:"books/book.html",authRequired:!0}).when("/slide/:idSlide",{controller:"slidesCtrl",templateUrl:"slides/slides.html",authRequired:!0}).when("/slideshow/",{controller:"slideshowCtrl",templateUrl:"slideshow/slideshow.html",authRequired:!0}).when("/slideshow/:iSlide",{controller:"slideshowCtrl",templateUrl:"slideshow/slideshow.html",authRequired:!0}).when("/search/:q",{controller:"searchCtrl",templateUrl:"search/search.html",authRequired:!0}).when("/auth/:action",{controller:"authCtrl",templateUrl:"home/home.html",authRequired:!1}).otherwise({redirectTo:"/"})}).run(function(o,e,t,s){o.globals={},t.sessionStorage.token&&(o.globals.userLogged=!0,s.defaults.headers.common.Authorization="Token "+t.sessionStorage.token),o.$on("$routeChangeStart",function(t,s){s.authRequired&&!o.globals.userLogged&&e.path("/auth/login")})}).service("searchApi",function(o,e){this.searchResource=function(t){return o(e.urls.searchUrl,{callback:"JSON_CALLBACK"},{getJsonp:{method:"JSONP",params:t,isArray:!1,transformResponse:function(o){for(var e=o.hits.length,t=0;e>t;t++){var s=o.hits[t].metas.length;o.hits[t].metas_dict={};for(var i=0;s>i;i++)"undefined"==typeof o.hits[t].metas[i].images?o.hits[t].metas_dict[o.hits[t].metas[i].name]=o.hits[t].metas[i].value:o.hits[t].metas_dict.images=o.hits[t].metas[i].images[0].value}return o}}})}}).service("ammicoApi",function(o,e,t){this.listBooks=o(e.urls.ammicoUrl+"/books"),this.book=o(e.urls.ammicoUrl+"/books/:idBook",{idBook:"@idBook"}),this.order=o(e.urls.ammicoUrl+"/books/:idBook/order",{idBook:"@idBook"}),this.booksSlides=o(e.urls.ammicoUrl+"/books/:idBook/slides",{idBook:"@idBook"}),this.listSlides=o(e.urls.ammicoUrl+"/slides"),this.slide=o(e.urls.ammicoUrl+"/slides/:idSlide",{idSlide:"@idSlide"}),this.sanitizeUrls=function(o){return o.details.audio=t.trustAsResourceUrl(o.details.audio),o.details.video=t.trustAsResourceUrl(o.details.video),o.audio=t.trustAsResourceUrl(o.audio),o.video=t.trustAsResourceUrl(o.video),o}}).service("authApi",function(o,e){this.login=o(e.urls.ammicoUrl+"/auth/api-token-auth"),this.logout=o(e.urls.ammicoUrl+"/auth/logout"),this.user=o(e.urls.ammicoUrl+"/auth/user"),this.test=o(e.urls.ammicoUrl+"/auth/auth")})}(),function(){"use strict";angular.module("ammico").controller("routeClassCtrl",function(o,e){o.isActive=function(o){return o===e.path()}})}(),function(){"use strict";angular.module("ammicoAuth",["ngRoute"]).controller("authCtrl",function(o,e,t,s){s.open({templateUrl:"auth/"+t.action+"_modal.html",controller:"auth"+t.action+"Ctrl"}).result.then(function(e){o.path(e)},function(){o.path("/")})}).controller("authloginCtrl",function(o,e,t,s,i,l){e.login=function(){t.login.save({username:e.username,password:e.password},function(e){l.globals.userLogged=!0,s.sessionStorage.token=e.token,i.defaults.headers.common.Authorization="Token "+s.sessionStorage.token,o.close("/books")})},e.register=function(){o.close("/auth/register")},e.cancel=function(){o.close("/")}}).controller("authlogoutCtrl",function(o,e,t,s,i){delete t.sessionStorage.token,i.globals.userLogged=!1,delete s.defaults.headers.common.Authorization,e.cancel=function(){o.close("/")}}).controller("authregisterCtrl",function(o,e,t){o.register=function(){t.user.save({username:o.username,email:o.email,password:o.password},function(){e.close("/auth/login")})},o.back=function(){e.close("/auth/login")}})}(),function(){"use strict";angular.module("ammicoBooks",["ngRoute","ui.sortable"]).controller("booksCtrl",function(o,e,t,s){o.books=s.listBooks.query({format:"json"},function(o){o.sort(function(o,e){return o.datee.orderIndex})}),o.sortableOptions={stop:function(){var s=o.slides.map(function(o){return o.id});e.order.save({idBook:t.idBook},{order:s})}},o.deleteItem=function(t){t>=0&&ts;){if(o[s].name===e)return i=!0,o[s].value;s++}return""}})}(),function(){"use strict";angular.module("ammicoSearch",["ngResource","ngRoute","ui.bootstrap"]).config(function(o){o.when("/",{templateUrl:"search/search.html",controller:"searchCtrl"})}).controller("searchCtrl",function(o,e,t,s,i,l){o.q=t.q||"",o.results=s.searchResource({q:o.q,of:"json",synthesis:"false",nresults:"10",callback:"JSON_CALLBACK"}).getJsonp(),o.toggleModal=function(e){var t=l.open({templateUrl:"search/modal.html",controller:"ModalInstanceCtrl",size:"sm"});t.result.then(function(t){var s={book:t,idInventory:o.results.hits[e].metas_dict.inventorynumber};i.listSlides.save(s)})}}).controller("ModalInstanceCtrl",function(o,e,t){o.books=e.listBooks.query({format:"json"}),o.addToBook=function(o){t.close(o)},o.cancel=function(){t.dismiss("cancel")}})}(),function(){"use strict";angular.module("ammicoSlides",["ngResource","ngRoute"]).controller("slidesCtrl",function(o,e,t){o.slide=t.slide.get({idSlide:e.idSlide,format:"json"},function(o){o=t.sanitizeUrls(o)})}).directive("slideEditor",function(){return{restrict:"AE",replace:!0,scope:!1,templateUrl:"slides/data_editor.html",controller:function(o){o.slidesave=function(){if("string"==typeof o.slide.tags){o.slide.tags=o.slide.tags.split(",");for(var e=o.slide.tags.length-1;e>=0;e--)o.slide.tags[e]=o.slide.tags[e].trim()}o.slide.editMode=!1,o.slide.$save({idSlide:o.slide.id,format:"json"})},o.doubleClick=function(){o.slide.editMode=!0}}}})}(),function(){"use strict";angular.module("ammicoSlideshow",["ngResource","ngRoute","ui.bootstrap"]).controller("slideshowCtrl",function(o,e,t){o.slideshow=e.booksSlides.query({idBook:t.iSlide,format:"json"},function(o){o=e.sanitizeUrls(o)}),o.book=e.book.get({idBook:t.iSlide,format:"json"})})}(); \ No newline at end of file diff -r 57a60c21a059 -r 5c8d95d96c58 server/ammico/static/ammico/js/templates.js --- a/server/ammico/static/ammico/js/templates.js Wed Apr 08 17:16:31 2015 +0200 +++ b/server/ammico/static/ammico/js/templates.js Wed Apr 08 17:24:35 2015 +0200 @@ -2,11 +2,11 @@ $templateCache.put("auth/logout_modal.html","
\n

Deconnection

\n
\n\n
\n

Vous n\'est plus connecté

\n
\n\n
\n \n
"); $templateCache.put("auth/register_modal.html","
\n

Créer un Compte

\n
\n\n
\n
\n \n \n \n \n
\n \n
\n \n \n
\n
"); $templateCache.put("books/add_modal.html","
\n

Ajouter un nouveau Book

\n
\n\n
\n
\n \n
\n \n
\n \n \n
\n
"); -$templateCache.put("books/book.html","

Books {{idBook}} :

\n\n
    \n
  • \n
    \n \n

    {{ i.details.title }}

    \n
    \n \n \n
    \n
    \n
    • \n
\n"); -$templateCache.put("books/books.html","

Liste des books :

\n\n\n \n \n {{ parentBook.title }}\n \n \n \n \n
\n {{ childBook.title }}\n \n
\n \n \n \n Autres Books\n \n
\n {{ childBook.title }}\n \n
\n \n\n\n"); +$templateCache.put("books/book.html","

Books {{idBook}} :

\n\n
    \n
  • \n
    \n \n

    {{ i.details.title }}

    \n
    \n \n \n
    \n
    \n
    • \n
\n"); +$templateCache.put("books/books.html","

Liste des books :

\n\n\n \n \n {{ parentBook.title }}\n \n \n \n \n
\n {{ childBook.title }}\n \n
\n \n \n \n Autres Books\n \n
\n {{ childBook.title }}\n \n
\n \n\n\n"); $templateCache.put("home/home.html","

Ammico Application

\n\n

\n Le Lorem Ipsum est simplement du faux texte employé dans la composition \n et la mise en page avant impression. Le Lorem Ipsum est le faux texte standard de \n l\'imprimerie depuis les années 1500, quand un peintre anonyme assembla ensemble des \n morceaux de texte pour réaliser un livre spécimen de polices de texte. Il n\'a pas fait \n que survivre cinq siècles, mais s\'est aussi adapté à la bureautique informatique, sans \n que son contenu n\'en soit modifié. Il a été popularisé dans les années 1960 grâce à la \n vente de feuilles Letraset contenant des passages du Lorem Ipsum, et, plus récemment,\n par son inclusion dans des applications de mise en page de texte, comme Aldus PageMaker.\n

"); -$templateCache.put("search/modal.html","
\n

A quel Book ajouter cet element ?

\n
\n\n
\n \n
\n\n
\n \n
"); +$templateCache.put("search/modal.html","
\n

A quel Book ajouter cet element ?

\n
\n\n
\n \n
\n\n
\n \n
"); $templateCache.put("search/search.html","

\n Recherche : {{ q }}\n

\n

0\">{{ results.nhits }} résultat(s)

\n\n
0\">\n
\n
\n \n
\n
\n

\n Nom : {{ h.metas_dict.name }}\n

\n

\n Description : {{ h.metas_dict.description }}\n

\n
\n

\n Classification : {{ h.metas_dict.classification }}\n

\n

\n Propriétaire actuel : {{ h.metas_dict.currentcustody }}\n

\n

\n Ancien propriétaire : {{ h.metas_dict.formercustody }}\n

\n

\n Mesures : {{ h.metas_dict.measures }}\n

\n

\n Acteurs : {{ h.metas_dict.actors }}\n

\n

\n Lieux : {{ h.metas_dict.places }}\n

\n
\n
\n
\n \n \n
\n
\n
\n"); $templateCache.put("slides/data_editor.html","
\n
\n

{{slide.title}}

\n

{{slide.description}}

\n

{{slide.comment}}

\n

{{slide.tags.join(\', \')}}

\n
\n
\n\n
\n \n \n \n \n
\n
\n
"); -$templateCache.put("slides/slides.html","
\n
\n

{{slide.title}} - {{slide.details.title}}

\n
\n
\n «Retour galerie\n Suivant»\n «Precedents\n
\n
\n
\n \n

\n \n \n
\n
\n \n
\n
\n

\n Titre : {{slide.details.title}}\n

\n

\n Description : {{slide.details.description}}\n

\n
\n
\n
\n
\n"); +$templateCache.put("slides/slides.html","
\n
\n

{{slide.title}} - {{slide.details.title}}

\n
\n
\n «Retour galerie\n Suivant»\n «Precedents\n
\n
\n
\n
\n \n
{{slide.details.captions[$index]}}
\n
\n \n \n
\n
\n \n
\n
\n

Titre : {{slide.details.title}}

\n

Description : {{slide.details.description}}

\n

Numéro d\'Inventaire : {{slide.details.idInventory}}

\n
\n
\n
\n
\n"); $templateCache.put("slideshow/slideshow.html","
\n
\n

Diaporama - {{book.title}}

\n
\n
\n \n \n
\n
\n \n \n \n
\n
\n
\n

{{slide.title}}

\n

{{slide.description}}

\n

{{slide.comment}}

\n

\n {{slide.tags.join(\', \')}}\n

\n
\n
\n
\n

\n Titre : {{slide.details.title}}\n

\n

\n Description : {{slide.details.captionImg}}\n

\n
\n
\n
\n \n \n
    \n
  • \n
    \n \n

    {{ slide.details.title }}

    \n
    \n
    • \n
\n
\n
\n");}]); \ No newline at end of file