Merge branch 'dev' into #218

site/plugins/admin/lang/es_ES.yaml

@@ -1,54 +1,54 @@
 ---
-admin: "Admin"
-admin_welcome: "Welcome"
-admin_create_new_user_welcome: "To finish setup and secure your site, please create the first user by entering the necessary information below."
-admin_cancel: "Cancel"
-admin_create: "Create"
-admin_debugging: "Debugging"
+admin: "Administrador"
+admin_welcome: "Bienvenido"
+admin_create_new_user_welcome: "Para finalizar la configuración y asegurar tu web, por favor cree su primer usuario añadiendo la siguiente información."
+admin_cancel: "Cancelar"
+admin_create: "Crear"
+admin_debugging: "Depuración"
 admin_email: "Email"
-admin_flextype_version: "Flextype Version"
-admin_information: "Information"
-admin_installed: "Installed"
-admin_keywords: "Keywords"
-admin_documentation: "Documentation"
-admin_memcache_server: "Memcache Server"
-admin_memcache_port: "Memcache Port"
-admin_login: "Login"
-admin_entries: "Entries"
-admin_extends: "Extends"
-admin_plugins: "Plugins"
-admin_themes: "Themes"
-admin_help: "Help"
-admin_getting_help: "Getting Help"
-admin_message_json_invalid: "Invalid JSON"
-admin_logout: "Logout"
-admin_profile: "Profile"
-admin_view_site: "View Site"
-admin_snippets: "Snippets"
-admin_not_installed: "Not Installed"
-admin_off: "Off"
-admin_on: "On"
-admin_add: "Add"
-admin_entry_attributes: "Entry Attributes"
-admin_fieldset_for_template: "Fieldset for template"
-admin_content: "Content"
-admin_create_new_entry: "Create New Entry"
-admin_date: "Date"
-admin_draft: "Draft"
-admin_edit: "Edit"
-admin_blocks: "Blocks"
+admin_flextype_version: "Versión de Flextype"
+admin_information: "Información"
+admin_installed: "Instalado"
+admin_keywords: "Claves"
+admin_documentation: "Documentación"
+admin_memcache_server: "Servidor de Memcache"
+admin_memcache_port: "Puerto de Memcache"
+admin_login: "Iniciar Sesión"
+admin_entries: "Entradas"
+admin_extends: "Ampliar"
+admin_plugins: "Complementos"
+admin_themes: "Temas"
+admin_help: "Ayuda"
+admin_getting_help: "Obtener Ayuda"
+admin_message_json_invalid: "JSON No Válido"
+admin_logout: "Desconectar"
+admin_profile: "Perfil"
+admin_view_site: "Ver Sitio"
+admin_snippets: "Fragmentos de código"
+admin_not_installed: "No instalado"
+admin_off: "Desactivado"
+admin_on: "Activado"
+admin_add: "Añadir"
+admin_entry_attributes: "Atributos de entrada"
+admin_fieldset_for_template: "Campo de plantilla"
+admin_content: "Contenido"
+admin_create_new_entry: "Crear Entrada"
+admin_date: "Fecha"
+admin_draft: "Borrador"
+admin_edit: "Editar"
+admin_blocks: "Bloques"
 admin_media: "Media"
-admin_settings: "Settings"
-admin_templates: "Templates"
-admin_entry: "Entry"
-admin_fieldset: "Fieldset"
-admin_source: "Source"
-admin_upload: "Upload"
-admin_hidden: "Hidden"
-admin_image_preview: "Image preview"
-admin_move: "Move"
-admin_parent_entry: "Entry parent"
-admin_preview: "Preview"
+admin_settings: "Preferencias"
+admin_templates: "Plantillas"
+admin_entry: "Entrada"
+admin_fieldset: "Grupo de Campos"
+admin_source: "Origen"
+admin_upload: "Subir"
+admin_hidden: "Oculto"
+admin_image_preview: "Previsualización de imagen"
+admin_move: "Mover"
+admin_parent_entry: "Entrada Padre"
+admin_preview: "Vista previa"
 admin_publish: "Publish"
 admin_rename: "Rename"
 admin_save_entry: "Save entry"
@@ -99,14 +99,14 @@ admin_system: "System"
 admin_cache_driver: "Cache driver"
 admin_cache_enabled: "Cache enabled"
 admin_cache_lifetime: "Cache lifetime"
-admin_cache_prefix: "Cache prefix"
-admin_charset: "Charset"
-admin_date_format: Date format"
-admin_errors_display: "Display errors"
-admin_locale: "Locale"
-admin_entry_main: "Main entry"
-admin_theme: "Theme"
-admin_timezone: "Timezone"
+admin_cache_prefix: "Prefijo de caché"
+admin_charset: "Sistema de caracteres"
+admin_date_format: Formato de fecha
+admin_errors_display: "Mostrar Errores"
+admin_locale: "Configuración regional"
+admin_entry_main: "Entrada principal"
+admin_theme: "Tema"
+admin_timezone: "Zona Horaria"
 admin_username: "Username"
 admin_create_user: "Create User"
 admin_create_new_user: "Create New User"

site/plugins/admin/views/partials/base.html

@@ -6,6 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta name="description" content="">
         <meta name="author" content="">
+        <meta name="robots" content="noindex,nofollow">
 
         {{ emitter.emit('onAdminThemeMeta') }}
 
@@ -220,10 +221,10 @@
                     <div class="row">
                         <div class="col-md-12">
                             {% block content %}{% endblock %}
-                        </div> <!-- .col-md-12 -->
-                    </div> <!-- .row -->
-                </div> <!-- .container-fluid -->
-            </div> <!-- .content -->
+                        </div>
+                    </div>
+                </div>
+            </div>
 
         </div>
 
