Evolution #604: helpbox: Mise en place avec aide pour ajout url lors d'un ajout d'element

app/Resources/translations/text.fr.yml

@@ -61,3 +61,16 @@ mail:
                       Cordialement,
                       
                       l'équipe de Muzi.ch
+
+help:
+  element_add_url:
+    title1:            Ajouter un partage: Adresse HTTP
+    text1:            |
+                      Vous devez mettre dans ce champ l'adresse de la page internet
+                      contenant la musique à partager. Faites bien attention a vous 
+                      trouver sur la page représentant la musique que vous souahitez 
+                      partager. Evitez par exemple de partager une adresse après 
+                      avoir effectué une recherche.
+    title2:           Exemple avec Youtube
+    title3:           Exemple avec Soundcloud
+                      

app/Resources/translations/userui.fr.yml

@@ -148,6 +148,8 @@ element_add:
     help:     |
               Copier ici le lien internet (http://) pointant sur la ressource 
               que vous souhaitez partager.
+    more_help: Cliquez ici pour plus de détails
+              
   need_tags:
     name:     Demander de l'aide pour tagger votre partage
   name:

src/Muzich/CoreBundle/Controller/InfoController.php

@@ -52,4 +52,20 @@ class InfoController extends Controller
     return array();
   }
   
+  public function helpboxAction($ressource_id)
+  {
+    if (!in_array($ressource_id, array(
+      'element_add_url'
+    )))
+    {
+      return $this->jsonNotFoundResponse();
+    }
+    
+    return $this->jsonResponse(array(
+      'status' => 'success',
+      'data'     => $this->render('MuzichCoreBundle:Helpbox:'.$ressource_id.'.html.twig')
+                      ->getContent()
+    ));
+  }
+  
 }

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -86,6 +86,12 @@ info_cgu:
   pattern: /info/cgu
   defaults: { _controller: MuzichCoreBundle:Info:cgu }
   
+### helper
+
+helpbox_bootstrap:
+  pattern: /info/help/{ressource_id}
+  defaults: { _controller: MuzichCoreBundle:Info:helpbox }
+
 ####
 
 element_edit:
@@ -195,3 +201,4 @@ element_get_stream_data:
 url_get_embed_for_element:
   pattern: /ajax/element/data/get/embed/{element_id}
   defaults: { _controller: MuzichCoreBundle:Element:getEmbedCode, element_id: null }
+

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -1884,4 +1884,71 @@ ul#moderate_elements div.controls
   font-weight: bold;
   text-decoration: none;
   color: black;
+}
+
+div#autoplay.popin_block
+{
+  width: 500px;
+}
+
+div#helpbox
+{
+  width: 500px;
+}
+
+div#helpbox h1
+{
+  margin-top: 0px;
+}
+
+div#helpbox h2
+{
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+
+a#autoplay_previous
+{
+  float: left;
+  text-decoration: none;
+  margin-left: -120px;
+  margin-top: 25px;
+}
+
+a#autoplay_next
+{
+  float: right;
+  text-decoration: none;
+  margin-right: -120px;
+  margin-top: 25px;
+}
+
+a#autoplay_previous, a#autoplay_next, a#autoplay_close, a#helpbox_close
+{
+  background: #fff;
+  padding: 5px;
+  border: 10px solid #ddd;
+  z-index: 99999;
+  /*--Les différentes définitions de Box Shadow en CSS3--*/
+  -webkit-box-shadow: 0px 0px 20px #000;
+  -moz-box-shadow: 0px 0px 20px #000;
+  box-shadow: 0px 0px 20px #000;
+  /*--Coins arrondis en CSS3--*/
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+a#autoplay_close, a#helpbox_close
+{
+  float: left;
+  text-decoration: none;
+  margin-top: 130px;
+  margin-left: -110px;
+  z-index: 99;
+}
+
+a#helpbox_close
+{
+  margin-top: 10px;
 }

src/Muzich/CoreBundle/Resources/public/css/old.css

@@ -1333,13 +1333,13 @@ a#autoplay_launch
   float: right;
   margin-top: -25px;
 }
-
+/*
 div#autoplay.popin_block
 {
   width: 500px;
-}
+}*/
 
-a#autoplay_previous
+/*a#autoplay_previous
 {
   float: left;
   text-decoration: none;
@@ -1361,11 +1361,11 @@ a#autoplay_previous, a#autoplay_next, a#autoplay_close
   padding: 5px;
   border: 10px solid #ddd;
   z-index: 99999;
-  /*--Les différentes définitions de Box Shadow en CSS3--*/
+  --Les différentes définitions de Box Shadow en CSS3--
   -webkit-box-shadow: 0px 0px 20px #000;
   -moz-box-shadow: 0px 0px 20px #000;
   box-shadow: 0px 0px 20px #000;
-  /*--Coins arrondis en CSS3--*/
+  --Coins arrondis en CSS3--
   -webkit-border-radius: 10px;
   -moz-border-radius: 10px;
   border-radius: 10px;
@@ -1378,7 +1378,7 @@ a#autoplay_close
   margin-top: 130px;
   margin-left: -110px;
   z-index: 99;
-}
+}*/
 
 div#autoplay_title
 {

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -2600,6 +2600,7 @@ $(document).ready(function(){
         top: '10%'
       });
     $('#'+object_id).show();
+    return 'fade';
   }
   
 /*
@@ -2868,5 +2869,32 @@ $(document).ready(function(){
       }
       
   });
+  
+  /* HELPBOX */
+  $('.helpbox').live('click', function(){
+    $('body').append(
+      '<div id="helpbox" class="popin_block"><img src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>'
+    );
+    open_popin_dialog('helpbox');
+    JQueryJson($(this).attr('href'), {}, function(response){
+      if (response.status == 'success')
+      {
+        $('div#helpbox').html(
+          '<a href="javascript:void(0);" id="helpbox_close" >'+
+            '<img src="/bundles/muzichcore/img/1317386146_cancel.png" alt="close" />'+
+          '</a>'+
+          response.data
+        );
+      }
+    });
+    
+    return false;
+  });
+  $('a#helpbox_close').live('click', function(){
+    // Fond gris
+    $('#fade').fadeOut(1000, function(){$('#fade').remove();});
+    // On cache le lecteur
+    $('#helpbox').remove();
+  });
    
 });

