From 570ebc0c93e110bcb71d238dd6afdcbf5d19b5ce Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 16 Sep 2021 20:00:12 -0500 Subject: Rebranding a ETBSA --- web/app.css | 23 +++++++++++++++-- web/apple-touch-icon.png | Bin 4003 -> 4326 bytes web/debug.html | 2 +- web/favicon.ico | Bin 15086 -> 3322 bytes web/icon.png | Bin 7941 -> 5687 bytes web/l10n/en.json | 4 +-- web/l10n/es.json | 4 +-- web/load.js | 9 +++++-- web/logo.svg | 64 +++++++++++++++++++++++++++++++---------------- 9 files changed, 76 insertions(+), 30 deletions(-) (limited to 'web') diff --git a/web/app.css b/web/app.css index f9f28bb..e8235f7 100644 --- a/web/app.css +++ b/web/app.css @@ -13,7 +13,26 @@ } .toolbar-header-style { - background-color: #5fa2dd !important; + background-color: #337729 !important; +} + +.x-panel-header-default { + background-color: #337729 !important; + border: 1px solid #337729 !important; +} + +.x-tool-tool-el { + background-color: #337729 !important; + border: 1px solid #337729 !important; +} + +.x-window-default { + border: 1px solid #337729 !important; +} + +.x-window-header-default-top { + background-color: #337729 !important; + border: 1px solid #337729 !important; } body.x-border-layout-ct, div.x-border-layout-ct { @@ -50,7 +69,7 @@ body.x-border-layout-ct, div.x-border-layout-ct { margin-top: -30px; margin-left: -30px; border-radius: 50%; - border-top: 6px solid #5fa2dd; + border-top: 6px solid #337729; border-right: 6px solid transparent; animation: spinner .6s linear infinite; } diff --git a/web/apple-touch-icon.png b/web/apple-touch-icon.png index 880c449..bf999a0 100644 Binary files a/web/apple-touch-icon.png and b/web/apple-touch-icon.png differ diff --git a/web/debug.html b/web/debug.html index 5b0599f..a846271 100644 --- a/web/debug.html +++ b/web/debug.html @@ -3,7 +3,7 @@ -Traccar +ETBSA diff --git a/web/favicon.ico b/web/favicon.ico index 6be99dd..0413df6 100644 Binary files a/web/favicon.ico and b/web/favicon.ico differ diff --git a/web/icon.png b/web/icon.png index afa15c7..69809ef 100644 Binary files a/web/icon.png and b/web/icon.png differ diff --git a/web/l10n/en.json b/web/l10n/en.json index 97243a6..fae517b 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -120,7 +120,7 @@ "errorConnection": "Connection error", "errorSocket": "Web socket connection error", "errorZero": "Can't be zero", - "userEmail": "Email", + "userEmail": "User", "userPassword": "Password", "userAdmin": "Admin", "userRemember": "Remember", @@ -457,4 +457,4 @@ "categoryScooter": "Scooter", "maintenanceStart": "Start", "maintenancePeriod": "Period" -} \ No newline at end of file +} diff --git a/web/l10n/es.json b/web/l10n/es.json index 5cdf783..fb93dc8 100644 --- a/web/l10n/es.json +++ b/web/l10n/es.json @@ -120,7 +120,7 @@ "errorConnection": "Error de Conexión", "errorSocket": "Error de conexión web", "errorZero": "No puede ser cero", - "userEmail": "Email", + "userEmail": "Usuario", "userPassword": "Contraseña", "userAdmin": "Administrador", "userRemember": "Recordar", @@ -455,4 +455,4 @@ "categoryScooter": "Moto", "maintenanceStart": "Iniciar", "maintenancePeriod": "Período" -} \ No newline at end of file +} diff --git a/web/load.js b/web/load.js index 9e9cd8f..33e1426 100644 --- a/web/load.js +++ b/web/load.js @@ -36,6 +36,11 @@ window.Locale = locale; locale.languages = { + 'en': { name: 'English', code: 'en' }, + 'es': { name: 'Español', code: 'es' } + }; + + /*locale.languages = { 'af': { name: 'Afrikaans', code: 'af' }, 'ar': { name: 'العربية', code: 'en' }, 'az': { name: 'Azərbaycanca', code: 'en' }, @@ -90,9 +95,9 @@ 'vi': { name: 'Tiếng Việt', code: 'en' }, 'zh': { name: '中文', code: 'zh_CN' }, 'zh_TW': { name: '中文 (Taiwan)', code: 'zh_TW' } - }; + };*/ - languageDefault = 'en'; + languageDefault = 'es'; localeParameter = window.location.search.match(/locale=([^&#]+)/); locale.language = localeParameter && localeParameter[1]; if (!(locale.language in locale.languages)) { diff --git a/web/logo.svg b/web/logo.svg index 8183831..f8fe577 100644 --- a/web/logo.svg +++ b/web/logo.svg @@ -1,24 +1,46 @@ - - - - - - - - - - - + + + + + + - - - - - - - - - - -- cgit v1.2.3