diff options
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/js/settings-admin.js | 4 | ||||
| -rw-r--r-- | apps/theming/l10n/lt_LT.js | 4 | ||||
| -rw-r--r-- | apps/theming/l10n/lt_LT.json | 4 | ||||
| -rw-r--r-- | apps/theming/lib/ImageManager.php | 2 | ||||
| -rw-r--r-- | apps/theming/templates/settings-admin.php | 2 |
5 files changed, 14 insertions, 2 deletions
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index afc218b7ffa..28f7645eae7 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -106,6 +106,10 @@ function hideUndoButton(setting, value) { $(document).ready(function () { $('#theming [data-toggle="tooltip"]').tooltip(); + // manually instantiate jscolor to work around new Function call which violates strict CSP + var colorElement = $('#theming-color')[0]; + var jscolor = new window.jscolor(colorElement, {hash: true}); + $('#theming .theme-undo').each(function() { var setting = $(this).data('setting'); var value = $('#theming-'+setting).val(); diff --git a/apps/theming/l10n/lt_LT.js b/apps/theming/l10n/lt_LT.js index eb2b29a533a..93a982940cd 100644 --- a/apps/theming/l10n/lt_LT.js +++ b/apps/theming/l10n/lt_LT.js @@ -9,6 +9,7 @@ OC.L10N.register( "The given name is too long" : "Nurodytas pavadinimas yra per ilgas", "The given web address is too long" : "Nurodytas adresas yra per ilgas", "The given legal notice address is too long" : "Nurodytas teisinio pranešimo adresas yra per ilgas", + "The given privacy policy address is too long" : "Nurodytas privatumo politikos adresas yra per ilgas", "The given slogan is too long" : "Nurodytas šūkis yra per ilgas", "The given color is invalid" : "Nurodyta spalva yra neteisinga", "The file was uploaded" : "Failas buvo įkeltas", @@ -24,6 +25,8 @@ OC.L10N.register( "You are already using a custom theme. Theming app settings might be overwritten by that." : "Jūs jau naudojate tinkintą temą. Temų programėlės nustatymai gali būti perrašyti tos temos.", "Theming" : "Tema", "Legal notice" : "Teisinis pranešimas", + "Privacy policy" : "Privatumo politika", + "Adjust the Nextcloud theme" : "Reguliuoti Nextcloud temą", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Temos leidžia lengvai tinkinti jūsų egzemplioriaus ir palaikomų klientų išvaizdą ir turinį. Tai bus matoma visiems naudotojams. ", "Name" : "Pavadinimas", "Reset to default" : "Atstatyti į numatytąją", @@ -38,6 +41,7 @@ OC.L10N.register( "Remove background image" : "Šalinti foninį paveikslą", "Advanced options" : "Išplėstinės parinktys", "Legal notice link" : "Teisinio pranešimo nuoroda", + "Privacy policy link" : "Privatumo politikos nuoroda", "Header logo" : "Antraštės logotipas", "Upload new header logo" : "Įkelti naują antraštės logotipą", "Favicon" : "Svetainės piktograma", diff --git a/apps/theming/l10n/lt_LT.json b/apps/theming/l10n/lt_LT.json index 76111e4cceb..5443bef8dc2 100644 --- a/apps/theming/l10n/lt_LT.json +++ b/apps/theming/l10n/lt_LT.json @@ -7,6 +7,7 @@ "The given name is too long" : "Nurodytas pavadinimas yra per ilgas", "The given web address is too long" : "Nurodytas adresas yra per ilgas", "The given legal notice address is too long" : "Nurodytas teisinio pranešimo adresas yra per ilgas", + "The given privacy policy address is too long" : "Nurodytas privatumo politikos adresas yra per ilgas", "The given slogan is too long" : "Nurodytas šūkis yra per ilgas", "The given color is invalid" : "Nurodyta spalva yra neteisinga", "The file was uploaded" : "Failas buvo įkeltas", @@ -22,6 +23,8 @@ "You are already using a custom theme. Theming app settings might be overwritten by that." : "Jūs jau naudojate tinkintą temą. Temų programėlės nustatymai gali būti perrašyti tos temos.", "Theming" : "Tema", "Legal notice" : "Teisinis pranešimas", + "Privacy policy" : "Privatumo politika", + "Adjust the Nextcloud theme" : "Reguliuoti Nextcloud temą", "Theming makes it possible to easily customize the look and feel of your instance and supported clients. This will be visible for all users." : "Temos leidžia lengvai tinkinti jūsų egzemplioriaus ir palaikomų klientų išvaizdą ir turinį. Tai bus matoma visiems naudotojams. ", "Name" : "Pavadinimas", "Reset to default" : "Atstatyti į numatytąją", @@ -36,6 +39,7 @@ "Remove background image" : "Šalinti foninį paveikslą", "Advanced options" : "Išplėstinės parinktys", "Legal notice link" : "Teisinio pranešimo nuoroda", + "Privacy policy link" : "Privatumo politikos nuoroda", "Header logo" : "Antraštės logotipas", "Upload new header logo" : "Įkelti naują antraštės logotipą", "Favicon" : "Svetainės piktograma", diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index 75c978f2adb..d377aa4f222 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -117,7 +117,7 @@ class ImageManager { $pngFile = $folder->newFile($key . '.png'); $pngFile->putContent($finalIconFile->getImageBlob()); } catch (\ImagickException $e) { - $this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed.', $e->getMessage()); + $this->logger->info('The image was requested to be no SVG file, but converting it to PNG failed: ' . $e->getMessage()); $pngFile = null; } } else { diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php index 0cc224abc24..656b23be4fb 100644 --- a/apps/theming/templates/settings-admin.php +++ b/apps/theming/templates/settings-admin.php @@ -62,7 +62,7 @@ style('theming', 'settings-admin'); <div> <label> <span><?php p($l->t('Color')) ?></span> - <input id="theming-color" type="text" class="jscolor" data-jscolor="{hash:true}" maxlength="7" value="<?php p($_['color']) ?>" /> + <input id="theming-color" type="text" maxlength="7" value="<?php p($_['color']) ?>" /> <div data-setting="color" data-toggle="tooltip" data-original-title="<?php p($l->t('Reset to default')); ?>" class="theme-undo icon icon-history"></div> </label> </div> |