Unverified Commit 02f258ec authored by Sebastian Castro's avatar Sebastian Castro
Browse files

Fix Js & Css vendor files path

parent 1e9ceee5
...@@ -41,6 +41,7 @@ services: ...@@ -41,6 +41,7 @@ services:
App\Services\UploadDirectoryNamer: App\Services\UploadDirectoryNamer:
class: App\Services\UploadDirectoryNamer class: App\Services\UploadDirectoryNamer
public: true
arguments: [] arguments: []
App\Services\GoGoCartoJsService: App\Services\GoGoCartoJsService:
......
...@@ -31,7 +31,7 @@ gulp.task('scriptsElementForm', function() { ...@@ -31,7 +31,7 @@ gulp.task('scriptsElementForm', function() {
gulp.task('scriptsLibs', function() { gulp.task('scriptsLibs', function() {
gulp.src(['node_modules/gogocarto-js/dist/gogocarto.js']) gulp.src(['node_modules/gogocarto-js/dist/gogocarto.js'])
.pipe(gulp.dest('web/js')); .pipe(gulp.dest('web/js'));
return gulp.src(['assets/js/vendor/**/*.js', return gulp.src(['assets/js/vendor/**/*',
'assets/js/init-sw.js', 'assets/js/init-sw.js',
]) ])
.pipe(gulp.dest('web/js')); .pipe(gulp.dest('web/js'));
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<textarea id="{{ form.vars.id }}" name="{{ form.vars.full_name }}" data-id="{{ attr['data-id']|default('') }}">{{ form.vars.value }}</textarea> <textarea id="{{ form.vars.id }}" name="{{ form.vars.full_name }}" data-id="{{ attr['data-id']|default('') }}">{{ form.vars.value }}</textarea>
<pre id="editor{{ form.vars.id }}" class="ace-editor" style="height: {{ height }}px;"></pre> <pre id="editor{{ form.vars.id }}" class="ace-editor" style="height: {{ height }}px;"></pre>
<script src="{{ asset('js/vendor/ace/ace.js') }}"></script> <script src="{{ asset('js/ace/ace.js') }}"></script>
{% if format != 'javascript' %} {% if format != 'javascript' %}
<script src="{{ asset('js/vendor/ace/mode-' ~ format ~ '.js') }}"></script> <script src="{{ asset('js/ace/mode-' ~ format ~ '.js') }}"></script>
{% endif %} {% endif %}
<script src="{{ asset('js/vendor/ace/theme-monokai.js') }}"></script> <script src="{{ asset('js/ace/theme-monokai.js') }}"></script>
<script> <script>
var editor{{ form.vars.id }} = ace.edit("editor{{ form.vars.id }}", { var editor{{ form.vars.id }} = ace.edit("editor{{ form.vars.id }}", {
......
...@@ -105,10 +105,10 @@ ...@@ -105,10 +105,10 @@
dataType: "json", dataType: "json",
fields: fields, fields: fields,
templates: templates, templates: templates,
i18n: { // i18n: {
locale: 'fr-FR', // locale: 'fr-FR',
location: '{{ asset("assets/js/") }}' // location: '{{ asset("assets/js/") }}'
}, // },
disableFields: ['hidden', 'file', 'button', 'autocomplete', 'title', 'taxonomy', 'address', 'image'], disableFields: ['hidden', 'file', 'button', 'autocomplete', 'title', 'taxonomy', 'address', 'image'],
controlOrder: ['text', 'email', 'images', 'textarea', 'checkbox', 'checkbox-group', 'radio-group', 'select', 'date', 'number', 'files'], controlOrder: ['text', 'email', 'images', 'textarea', 'checkbox', 'checkbox-group', 'radio-group', 'select', 'date', 'number', 'files'],
disabledAttrs: ['className', 'inline', 'toggle', 'description', 'other', 'multiple'], disabledAttrs: ['className', 'inline', 'toggle', 'description', 'other', 'multiple'],
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<link rel="stylesheet" href="{{ asset('fonts/fontawesome-5/css/all.css') }}" /> <link rel="stylesheet" href="{{ asset('fonts/fontawesome-5/css/all.css') }}" />
<script src="{{ asset('js/fontawesome-iconpicker.min.js') }}"></script> <script src="{{ asset('js/fontawesome-iconpicker.min.js') }}"></script>
<link rel="stylesheet" href="{{ asset('js/fontawesome-iconpicker.min.css') }}" /> <link rel="stylesheet" href="{{ asset('css/fontawesome-iconpicker.min.css') }}" />
<script> <script>
jQuery(document).ready(function() { jQuery(document).ready(function() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment