Merge branch 'feature/os2' into develop

CHANGELOG.md

@@ -1,4 +1,8 @@
-# itk-os2display/vimeo-bundle CHANGELOG
+# os2display/vimeo-bundle
+
+## 2.0.0
+
+* Renamed to os2display.
 
 ## 1.0.6
 

DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Itk\VimeoBundle\DependencyInjection;
+namespace Os2Display\VimeoBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -18,7 +18,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('itk_vimeo');
+        $rootNode = $treeBuilder->root('os2_display_vimeo');
 
         // Here you should define the parameters that are allowed to
         // configure your bundle. See the documentation linked above for

DependencyInjection/ItkVimeoExtension.php → DependencyInjection/Os2DisplayVimeoExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Itk\VimeoBundle\DependencyInjection;
+namespace Os2Display\VimeoBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
@@ -12,7 +12,7 @@
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
-class ItkVimeoExtension extends Extension
+class Os2DisplayVimeoExtension extends Extension
 {
     /**
      * {@inheritdoc}

Os2DisplayVimeoBundle.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Os2Display\VimeoBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class Os2DisplayVimeoBundle extends Bundle
+{
+}

README.md

@@ -1,7 +1,43 @@
-# itk-os2display/vimeo
+# os2display/vimeo
+
 Supplies a slide template for playing vimeo videos. This bundle uses Vimeo's js player: https://github.com/vimeo/player.js/
 
+## Installation
+
+Add the git repository to "repositories" in `composer.json`.
+
+<pre>
+"repositories": {
+    "os2display/vimeo-bundle": {
+      "type": "vcs",
+      "url": "https://github.com/os2display/vimeo-bundle"
+    },
+    ...
+}
+</pre>
+
+Require the bundle with composer.
+
+<pre>
+composer require os2display/vimeo-bundle
+</pre>
+
+Enable the bundle in `AppKernel.php`, by adding Os2DisplayVimeoBundle to $bundles.
+
+<pre>
+new Os2Display\VimeoBundle\Os2DisplayVimeoBundle()
+</pre>
+
+Run os2display:core:templates:load command to load the template in the installation.
+
+<pre>
+bin/console os2display:core:templates:load
+</pre>
+
+Enable the template in the administration.
+
 ## Ads and controls
+
 To avoid ads and video controls, the shared video has to come from a user
 that has disabled the options at vimeo.com. To do it yourself, you need to have
 at least a PLUS account (https://vimeo.com/plus).

Resources/config/services.yml

@@ -1,4 +1 @@
 services:
-#    itk_vimeo.example:
-#        class: Itk\VimeoBundle\Example
-#        arguments: [@service_id, "plain_value", %parameter%]

Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo-preview.html → Resources/public/templates/vimeo/slides/vimeo/vimeo-preview.html

@@ -1,4 +1,4 @@
-<div class="itk-vimeo" style="background-image: url('bundles/itkvimeo/templates/vimeo/slides/itk-vimeo/image/vimeo_bg.png'); background-size: cover;"
+<div class="vimeo" style="background-image: url('bundles/itkvimeo/templates/vimeo/slides/vimeo/image/vimeo_bg.png'); background-size: cover;"
      data-ng-style="{'width': theStyle.width, 'height': theStyle.height, 'font-size': theStyle.fontsize}">
   Vimeo id: {{ ikSlide.options.id }}
 </div>

Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.css → Resources/public/templates/vimeo/slides/vimeo/vimeo.css

@@ -1,15 +1,15 @@
-.itk-vimeo {
+.vimeo {
   position: relative;
   width: 100%;
   height: 100%;
 }
 
-.itk-vimeo-iframe-wrapper {
+.vimeo-iframe-wrapper {
   width: 100%;
   height: 100%;
 }
 
-.itk-vimeo-iframe-wrapper > iframe {
+.vimeo-iframe-wrapper > iframe {
   width: 100%;
   height: 100%;
 }

Resources/public/templates/vimeo/slides/vimeo/vimeo.html

@@ -0,0 +1,3 @@
+<div class="vimeo">
+  <div class="vimeo-iframe-wrapper js-vimeo--player-{{ikSlide.uniqueId}}"></div>
+</div>

Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.js → Resources/public/templates/vimeo/slides/vimeo/vimeo.js

@@ -29,7 +29,7 @@ if (!window.slideFunctions['itk-vimeo']) {
          *   The region object.
          */
         run: function runSlide (slide, region) {
-            region.itkLog.info('Running itk-vimeo slide: ' + slide.title);
+            region.itkLog.info('Running vimeo slide: ' + slide.title);
 
             // Wait fadeTime before start to account for fade in.
             region.$timeout(function () {
@@ -44,7 +44,7 @@ if (!window.slideFunctions['itk-vimeo']) {
                     loop: 0
                 };
 
-                var element = document.querySelector('.js-itk-vimeo--player-' + slide.uniqueId);
+                var element = document.querySelector('.js-vimeo--player-' + slide.uniqueId);
 
                 try {
                     // Initialize vimeo player.

Resources/public/templates/vimeo/slides/itk-vimeo/itk-vimeo.json → Resources/public/templates/vimeo/slides/vimeo/vimeo.json

@@ -6,13 +6,13 @@
   ],
   "type": "slide",
   "name": "Vimeo video",
-  "icon": "itk-vimeo.png",
+  "icon": "vimeo.png",
   "paths": {
-    "live": "itk-vimeo.html",
-    "edit": "itk-vimeo-preview.html",
-    "preview": "itk-vimeo-preview.html",
-    "css": "itk-vimeo.css",
-    "js": "bundles/itkvimeo/templates/vimeo/slides/itk-vimeo/itk-vimeo.js"
+    "live": "vimeo.html",
+    "edit": "vimeo-preview.html",
+    "preview": "vimeo-preview.html",
+    "css": "vimeo.css",
+    "js": "bundles/os2displayvimeo/templates/vimeo/slides/vimeo/vimeo.js"
   },
   "orientation": "landscape",
   "slide_type": "base",
@@ -29,7 +29,7 @@
   "tools": [
     {
       "name": "Vimeo",
-      "template": "bundles/itkvimeo/apps/toolsModule/itk-vimeo.html"
+      "template": "bundles/os2displayvimeo/apps/toolsModule/vimeo-tool.html"
     }
   ]
 }

composer.json

@@ -6,7 +6,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Itk\\VimeoBundle\\": ""
+            "Os2Display\\VimeoBundle\\": ""
         }
     }
 }