@@ -239,74 +240,24 @@
         {% endif %}
 
         {% set admin_build = base_url() ~ '/site/plugins/admin/assets/dist/js/admin-build.min.js' %}
-
         {% do assets.add('js', admin_build, 'admin', 1) %}
-
         {% for assets_admin in assets.get('js', 'admin') %}
             {% for assets_by_priorities in assets_admin %}
                 <script type="text/javascript" src="{{ assets_by_priorities.asset }}"></script>
             {% endfor %}
         {% endfor %}
 
-
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.3.26/jquery.form-validator.min.js"></script>
+    {% include "plugins/admin/views/partials/form-validator.html" %}
+    {% include "plugins/admin/views/partials/messenger.html" %}
+    {% include "plugins/admin/views/partials/clipboard.html" %}
+    {% include "plugins/admin/views/partials/custom-file-input.html" %}
+    {% include "plugins/admin/views/partials/trumbowyg.html" %}
 
     <script type="text/javascript">
-
-            new ClipboardJS('.js-clipboard-btn');
-            bsCustomFileInput.init();
-
-            Messenger.options = {
-                extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
-                theme: 'flat'
-            }
-
-            {% for message in flash()['success'] %}
-                Messenger().post({ type: "success", message : "{{ message }}", hideAfter: '3' });
-            {% endfor %}
-
-            {% for message in flash()['warning'] %}
-                Messenger().post({ type: "warning", message : "{{ message }}", hideAfter: '3' });
-            {% endfor %}
-
-            {% for message in flash()['error'] %}
-                Messenger().post({ type: "error", message : "{{ message }}", hideAfter: '3' });
-            {% endfor %}
-
-            if (typeof $.flextype == 'undefined') $.flextype = {};
-
-
             $(document).ready(function() {
 
-                $.trumbowyg.svgPath =  '{{base_url()}}/site/plugins/admin/assets/dist/fonts/trumbowyg/icons.svg';
-                $('.js-html-editor').trumbowyg({
-                    btnsDef: {
-                        // Customizables dropdowns
-                        image: {
-                            dropdown: ['insertImage', 'noembed'],
-                            ico: 'insertImage'
-                        }
-                    },
-                    btns: [
-                        ['undo', 'redo'], // Only supported in Blink browsers
-                        ['formatting'],
-                        ['strong', 'em', 'del'],
-                        ['link'],
-                        ['image'],
-                        ['justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull'],
-                        ['unorderedList', 'orderedList'],
-                        ['table'],
-                        ['removeformat'],
-                        ['fullscreen'],
-                        ['viewHTML']
-                    ],
-                    lang: '{{ locale }}',
-                    autogrow: false,
-                    removeformatPasted: true
-                });
-
                 $('.js-save-form-submit').click(function() {
-                    $("#form" ).submit();
+                    $("#form").submit();
                 });
 
                 $('.js-save-editor-form-submit').click(function() {
@@ -354,7 +305,6 @@
                     $('#settingsEntryModal').modal();
                 });
 
-                $.validate({});
                 {% if is_current_path('admin.fieldsets.edit') or is_current_path('admin.templates.edit') or is_current_path('admin.snippets.edit') or (is_current_path('admin.entries.edit') and type == 'source') %}
                 var editor = CodeMirror.fromTextArea(document.getElementById("codeMirrorEditor"), {
                     lineNumbers: true,

site/plugins/admin/views/partials/clipboard.html

@@ -0,0 +1,3 @@
+<script type="text/javascript">
+    new ClipboardJS('.js-clipboard-btn');
+</script>

site/plugins/admin/views/partials/custom-file-input.html

@@ -0,0 +1,3 @@
+<script type="text/javascript">
+    bsCustomFileInput.init();
+</script>

site/plugins/admin/views/partials/form-validator.html

@@ -0,0 +1,4 @@
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-form-validator/2.3.26/jquery.form-validator.min.js"></script>
+<script type="text/javascript">
+    $.validate({});
+</script>

site/plugins/admin/views/partials/messenger.html

@@ -0,0 +1,18 @@
+<script type="text/javascript">
+    Messenger.options = {
+        extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
+        theme: 'flat'
+    }
+
+    {% for message in flash()['success'] %}
+        Messenger().post({ type: "success", message : "{{ message }}", hideAfter: '3' });
+    {% endfor %}
+
+    {% for message in flash()['warning'] %}
+        Messenger().post({ type: "warning", message : "{{ message }}", hideAfter: '3' });
+    {% endfor %}
+
+    {% for message in flash()['error'] %}
+        Messenger().post({ type: "error", message : "{{ message }}", hideAfter: '3' });
+    {% endfor %}
+</script>

site/plugins/admin/views/partials/trumbowyg.html

@@ -0,0 +1,28 @@
+<script type="text/javascript">
+    $.trumbowyg.svgPath =  '{{base_url()}}/site/plugins/admin/assets/dist/fonts/trumbowyg/icons.svg';
+    $('.js-html-editor').trumbowyg({
+        btnsDef: {
+            // Customizables dropdowns
+            image: {
+                dropdown: ['insertImage', 'noembed'],
+                ico: 'insertImage'
+            }
+        },
+        btns: [
+            ['undo', 'redo'], // Only supported in Blink browsers
+            ['formatting'],
+            ['strong', 'em', 'del'],
+            ['link'],
+            ['image'],
+            ['justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull'],
+            ['unorderedList', 'orderedList'],
+            ['table'],
+            ['removeformat'],
+            ['fullscreen'],
+            ['viewHTML']
+        ],
+        lang: '{{ locale }}',
+        autogrow: false,
+        removeformatPasted: true
+    });
+</script>