src/Muzich/CoreBundle/Resources/views/Element/form.add.html.twig

@@ -12,7 +12,13 @@
 
 <div id="form_add_first_part">
 
-  <span class="help">{{ 'element_add.url.help'|trans({}, 'userui') }}</span>
+  <span class="help">
+    {{ 'element_add.url.help'|trans({}, 'userui') }}
+    <a href="{{ path('helpbox_bootstrap', {'ressource_id':'element_add_url'}) }}" class="helpbox">
+      {{ 'element_add.url.more_help'|trans({}, 'userui') }}
+    </a>
+  </span>
+  
 
   <div class="field fom_add_url">
     {{ form_errors(form.url) }}

src/Muzich/CoreBundle/Resources/views/Helpbox/element_add_url.html.twig

@@ -0,0 +1,15 @@
+<h1>{{ 'help.element_add_url.title1'|trans({}, 'text') }}</h1>
+
+<p>{{ 'help.element_add_url.text1'|trans({}, 'text') }}</p>
+
+<h2>{{ 'help.element_add_url.title2'|trans({}, 'text') }}</h2>
+
+<p style="text-align: center;">
+  <img src="{{ asset('img/capt1.png') }}" alt="capture1" />
+</p>
+
+<h2>{{ 'help.element_add_url.title3'|trans({}, 'text') }}</h2>
+
+<p style="text-align: center;">
+  <img src="{{ asset('img/capt2.png') }}" alt="capture2" />
+</p>

vendor/bin/doctrine

@@ -1 +0,0 @@
-../doctrine/orm/bin/doctrine

vendor/bin/doctrine

@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+
+include('doctrine.php');

vendor/bin/doctrine.php

@@ -1 +0,0 @@
-../doctrine/orm/bin/doctrine.php

vendor/bin/doctrine.php

@@ -0,0 +1,43 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php';
+$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php';
+
+$helperSet = null;
+if (file_exists($configFile)) {
+    if ( ! is_readable($configFile)) {
+        trigger_error(
+            'Configuration file [' . $configFile . '] does not have read permission.', E_ERROR
+        );
+    }
+
+    require $configFile;
+
+    foreach ($GLOBALS as $helperSetCandidate) {
+        if ($helperSetCandidate instanceof \Symfony\Component\Console\Helper\HelperSet) {
+            $helperSet = $helperSetCandidate;
+            break;
+        }
+    }
+}
+
+$helperSet = ($helperSet) ?: new \Symfony\Component\Console\Helper\HelperSet();
+
+\Doctrine\ORM\Tools\Console\ConsoleRunner::run($helperSet);

vendor/gedmo/doctrine-extensions/schemas/orm/doctrine-extensions-mapping.xsd

@@ -1 +0,0 @@
-doctrine-extensions-mapping-2-2.xsd

