client/app/app.js
changeset 1 74bbdd739878
parent 0 cef349423167
child 2 36ccc573af9a
--- a/client/app/app.js	Wed Jun 11 01:26:59 2014 +0200
+++ b/client/app/app.js	Thu Oct 02 13:24:57 2014 +0200
@@ -1,7 +1,7 @@
 (function(){
   'use strict';
 
-  angular.module('ammico', [ 'ngRoute','ammicoHome', 'ammicoGallery', 'ammicoSlideshow', 'templates' ])
+  angular.module('ammico', [ 'ngRoute','ammicoHome', 'ammicoGallery', 'ammicoSlideshow', 'ammicoSearch', 'templates' ])
     .config(function($routeProvider) {
       $routeProvider.
         when('/', {
@@ -12,12 +12,24 @@
         controller: 'galleryCtrl',
         templateUrl: 'gallery/gallery.html'
       }).
-      when('/slideshow', {
+      when('/slideshow/', {
+          controller: 'slideshowCtrl',
+          templateUrl: 'slideshow/slideshow.html'
+        }).
+      when('/slideshow/:iSlide', {
         controller: 'slideshowCtrl',
         templateUrl: 'slideshow/slideshow.html'
       }).
+      when('/search/', {
+          controller: 'searchCtrl',
+          templateUrl: 'search/search.html'
+      }).
+      when('/search/:q', {
+          controller: 'searchCtrl',
+          templateUrl: 'search/search.html'
+      }).
       otherwise({
-        redirectTo: '/gallery'
+        redirectTo: '/'
       });
     })
     // .config(function ($routeProvider) {