From 900f1d4e33b5c7d3469a88c45912c29c51e1331b Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Thu, 9 Jul 2015 05:32:52 +0300 Subject: [PATCH] /album -> /gallery --- client/api/gallery.js | 2 +- client/app.js | 2 +- routes/gallery.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/api/gallery.js b/client/api/gallery.js index 12d90903..0016adbd 100644 --- a/client/api/gallery.js +++ b/client/api/gallery.js @@ -11,7 +11,7 @@ APIGallery.prototype.year = function(year) { }; APIGallery.prototype.album = function(year, course, album) { - var url = '/album/{year}/{course}/{album}' + var url = '/gallery/{year}/{course}/{album}' .replace('{year}', year) .replace('{course}', course) .replace('{album}', album); diff --git a/client/app.js b/client/app.js index 36d685f4..780fffc5 100644 --- a/client/app.js +++ b/client/app.js @@ -40,7 +40,7 @@ app.config(function ($locationProvider, $routeProvider) { title:"Работы учащихся" }, { - name: "/album/:year/:course/:album", + name: "/gallery/:year/:course/:album", templateUrl: "/views/gallery-album.html", controller: "AlbumPageController", title:"Работы учащихся" diff --git a/routes/gallery.js b/routes/gallery.js index 2c764ef9..544e8d88 100644 --- a/routes/gallery.js +++ b/routes/gallery.js @@ -41,7 +41,7 @@ module.exports = function (app) { } }))); - app.use(route.get("/album/:year/:course/:album", router.accepts({ + app.use(route.get("/gallery/:year/:course/:album", router.accepts({ "text/html": router.index(), "text/plain": router.index(), "application/json": function *(year, course, album) { @@ -65,7 +65,7 @@ module.exports = function (app) { function processAlbum(album) { return co(function *() { - album.url = '/album/{year}{course}{album}' + album.url = '/gallery/{year}{course}{album}' .replace('{year}', album.date.getFullYear()) .replace('{course}', album.course_uri) .replace('{album}', album.uri);