From 695fc5818746bd0455ddc8e99b6293457c82e3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 7 Oct 2023 01:33:45 +0200 Subject: [PATCH 1/3] move mention-button to navbar translations --- view/lang/C/messages.po | 34 +++++++++++++++++----------------- view/theme/frio/js/theme.js | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index b211637df..2e37ec398 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-05 20:02+0000\n" +"POT-Creation-Date: 2023-10-07 01:33+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2713,8 +2713,8 @@ msgstr "" #: src/Core/Installer.php:511 msgid "" -"The web installer needs to be able to create a file called \"local.config.php" -"\" in the \"config\" folder of your web server and it is unable to do so." +"The web installer needs to be able to create a file called \"local.config." +"php\" in the \"config\" folder of your web server and it is unable to do so." msgstr "" #: src/Core/Installer.php:512 @@ -5340,9 +5340,9 @@ msgstr "" #: src/Module/Admin/Summary.php:98 msgid "" -"The last update failed. Please run \"php bin/console.php dbstructure update" -"\" from the command line and have a look at the errors that might appear. " -"(Some of the errors are possibly inside the logfile.)" +"The last update failed. Please run \"php bin/console.php dbstructure " +"update\" from the command line and have a look at the errors that might " +"appear. (Some of the errors are possibly inside the logfile.)" msgstr "" #: src/Module/Admin/Summary.php:102 @@ -5493,8 +5493,8 @@ msgstr "" #, php-format msgid "" "Show some informations regarding the needed information to operate the node " -"according e.g. to EU-GDPR." +"according e.g. to EU-GDPR." msgstr "" #: src/Module/Admin/Tos.php:81 @@ -8842,8 +8842,8 @@ msgstr "" #: src/Module/Profile/Profile.php:158 #, php-format msgid "" -"You're currently viewing your profile as %s Cancel" +"You're currently viewing your profile as %s Cancel" msgstr "" #: src/Module/Profile/Profile.php:167 @@ -9391,8 +9391,8 @@ msgstr "" #: src/Module/Security/TwoFactor/Verify.php:100 #, php-format msgid "" -"If you do not have access to your authentication code you can use a two-factor recovery code." +"If you do not have access to your authentication code you can use a two-factor recovery code." msgstr "" #: src/Module/Security/TwoFactor/Verify.php:101 @@ -10932,8 +10932,8 @@ msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:149 #, php-format msgid "" -"

Or you can open the following URL in your mobile device:

%s

" +"

Or you can open the following URL in your mobile device:

%s

" msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:156 @@ -11042,9 +11042,9 @@ msgstr "" msgid "" "At any point in time a logged in user can export their account data from the " "account settings. If the user wants " -"to delete their account they can do so at " -"%1$s/settings/removeme. The deletion of the account will be permanent. " -"Deletion of the data will also be requested from the nodes of the " +"to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be " +"permanent. Deletion of the data will also be requested from the nodes of the " "communication partners." msgstr "" diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index ef71b8c1d..f1585b553 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -80,6 +80,20 @@ $(document).ready(function () { target: ".flex-target", }); + // add mention-link button to the second navbar + let $mentionButton = $("#mention-link-button"); + if ($mentionButton.length) { + $mentionButton.appendTo("#topbar-second > .container > #navbar-button").css("padding", "2"); + $("#mention-link").addClass("btn-sm "); + $("#mention-link > span i").addClass("fa-2x"); + if ($mentionButton.hasClass("modal-open")) { + $mentionButton.on("click", function (e) { + e.preventDefault(); + jotShow(); + }); + } + } + // add Jot button to the second navbar let $jotButton = $("#jotOpen"); if ($jotButton.length) { From df48ae8e00aaaeda6664a9a26762dd78d56f3ad8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 7 Oct 2023 11:28:29 +0200 Subject: [PATCH 2/3] translations --- view/lang/C/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 2e37ec398..40e2276ee 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-07 01:33+0200\n" +"POT-Creation-Date: 2023-10-07 11:28+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From 302eed95f75e626b590bb20f1603dcfa1340b9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= Date: Sat, 7 Oct 2023 18:41:08 +0200 Subject: [PATCH 3/3] add margin top to separate buttons, move button to navbar --- view/lang/C/messages.po | 2 +- view/theme/frio/css/style.css | 1 + view/theme/frio/js/theme.js | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 40e2276ee..c15452623 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-07 11:28+0200\n" +"POT-Creation-Date: 2023-10-07 18:46+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 76df82bf9..3618fa152 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -213,6 +213,7 @@ details summary { text-shadow: none; border-radius: 3px; margin-bottom: 0; + margin-top: 2px; font-size: 14px; font-weight: 600; padding: 8px 16px; diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index f1585b553..6785c827f 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -83,7 +83,7 @@ $(document).ready(function () { // add mention-link button to the second navbar let $mentionButton = $("#mention-link-button"); if ($mentionButton.length) { - $mentionButton.appendTo("#topbar-second > .container > #navbar-button").css("padding", "2"); + $mentionButton.appendTo("#topbar-second > .container > #navbar-button").addClass("pull-right"); $("#mention-link").addClass("btn-sm "); $("#mention-link > span i").addClass("fa-2x"); if ($mentionButton.hasClass("modal-open")) { @@ -94,6 +94,7 @@ $(document).ready(function () { } } + // add Jot button to the second navbar let $jotButton = $("#jotOpen"); if ($jotButton.length) {