Merge branch 'schools' of github.com:moby18/volleyball.ua into schools

moby18 · Sep 4, 2017 · b1a436f · b1a436f
2 parents e33c8c6 + 36976fe
commit b1a436f
Show file tree

Hide file tree

Showing 69 changed files with 7,176 additions and 5,830 deletions.
diff --git a/app/Resources/translations/messages.ru.yml b/app/Resources/translations/messages.ru.yml
@@ -8,12 +8,15 @@ user:
 News: Новости
 Tournaments: Турниры
 Contact Us: Контакты
+Advertising: Реклама
 
 # Texts
 post-item:
   post-info:
     icon-images: Фото внутри
     icon-videos: Видео внутри
+    icon-vu: volleyball.ua
+    icon-advert: Реклама
     icon-hits: Просмотров
     source: Источник
 

diff --git a/app/Resources/translations/messages.uk.yml b/app/Resources/translations/messages.uk.yml
@@ -8,12 +8,15 @@ user:
 News: Новини
 Tournaments: Турніри
 Contact Us: Контакти
+Advertising: Реклама
 
 # Texts
 post-item:
   post-info:
     icon-images: Фото всередині
     icon-videos: Відео всередині
+    icon-vu: volleyball.ua
+    icon-advert: Реклама
     icon-hits: Переглядів
     source: Джерело
 

diff --git a/app/Resources/views/header.html.twig b/app/Resources/views/header.html.twig
@@ -1,7 +1,7 @@
 <header id="header" role="banner">
     <div class="collapse navbar-white" id="header-search-form">
         <div class="container">
-            <form class="navbar-form animated fadeInDown" action="{{ path('volley_face_search') }}">
+            <form class="navbar-form fadeInDown" action="{{ path('volley_face_search') }}">
                 <input type="search" id="s" name="s" value="{{ app.request.get('s','') }}" class="form-control" placeholder="{% trans %}search{% endtrans %}...">
                 {#<button type="submit" class="" title="Search"><i class="fa fa-search"></i></button>#}
             </form>
@@ -140,6 +140,7 @@
                             </div>
                         </li>
                         <li class=""><a href="{{ path("volley_face_contacts") }}">{% trans %}Contact Us{% endtrans %}</a></li>
+                        <li class=""><a href="{{ path("volley_face_advertising") }}">{% trans %}Advertising{% endtrans %}</a></li>
                     </ul>
 
                     <button type="button" class="navbar-btn btn-icon btn-circle navbar-right last  hidden-sm hidden-xs search-button" data-toggle="collapse" data-target="#header-search-form"><i class="fa fa-search"></i></button>

diff --git a/app/Resources/views/layout.html.twig b/app/Resources/views/layout.html.twig
@@ -47,8 +47,8 @@
         {#<meta name="theme-color" content="#1c1b29">#}
 
         <!-- Fonts -->
-        <link href="{{ asset('bundles/volleyface/bower_components/components-font-awesome/css/font-awesome.min.css') }}"
-              rel="stylesheet" type="text/css">
+        {#<link href="{{ asset('bundles/volleyface/bower_components/components-font-awesome/css/font-awesome.min.css') }}"#}
+              {#rel="stylesheet" type="text/css">#}
 
         {% block facebook_meta %}
             <meta property="og:site_name" content="{{ setting.siteName|default('Волейбол в Україні - volleyball.ua') }}"/>
@@ -83,17 +83,17 @@
 
     <!-- Bootstrap Core CSS -->
     {% block styles %}
-        <link href="{{ asset('css/style.css') }}?v=10" rel="stylesheet" type='text/css'>
+        <link href="{{ asset('css/style.css') }}?v=14" rel="stylesheet" type='text/css'>
         <!--[if lt IE 9]>
         <link href="{{ asset(' css/style_ie.css') }}" rel="stylesheet" type='text/css'>
         <![endif]-->
     {% endblock %}
 
     {% block head_scripts %}
-        <script src="{{ asset('js/script_header.js') }}?v=10" type="text/javascript"></script>
+        {#<script src="{{ asset('js/script_header.js') }}?v=14" type="text/javascript"></script>#}
         <!-- IE8 support for HTML5 elements and media queries -->
         <!--[if lt IE 9]>
-        <script src="{{ asset('js/script_ie.js') }}" type="text/javascript"></script>
+        <script src="{{ asset('js/script_ie.js') }}" type="text/javascript" async defer></script>
         <![endif]-->
 
         <!-- Advert page Level advertising -->
@@ -313,16 +313,22 @@
 <!-- /.container -->
 
 {% block scripts %}
-    <script type="text/javascript" src="{{ asset('js/script_footer.js') }}?v=10"></script>
+    <script type="text/javascript" src="{{ asset('js/script_footer.js') }}?v=14"></script>
 
-    <script type="text/javascript" src="{{ asset('js/custom/modal_social.js') }}?v=10" ></script>
+    <script type="text/javascript" src="{{ asset('js/custom/modal_social.js') }}?v=14" async defer></script>
+
+    <script>
+      jQuery("#birthdayCarousel").carousel({
+        interval: 5000
+      });
+    </script>
 {% endblock %}
 
 <!-- Modal social -->
 {% include 'VolleyFaceBundle:Default/includes:modal_social.html.twig' with {} %}
 
 <!-- Modal advertising -->
-{% include 'VolleyFaceBundle:Default/includes:onmediads.html.twig' with {} %}
+{#{% include 'VolleyFaceBundle:Default/includes:onmediads.html.twig' with {} %}#}
 
 </body>
 </html>
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -187,6 +187,13 @@ liip_imagine:
             quality: 90
             filters:
                 thumbnail: { size: [190, 270], mode: outbound }
+        player_birthday:
+            quality: 90
+            filters:
+                relative_resize: { widen: 370 }
+                crop:
+                  size: [ 370, 300 ]
+                  start: [ 0, 0 ]
 
 
 knp_paginator:

diff --git a/bower.json b/bower.json
@@ -27,6 +27,7 @@
     "mjolnic-bootstrap-colorpicker": "bootstrap-colorpicker#^2.3.3",
     "owl.carousel": "owl-carousel2#^2.1.6",
     "jquery.cookie": "https://github.com/carhartl/jquery-cookie.git#^1.4.1",
-    "select2-bootstrap-theme": "^0.1.0-beta.9"
+    "select2-bootstrap-theme": "^0.1.0-beta.9",
+    "CGWin": "[email protected]:SaneMethod/CGWin.git"
   }
 }