Feat : Modification du code et mise en git #6185 @0h10

volume/www/website/www/app/Resources/views/admin/territory_edit.html.twig

@@ -29,6 +29,7 @@
                     {{ form_row(form.emphasisOrder) }}
                     {{ form_row(form.brandName) }}
                     {{ form_row(form.description) }}
+                    {{ form_row(form.descriptionAdmin) }}
                     {{ form_row(form.website) }}
                     {{ form_row(form.tagsComma) }}
                     {{ form_row(form.file) }}
@@ -60,11 +61,24 @@
     </div>
     {{ form_end(form) }}
 {% endblock %}
-
+{% block css %}
+    <link rel="stylesheet" href="{{ asset('codemirror/lib/codemirror.css') }}">
+{% endblock %}
 {% block javascripts %}
     <script>
         $(document).ready(function () {
             $('[data-toggle="popover"]').popover();
         });
     </script>
-{% endblock %}
+    <script src="{{ asset('codemirror/lib/codemirror.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/xml/xml.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/javascript/javascript.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/css/css.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/vbscript/vbscript.js') }}"></script>
+    <script src="{{ asset('codemirror/mode/htmlmixed/htmlmixed.js') }}"></script>
+    <script>
+        var myCodeMirror = CodeMirror.fromTextArea(document.getElementById('territory_admin_descriptionAdmin'), {
+            lineNumbers: true,
+        });
+    </script>
+{% endblock %}

volume/www/website/www/app/Resources/views/admin/users_list.html.twig

@@ -22,6 +22,7 @@
                     <th>Nom</th>
                     <th>Prénom</th>
                     <th class="col-md-3">Email</th>
+                    <th>Etat</th>
                     <th>Roles</th>
                     <th>Action</th>
                 </tr>
@@ -33,6 +34,10 @@
                         <td>{{ u.lastname }}</td>
                         <td>{{ u.firstname }}</td>
                         <td>{{ u.email }}</td>
+                        <td>{% if u.enabled %} Activé 
+                            {% else %} Désactivé <br />
+                            <a href="{{ path('admin_user_resend',{'id':u.id}) }}">Renvoyer le mail de confirmation</a>
+                            {% endif %}</td>
                         <td>
                             {% for r in u.roles %}
                                 {% if r != "ROLE_USER" %}

volume/www/website/www/app/Resources/views/default/ad_show.html.twig

@@ -37,6 +37,8 @@
                         <div class="row m-b-0" id="adVideo">
                             {% if ad.id == 36 %}
                                 <img class="responsive-img" src="{{asset('/img/Albea_alternance_stage_vie_1.jpg')}}">
+                            {% elseif ad.id == 38 %}
+                                <img class="responsive-img" src="{{asset('/img/GROUPE-ROCHER-TT.jpg')}}">
                             {% else %}
                                 <div class="embed-responsive embed-responsive-16by9">
                                     <div class="col s12">

volume/www/website/www/app/Resources/views/territory/territory_show.html.twig

@@ -88,6 +88,11 @@
                             <div class="item-detail-description">
                                 <p>{{ company.description|nl2br }}</p>
                             </div>
+                            {% if company.descriptionAdmin %}
+                            <div class="item-detail-description-bo">
+                                <p>{{ company.descriptionAdmin|raw }}</p>
+                            </div>
+                            {% endif %}
                             <h3 class="blue-text">Les mots clés</h3>
                             {% for tag in company.publicTag %}
                                 <p class="chip">{{ tag }}</p>

volume/www/website/www/src/AppBundle/Controller/Admin/TalentController.php

@@ -63,6 +63,20 @@ class TalentController extends Controller
         ));
     }
 
+    /**
+     * @Route("/admin/config/user/{id}/resend", name="admin_user_resend")
+     */
+    public function adminUserResendAction(Request $request, $id)
+    {
+        $userManager = $this->get('fos_user.user_manager');;
+        $user = $userManager->findUserBy(array('id' => $id));
+        $mailer = $this->get('fos_user.mailer');                    
+        $mailer->sendConfirmationEmailMessage($user);
+
+        return $this->redirectToRoute('admin_config_user');
+    } 
+
+
     /**
      * @Route("/admin/config/user/{id}/delete", name="admin_user_delete")
      */

volume/www/website/www/src/AppBundle/Entity/Company.php

@@ -56,6 +56,13 @@ class Company
      */
     private $description;
 
+    /**
+     * @var text
+     *
+     * @ORM\Column(name="description_admin", type="text", length=255, nullable=true)
+     */
+    private $descriptionAdmin;
+
     /**
      * @var string
      *
@@ -774,4 +781,28 @@ class Company
     {
         return $this->spontaneousApplications;
     }
+
+    /**
+     * Set descriptionAdmin.
+     *
+     * @param string|null $descriptionAdmin
+     *
+     * @return Company
+     */
+    public function setDescriptionAdmin($descriptionAdmin = null)
+    {
+        $this->descriptionAdmin = $descriptionAdmin;
+
+        return $this;
+    }
+
+    /**
+     * Get descriptionAdmin.
+     *
+     * @return string|null
+     */
+    public function getDescriptionAdmin()
+    {
+        return $this->descriptionAdmin;
+    }
 }

volume/www/website/www/src/AppBundle/Form/Admin/TerritoryAdminType.php

@@ -13,14 +13,15 @@ namespace AppBundle\Form\Admin;
 
 use AppBundle\Entity\Company;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\CountryType;
-use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\UrlType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\CountryType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 
 class TerritoryAdminType extends AbstractType
 {
@@ -32,6 +33,7 @@ class TerritoryAdminType extends AbstractType
         $builder
             ->add('brandName', TextType::class, array('label' => 'Nom'))
             ->add('description', TextType::class, array('label' => 'profile.company.description', 'required' => false))
+            ->add('descriptionAdmin', TextareaType::class, array('label' => 'Description additionel réservé aux administrateur (Attention contenu affiché en front)', 'required' => false))
             ->add('website', UrlType::class, array(
                 'label' => 'profile.company.website',
                 'required' => false,