Merge branch 'develop'

Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop
Feat : modification video territoire #6266 @0H15
2018-04-23 16:00:15 +02:00 · 2018-04-23 15:59:43 +02:00 · 2018-04-23 15:59:40 +02:00 · 2018-04-20 15:23:45 +02:00
2 changed files with 15 additions and 3 deletions
@@ -100,7 +100,7 @@
                        {"targets": 3, "searchable": true, "orderable": true, "className": "text-center"},
                        {"targets": 4, "searchable": false, "orderable": false, "className": "text-center"},
                    ],
-                    "order": [[0, "asc"]]
+                    "order": [[0, "desc"]]
                });
            });
        </script>
@@ -88,11 +88,23 @@
                            <div class="item-detail-description">
                                <p>{{ company.description|nl2br }}</p>
                            </div>
-                            {% if company.descriptionAdmin %}
+                {% if company.descriptionAdmin %}
+                        </div>
+                    </div>
+                </div>
+                <div class="col s12 m12 l8 xl9">
+                    <div class="row bg-bordered">
+                        <div class="col s12">
                            <div class="item-detail-description-bo">
                                <p>{{ company.descriptionAdmin|raw }}</p>
                            </div>
-                            {% endif %}
+                        </div>
+                    </div>
+                </div>
+                <div class="col s12 m12 l8 xl9 right">
+                    <div class="row bg-bordered">
+                        <div class="col s12">
+                {% endif %}
                            <h3 class="blue-text">Les mots clés</h3>
                            {% for tag in company.publicTag %}
                                <p class="chip">{{ tag }}</p>
Author	SHA1	Message	Date
Thomas MONCHICOURT	e404b4d876	Merge branch 'develop'	2018-04-23 16:00:15 +02:00
Thomas MONCHICOURT	fa8b21b93c	Merge branch 'develop' of https://git.e-declic.net/talents-tube/website into develop	2018-04-23 15:59:43 +02:00
Thomas MONCHICOURT	8e8312c0f9	Feat : modification video territoire #6266 @0H15	2018-04-23 15:59:40 +02:00
Maxime Thévenot	0297191e07	Fix : update teritory sorting order	2018-04-20 15:23:45 +02:00