vendor/gedmo/doctrine-extensions/schemas/orm/doctrine-extensions-mapping.xsd

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping"
+    xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping"
+    elementFormDefault="qualified">
+
+  <xs:annotation>
+    <xs:documentation><![CDATA[
+       This is the XML Schema for the object/relational
+       mapping file used by the Doctrine Extensions by Gedmo
+       extensions
+       Doctrine component version support: 2.2.x
+     ]]></xs:documentation>
+  </xs:annotation>
+
+<!--
+It would be nice if we could force the gedmo with only necessary elements into each of doctrine elements.
+Patches that do that are more than welcome.
+Please note, that marking e.g filed element in xml document with xsi:type is not an option as we need to allow other
+people to push their own additional attributes/elements into the same field element and they should not extend our schema
+-->
+
+  <!-- entity -->
+  <xs:element name="translation" type="gedmo:translation"/>
+  <xs:element name="tree" type="gedmo:tree"/>
+  <xs:element name="tree-closure" type="gedmo:tree-closure"/>
+  <xs:element name="loggable" type="gedmo:loggable"/>
+  <xs:element name="soft-deleteable" type="gedmo:soft-deleteable"/>
+  <xs:element name="uploadable" type="gedmo:uploadable"/>
+  <!-- field -->
+  <xs:element name="slug" type="gedmo:slug"/>
+  <xs:element name="translatable" type="gedmo:translatable"/>
+  <xs:element name="timestampable" type="gedmo:timestampable"/>
+  <xs:element name="versioned" type="gedmo:emptyType"/>
+  <xs:element name="tree-left" type="gedmo:emptyType"/>
+  <xs:element name="tree-right" type="gedmo:emptyType"/>
+  <xs:element name="tree-level" type="gedmo:emptyType"/>
+  <xs:element name="tree-root" type="gedmo:emptyType"/>
+  <xs:element name="tree-parent" type="gedmo:emptyType"/>
+  <xs:element name="tree-path-source" type="gedmo:emptyType"/>
+  <xs:element name="tree-lock-time" type="gedmo:emptyType"/>
+  <xs:element name="sortable-group" type="gedmo:emptyType"/>
+  <xs:element name="sortable-position" type="gedmo:emptyType"/>
+  <xs:element name="uploadable-file-mime-type" type="gedmo:emptyType"/>
+  <xs:element name="uploadable-file-path" type="gedmo:emptyType"/>
+  <xs:element name="uploadable-file-size" type="gedmo:emptyType"/>
+
+  <xs:complexType name="translation">
+    <xs:attribute name="entity" type="xs:string" use="optional" />
+    <xs:attribute name="locale" type="xs:string" use="optional" />
+    <xs:attribute name="language" type="xs:string" use="optional" />
+  </xs:complexType>
+
+  <xs:complexType name="tree">
+    <xs:attribute name="type" type="gedmo:tree-type" default="nested" />
+    <xs:attribute name="activate-locking" type="xs:boolean" default="false" />
+    <xs:attribute name="locking-timeout" type="xs:integer" default="3" />
+  </xs:complexType>
+
+  <xs:complexType name="tree-closure">
+    <xs:attribute name="class" type="xs:string" use="required" />
+  </xs:complexType>
+
+  <xs:complexType name="tree-path">
+    <xs:attribute name="separator" type="xs:string" use="optional" default="|" />
+  </xs:complexType>
+
+  <xs:complexType name="loggable">
+    <xs:attribute name="log-entry-class" type="xs:string" use="optional" />
+  </xs:complexType>
+
+  <xs:complexType name="slug">
+    <xs:sequence>
+      <xs:element name="handler" type="gedmo:handler" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="fields" type="xs:string" use="required"/>
+    <xs:attribute name="unique" type="xs:boolean" use="optional" />
+    <xs:attribute name="updatable" type="xs:boolean" use="optional" />
+    <xs:attribute name="separator" type="xs:string" use="optional" />
+    <xs:attribute name="style" type="gedmo:slug-style" use="optional" />
+  </xs:complexType>
+
+  <xs:complexType name="soft-deleteable">
+    <xs:attribute name="field-name" type="xs:string" use="required" />
+  </xs:complexType>
+  
+  <xs:complexType name="handler">
+    <xs:sequence>
+      <xs:element name="handler-option" type="gedmo:handler-option" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="class" type="xs:string" use="required"/>
+  </xs:complexType>
+  
+  <xs:complexType name="handler-option">
+    <xs:attribute name="name" type="xs:string" use="required"/>
+    <xs:attribute name="value" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="timestampable">
+    <xs:attribute name="on" type="gedmo:timestampable-action" use="optional" />
+    <xs:attribute name="field" type="xs:string" use="optional" />
+    <xs:attribute name="value" type="xs:string" use="optional" />
+  </xs:complexType>
+
+  <xs:complexType name="translatable">
+    <xs:attribute name="fallback" type="xs:boolean" use="optional" />
+  </xs:complexType>
+
+  <xs:complexType name="emptyType">
+  </xs:complexType>
+
+  <xs:simpleType name="tree-type">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="nested"/>
+      <xs:enumeration value="closure"/>
+      <xs:enumeration value="materializedPath"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="slug-style">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="default"/>
+      <xs:enumeration value="camel"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="timestampable-action">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="create"/>
+      <xs:enumeration value="update"/>
+      <xs:enumeration value="change"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="uploadable">
+    <xs:attribute name="allow-overwrite" type="xs:boolean" use="optional" />
+    <xs:attribute name="append-number" type="xs:boolean" use="optional" />
+    <xs:attribute name="callback" type="xs:string" use="optional" />
+    <xs:attribute name="path" type="xs:string" use="optional" />
+    <xs:attribute name="path-method" type="xs:string" use="optional" />
+    <xs:attribute name="filename-generator" type="xs:string" use="optional" />
+    <xs:attribute name="max-size" type="xs:double" use="optional" default="0" />
+    <xs:attribute name="allowed-types" type="xs:string" use="optional" />
+    <xs:attribute name="disallowed-types" type="xs:string" use="optional" />
+  </xs:complexType>
+
+</xs:schema>