favicon. js fix

10 years ago · acc697740c
parent b0d62289e0
commit acc697740c
6 changed files with 18 additions and 8 deletions
--- a/zsite/static/imgs/favicon.png
+++ b/zsite/static/imgs/favicon.png
--- a/zsite/static/imgs/favicon.svg
+++ b/zsite/static/imgs/favicon.svg
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="21px" height="31px" viewBox="0 0 21 31" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M1.47867909,2.31304052 C1.69026281,1.88546935 5.47856544,-0.0582917287 6.9341155,0.00134319863 C7.66203083,0.0637910943 15.3009326,3.28548366 14.9378168,5.59408672 C14.5699305,7.90353367 9.95746162,12.0149681 10.8133374,13.7359421 C12.2077134,16.5323138 18.6352002,13.9182224 20.0899084,16.7145942 C21.5454585,19.5109659 16.9383212,22.8513658 13.1194315,25.2817704 C9.63699927,27.4969829 1.17505365,31.1462466 0.871428207,30.9954715 C0.571170146,30.8427273 0.68958968,30.7507433 0.871428207,30.508828 C1.05466981,30.2691631 6.20956754,27.8334139 8.1474948,26.2564639 C10.0865445,24.6710749 13.089967,22.9723234 12.7229225,20.9385473 C12.0890132,17.3826742 2.5388426,20.3593572 2.90364211,17.6870373 C3.26647732,15.0135923 9.23291366,10.8186127 8.51033001,8.02449131 C7.84386936,5.44556199 2.75126816,4.31812431 1.720008,3.16340083 C1.26400861,2.64919023 1.26597291,2.73611095 1.47867909,2.31304052" id="logo" fill="#000000"></path>
+    </g>
+</svg>
--- 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) {
+}])
 ;
--- 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');
  };
-});
+}]);
--- 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')
    };


-});
+}]);
--- a/zsite/templates/base.html
+++ b/zsite/templates/base.html
@ -12,6 +12,9 @@
        {% javascript 'main' %}

        {% render_block "css" %}
+
+        <link rel="icon" type="image/svg+xml" href="/static/imgs/favicon.svg"/>
+        <link rel="alternate icon" type="image/png" href="/static/imgs/favicon.png"/>
    </head>
    <body ng-controller="MainCtrl">