From b0d62289e025aa75c7cb6ec8bfde80664ff4481e Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Wed, 21 Oct 2015 13:03:40 +0300
Subject: [PATCH] fix lalla

---
 app/conf/nginx.conf.template | 4 ++++
 zsite/static/js/app.js       | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/conf/nginx.conf.template b/app/conf/nginx.conf.template
index f144097..41c927c 100644
--- a/app/conf/nginx.conf.template
+++ b/app/conf/nginx.conf.template
@@ -15,6 +15,10 @@ server {
     
     location /static {
         alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/static;
+    }
+
+    location /media {
+        alias /home/%(SERVER_USERNAME)s/%(PROJECT_NAME)s/media;
 
     }
 
diff --git a/zsite/static/js/app.js b/zsite/static/js/app.js
index e32d7ed..cca971d 100644
--- a/zsite/static/js/app.js
+++ b/zsite/static/js/app.js
@@ -2,7 +2,7 @@ angular.module('zuykov', ['ui.bootstrap', 'tabs']);
 
 
 angular.module('zuykov')
-.controller('MainCtrl', function ($scope, $log) {
+.controller('MainCtrl', ['$scope', function ($scope) {
     $scope.GetNoun = function(number, one, two, five) {
         number = Math.abs(number);
         number %= 100;
@@ -29,8 +29,8 @@ angular.module('zuykov')
         return two;
     };
      // GetAdj(6,'свежее', 'свежих') // Вернет «свежих» 
+}])
 
-})
 .controller('TabsCtrl', function ($scope, $log) {
 })
 ;
\ No newline at end of file