From 3c56979f36c6e986b6dece4bf7048680f67324e2 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 25 Aug 2019 16:57:34 +0300 Subject: [PATCH 1/8] New translations en_US.yaml (Spanish) --- site/plugins/admin/lang/es_ES.yaml | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/site/plugins/admin/lang/es_ES.yaml b/site/plugins/admin/lang/es_ES.yaml index d5562ad7..ec0df2f2 100644 --- a/site/plugins/admin/lang/es_ES.yaml +++ b/site/plugins/admin/lang/es_ES.yaml @@ -1,21 +1,21 @@ --- -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_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: "Plugins" admin_themes: "Themes" admin_help: "Help" From b29c11389e686ab5d847797874d29147f76a1d46 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 25 Aug 2019 17:04:31 +0300 Subject: [PATCH 2/8] New translations en_US.yaml (Spanish) --- site/plugins/admin/lang/es_ES.yaml | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/site/plugins/admin/lang/es_ES.yaml b/site/plugins/admin/lang/es_ES.yaml index ec0df2f2..d8b07cf1 100644 --- a/site/plugins/admin/lang/es_ES.yaml +++ b/site/plugins/admin/lang/es_ES.yaml @@ -16,23 +16,23 @@ admin_memcache_port: "Puerto de Memcache" admin_login: "Iniciar Sesión" admin_entries: "Entradas" admin_extends: "Ampliar" -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_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: "Date" admin_draft: "Draft" admin_edit: "Edit" From 4debba2231294a12fd5be3cda79397a5a69d3026 Mon Sep 17 00:00:00 2001 From: Sergey Romanenko Date: Sun, 25 Aug 2019 17:16:22 +0300 Subject: [PATCH 3/8] New translations en_US.yaml (Spanish) --- site/plugins/admin/lang/es_ES.yaml | 46 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/site/plugins/admin/lang/es_ES.yaml b/site/plugins/admin/lang/es_ES.yaml index d8b07cf1..f42d92b6 100644 --- a/site/plugins/admin/lang/es_ES.yaml +++ b/site/plugins/admin/lang/es_ES.yaml @@ -33,22 +33,22 @@ admin_entry_attributes: "Atributos de entrada" admin_fieldset_for_template: "Campo de plantilla" admin_content: "Contenido" admin_create_new_entry: "Crear Entrada" -admin_date: "Date" -admin_draft: "Draft" -admin_edit: "Edit" -admin_blocks: "Blocks" +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" From bd7c20a3de5b19b6e938e5169c2262e36dd4a7e7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 26 Aug 2019 20:39:50 +0300 Subject: [PATCH 4/8] refactor(core): remove unused js code from base.html #186 --- site/plugins/admin/views/partials/base.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index 3954c684..a6473099 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -273,9 +273,6 @@ 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'; From baacbce14eb6b00690420629dba74977c007914b Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 26 Aug 2019 20:50:11 +0300 Subject: [PATCH 5/8] refactor(admin-plugin): decouple js components from base.html #186 Decouple: - clipboard - form-validator - messenger --- site/plugins/admin/views/partials/base.html | 25 +++---------------- .../admin/views/partials/clipboard.html | 3 +++ .../admin/views/partials/form-validator.html | 4 +++ .../admin/views/partials/messenger.html | 18 +++++++++++++ 4 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 site/plugins/admin/views/partials/clipboard.html create mode 100644 site/plugins/admin/views/partials/form-validator.html create mode 100644 site/plugins/admin/views/partials/messenger.html diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index a6473099..88963577 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -248,31 +248,15 @@ {% endfor %} {% endfor %} - - + {% include "plugins/admin/views/partials/form-validator.html" %} + {% include "plugins/admin/views/partials/messenger.html" %} + {% include "plugins/admin/views/partials/clipboard.html" %} diff --git a/site/plugins/admin/views/partials/form-validator.html b/site/plugins/admin/views/partials/form-validator.html new file mode 100644 index 00000000..f425d15a --- /dev/null +++ b/site/plugins/admin/views/partials/form-validator.html @@ -0,0 +1,4 @@ + + diff --git a/site/plugins/admin/views/partials/messenger.html b/site/plugins/admin/views/partials/messenger.html new file mode 100644 index 00000000..c04e3cac --- /dev/null +++ b/site/plugins/admin/views/partials/messenger.html @@ -0,0 +1,18 @@ + From 25548ef0c980daca227d134e8ff0816ec52f5f18 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 26 Aug 2019 20:58:16 +0300 Subject: [PATCH 6/8] refactor(admin-plugin): decouple js components from base.html #186 Decouple: - custom-file-input --- site/plugins/admin/views/partials/base.html | 5 ++--- site/plugins/admin/views/partials/custom-file-input.html | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 site/plugins/admin/views/partials/custom-file-input.html diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index 88963577..5e111a7c 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -251,12 +251,11 @@ {% 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" %} + From 6bfc866f1db9ca75bc627fe8ff2679486868cc00 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 26 Aug 2019 21:04:04 +0300 Subject: [PATCH 7/8] refactor(admin-plugin): decouple js components from base.html #186 Decouple: - trumbowyg --- site/plugins/admin/views/partials/base.html | 32 +------------------ .../admin/views/partials/trumbowyg.html | 28 ++++++++++++++++ 2 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 site/plugins/admin/views/partials/trumbowyg.html diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index 5e111a7c..d4eb6d84 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -239,9 +239,7 @@ {% 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 %} @@ -252,39 +250,11 @@ {% 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" %} From 2e951e20765cb2319a64a3c361ea565b17e0d5b7 Mon Sep 17 00:00:00 2001 From: Awilum Date: Mon, 26 Aug 2019 21:24:34 +0300 Subject: [PATCH 8/8] refactor(admin-plugin): code udpate for base.html #186 --- site/plugins/admin/views/partials/base.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html index d4eb6d84..664aa63b 100644 --- a/site/plugins/admin/views/partials/base.html +++ b/site/plugins/admin/views/partials/base.html @@ -6,6 +6,7 @@ + {{ emitter.emit('onAdminThemeMeta') }} @@ -220,10 +221,10 @@
{% block content %}{% endblock %} -
-
- - + + + + @@ -256,7 +257,7 @@ $(document).ready(function() { $('.js-save-form-submit').click(function() { - $("#form" ).submit(); + $("#form").submit(); }); $('.js-save-editor-form-submit').click(function() {