From acc697740c15906bf965a88839197e26fb32bc75 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Wed, 21 Oct 2015 13:18:01 +0300 Subject: [PATCH] favicon. js fix --- zsite/static/imgs/favicon.png | Bin 0 -> 1032 bytes zsite/static/imgs/favicon.svg | 7 +++++++ zsite/static/js/app.js | 4 ++-- zsite/static/js/forms.js | 8 ++++---- zsite/static/js/nice.js | 4 ++-- zsite/templates/base.html | 3 +++ 6 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 zsite/static/imgs/favicon.png create mode 100644 zsite/static/imgs/favicon.svg diff --git a/zsite/static/imgs/favicon.png b/zsite/static/imgs/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1d607bbd76a595567092de2a8a6e0b26b78d35 GIT binary patch literal 1032 zcmV+j1o!)iP)Px&!bwCyRCodHnn{cdQ5?p{z6Tlm+6QZb0~f@>gb*AoCkc_^;6TK|9!uhe5F%V8 zbCK8*4wf+&u}2UG5`tLfU~I7)``CV8(%q?ax~r?EtEarb{*qs+y6V+?@B7!QSFhgd zva*tj7J=^Myc}xaC47XVFauhENj1mSG?39B@FxdPIKBqDf(gm^0=NgcOlLd(iS#?5 z2RN$=YJMBC84P+%f!G4hwTOiU8qW;SEAm?e&A_{?2TAQ`4wvCg^oRCpx&HzBCm%yeJ4wxcIMCwE&@>-~^vF39hLPCCv~X$_eV zg$%-X(hts(m$Qd7+|@fi$emXj4Ux@BA3#9@aEEkli|JlXG7dcmP^jJ<^FU*YqA9Kb z3<%(89clFDFee4Q7W^K8YR)_JMHu!D&CFx|1?M%LW>Rf%rH;+-?oT)AJZWlM9`jX} z%}>Of-{^HW4ebhGUcu3v zVz1;iW;RQ4lJCxY&z~W^9v2g;z(r$biXU;^DrmBmqGAj;6BxJw<O)w6xgel0wN=kQNR0lfs?rri|#*C#7s1tU2NUcY5 zMFBxr%e5w?1=X-E;TYFM*{8)C$T1-UaFz7xSIlTQPJ*_8^Q2X0Yf6>42@(MPAv3n2 zZ?Ph-SEW{j`~slK)y-h$na4|7+u8Foug~DA>D0z{v>xbZzMAtIV40Je{T|3={vGEk z!K8ZP%5M_o1n2vhbdIUZb2F{>o;1pWeKAGdJ+tQ7tL0000 + + + + + + \ No newline at end of file diff --git a/zsite/static/js/app.js b/zsite/static/js/app.js index cca971d..f83f2c3 100644 --- a/zsite/static/js/app.js +++ b/zsite/static/js/app.js @@ -31,6 +31,6 @@ angular.module('zuykov') // GetAdj(6,'свежее', 'свежих') // Вернет «свежих» }]) -.controller('TabsCtrl', function ($scope, $log) { -}) +.controller('TabsCtrl', ['$scope', function ($scope) { +}]) ; \ No newline at end of file diff --git a/zsite/static/js/forms.js b/zsite/static/js/forms.js index 7f93aeb..ce4bfae 100644 --- a/zsite/static/js/forms.js +++ b/zsite/static/js/forms.js @@ -1,7 +1,7 @@ angular.module('zuykov') -.controller('ModalFormCtrl', function ($scope, $modal, $log) { +.controller('ModalFormCtrl', ['$scope', '$modal', function ($scope, $modal) { $scope.items = ['item1', 'item2', 'item3']; @@ -32,11 +32,11 @@ angular.module('zuykov') $scope.animationsEnabled = !$scope.animationsEnabled; }; -}) +}]) // Please note that $modalInstance represents a modal window (instance) dependency. // It is not the same as the $modal service used above. -.controller('ModalFormInstanceCtrl', function ($scope, $modalInstance, items, $log, $timeout) { +.controller('ModalFormInstanceCtrl', ['$scope', '$modalInstance', 'items', '$timeout', function ($scope, $modalInstance, items, $timeout) { $timeout(function () { @@ -51,4 +51,4 @@ angular.module('zuykov') $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; -}); \ No newline at end of file +}]); \ No newline at end of file diff --git a/zsite/static/js/nice.js b/zsite/static/js/nice.js index 7fcf4fd..3271836 100644 --- a/zsite/static/js/nice.js +++ b/zsite/static/js/nice.js @@ -1,7 +1,7 @@ angular.module('zuykov') -.controller('NiceCtrl', function ($scope, $rootScope, $log) { +.controller('NiceCtrl', ['$scope', '$rootScope', function ($scope, $rootScope) { $scope.nice = [ { id: 1, @@ -643,4 +643,4 @@ angular.module('zuykov') }; -}); \ No newline at end of file +}]); \ No newline at end of file diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 02ce72e..dc433b4 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -12,6 +12,9 @@ {% javascript 'main' %} {% render_block "css" %} + + +