Merge pull request #37 from otlet/dev

Dev
PanOtlet · Dec 2, 2016 · 39be593 · 39be593
2 parents 4739227 + 51105eb
commit 39be593
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 89 deletions.
diff --git a/app/Resources/views/default/index.html.twig b/app/Resources/views/default/index.html.twig
@@ -110,10 +110,13 @@
                     </div>
                     {% if meme.url | slice(-4) == '.mp4' or meme.url | slice(-5) == '.webm' %}
                         <div class="embed-responsive embed-responsive-16by9">
-                            <video controls>
+                            <video id="promotedMemes" class="video-js embed-responsive-item" controls preload="auto"
+                                   data-setup="{}">
                                 <source src="{{ asset('assets/mem/') ~ meme.url }}" type="video/mp4"
                                         class="embed-responsive-item">
-                                Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                <p class="vjs-no-js">
+                                    Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                </p>
                             </video>
                         </div>
                     {% else %}
@@ -200,10 +203,16 @@
     </div>
 {% endblock %}
 
+{% block stylesheets %}
+    {{  parent() }}
+    <link href="http://vjs.zencdn.net/5.12.6/video-js.css" rel="stylesheet">
+{% endblock %}
+
 {% block javascripts %}
     {{ parent() }}
     <script src="{{ asset('assets/js/stream.js') }}"></script>
     <script src="{{ asset('assets/js/ads.js') }}"></script>
+    <script src="http://vjs.zencdn.net/5.12.6/video.js"></script>
     <script src="https://apis.google.com/js/platform.js"></script>
     <script>
         var stream = new Stream('{{ url("api.stream") }}', 'dd80eugsisvxdq2h689e6m8e3tqqzuw');

diff --git a/app/Resources/views/meme/index.html.twig b/app/Resources/views/meme/index.html.twig
@@ -58,10 +58,13 @@
                                 </div>
                                 <div class="m-img gif">
                                     <div class="embed-responsive embed-responsive-16by9 shadow">
-                                        <video controls>
+                                        <video id="promotedMemes" class="video-js embed-responsive-item" controls preload="auto"
+                                               data-setup="{}">
                                             <source src="{{ asset('assets/mem/') ~ mem.url }}" type="video/mp4"
                                                     class="embed-responsive-item">
-                                            Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                            <p class="vjs-no-js">
+                                                Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                            </p>
                                         </video>
                                     </div>
                                 </div>
@@ -135,4 +138,14 @@
             </div>
         </div>
     </div>
+{% endblock %}
+
+{% block stylesheets %}
+    {{  parent() }}
+    <link href="http://vjs.zencdn.net/5.12.6/video-js.css" rel="stylesheet">
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script src="http://vjs.zencdn.net/5.12.6/video.js"></script>
 {% endblock %}
diff --git a/app/Resources/views/meme/mem.html.twig b/app/Resources/views/meme/mem.html.twig
@@ -23,10 +23,13 @@
                     </div>
                     {% if mem.url | slice(-4) == '.mp4' or mem.url | slice(-5) == '.webm' %}
                         <div class="embed-responsive embed-responsive-16by9 shadow">
-                            <video controls>
+                            <video id="promotedMemes" class="video-js embed-responsive-item" controls preload="auto"
+                                   data-setup="{}">
                                 <source src="{{ asset('assets/mem/') ~ mem.url }}" type="video/mp4"
                                         class="embed-responsive-item">
-                                Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                <p class="vjs-no-js">
+                                    Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                </p>
                             </video>
                         </div>
                     {% else %}
@@ -60,4 +63,14 @@
             </div>
         </div>
     </div>
+{% endblock %}
+
+{% block stylesheets %}
+    {{  parent() }}
+    <link href="http://vjs.zencdn.net/5.12.6/video-js.css" rel="stylesheet">
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script src="http://vjs.zencdn.net/5.12.6/video.js"></script>
 {% endblock %}
diff --git a/app/Resources/views/meme/wait.html.twig b/app/Resources/views/meme/wait.html.twig
@@ -51,10 +51,13 @@
                                 </div>
                                 <div class="m-img gif">
                                     <div class="embed-responsive embed-responsive-16by9 shadow">
-                                        <video controls>
+                                        <video id="promotedMemes" class="video-js embed-responsive-item" controls preload="auto"
+                                               data-setup="{}">
                                             <source src="{{ asset('assets/mem/') ~ mem.url }}" type="video/mp4"
                                                     class="embed-responsive-item">
-                                            Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                            <p class="vjs-no-js">
+                                                Masz kiepską przeglądarkę! Użyj GOOGLE CHROME!
+                                            </p>
                                         </video>
                                     </div>
                                 </div>
@@ -114,4 +117,14 @@
             </div>
         </div>
     </div>
+{% endblock %}
+
+{% block stylesheets %}
+    {{  parent() }}
+    <link href="http://vjs.zencdn.net/5.12.6/video-js.css" rel="stylesheet">
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+    <script src="http://vjs.zencdn.net/5.12.6/video.js"></script>
 {% endblock %}
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
     },
     "require": {
         "php": ">=5.5.9",
-        "symfony/symfony": "3.1.*",
+        "symfony/symfony": "3.2.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",