This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 0c471407d2f327918a969d23b1d6772acd36787f (commit)
via bea3ed9a6253370428c214153a8a3f5eb77b2fa4 (commit)
via a6da4b53eca6e4510f07b7f385f47ebf64322dad (commit)
via b47fec69f783cc67aa58bfac095212a5ecb1dd30 (commit)
from 0afb344056f45e3d7bb23902467db9dcbd7c8c7f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0c471407d2f327918a969d23b1d6772acd36787f
commit 0c471407d2f327918a969d23b1d6772acd36787f
Author: Guy Morin <guy@guy-90X3A>
Date: Thu Apr 1 11:17:52 2021 +0200
Padding
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index 129fd79..22dbfe8 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -150,7 +150,7 @@ header div {
}
header logo {
- margin-left: .5em;
+ padding: .4em 0 0 .5em;
}
header a, header a:visited {
@@ -168,7 +168,7 @@ div[role='search'] {
}
#searchBox {
- padding:0 .5em;
+ padding:.5em 0 0 .5em;
text-align:left;
position: relative;
}
@@ -229,7 +229,7 @@ header option {
/* =userlinks */
#userlinksdiv {
- margin: 0 .8em;
+ padding: 0 1em 0 0;
text-align: right;
}
#userlinksdiv li {
@@ -240,7 +240,7 @@ header option {
/* =quicknav */
#quicknavdiv {
- padding:0 .8em .6em 0;
+ padding:0 1em .8em 0;
}
#quicknav {
@@ -264,6 +264,7 @@ header nav label,
#hamburgermenudiv {
flex: 1;
+ padding-top: .2em;
}
/* =tabGenerator */
@@ -863,7 +864,7 @@ input::-webkit-inner-spin-button { -webkit-appearance:
none; }
/* =hamburgerMenuOn */
header nav label {
cursor: pointer;
- padding: 0 .8em;
+ padding: .8em 0 0 .8em;
display: inline-block;
}
@@ -876,6 +877,10 @@ div[role="search"] {
display: none;
}
+#quicknavdiv {
+ padding: 0 1em .6em 0;
+}
+
#menudiv,
#userlinkshamburgerdiv {
display: block;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bea3ed9a6253370428c214153a8a3f5eb77b2fa4
commit bea3ed9a6253370428c214153a8a3f5eb77b2fa4
Author: Guy Morin <guy@guy-90X3A>
Date: Wed Mar 31 16:17:49 2021 +0200
Forum translation
diff --git a/src/locale/fr.po b/src/locale/fr.po
index 68c3b15..df3077f 100644
--- a/src/locale/fr.po
+++ b/src/locale/fr.po
@@ -76,6 +76,7 @@ msgstr "Message"
#: common/docman/views/notifyusers.php:56
#: common/docman/views/notifyusers.php:60 common/docman/views/reporting.php:89
#: common/docman/views/reporting.php:91 common/forum/ForumHTML.class.php:85
+#: common/forum/ForumHTML.class.php:152 common/forum/ForumHTML.class.php:156
#: common/forum/ForumHTML.class.php:509 common/frs/FRSPackage.class.php:636
#: common/frs/FRSRelease.class.php:325 common/frs/FRSRelease.class.php:328
#: common/frs/FRSRelease.class.php:332 common/frs/views/admin.php:66
@@ -1231,7 +1232,8 @@ msgstr "Erreur"
#: www/export/rss_project.php:103 www/export/rss_project.php:109
#: www/export/rss_project.php:115 www/export/rss_project.php:121
#: www/forum/admin/index.php:156 www/forum/admin/pendingmsgdetail.php:59
-#: www/forum/forum.php:58 www/forum/forum.php:95 www/forum/forum.php:160
+#: www/forum/forum.php:56 www/forum/forum.php:58
+#: www/forum/forum.php:95 www/forum/forum.php:160
#: www/forum/message.php:128 www/frs/r_follow.php:45
#: www/include/features_boxes.php:152 www/include/features_boxes.php:162
#: www/include/html.php:1168 www/include/html.php:1171
@@ -4491,6 +4493,14 @@ msgstr "Pièces jointes"
msgid "Edit Message"
msgstr "Modifier un message"
+#: common/forum/ForumHTML.class.php:152
+msgid "Unpin this thread"
+msgstr "Désépingler cette discussion"
+
+#: common/forum/ForumHTML.class.php:156
+msgid "Pin this thread"
+msgstr "Épingler cette discussion"
+
#: common/forum/ForumHTML.class.php:509 common/forum/ForumHTML.class.php:571
#: plugins/forumml/www/index.php:110 www/admin/massmail.php:128
#: www/admin/massmail.php:150 www/admin/pending-news.php:143
@@ -22599,6 +22609,10 @@ msgstr "Pièce jointe enregistrée"
msgid "No attachment found"
msgstr "Aucune pièce jointe trouvée"
+#: www/forum/forum.php:56
+msgid "Pinned thread"
+msgstr "Discussion épinglée"
+
#: www/forum/forum.php:58
msgid "Forum not found"
msgstr "Forum non trouvé"
diff --git a/src/locale/fusionforge.pot b/src/locale/fusionforge.pot
index 652b6f8..012706e 100644
--- a/src/locale/fusionforge.pot
+++ b/src/locale/fusionforge.pot
@@ -52,6 +52,7 @@ msgstr ""
#: common/docman/views/notifyusers.php:56
#: common/docman/views/notifyusers.php:60 common/docman/views/reporting.php:89
#: common/docman/views/reporting.php:91 common/forum/ForumHTML.class.php:85
+#: common/forum/ForumHTML.class.php:152 common/forum/ForumHTML.class.php:156
#: common/forum/ForumHTML.class.php:509 common/frs/FRSPackage.class.php:636
#: common/frs/FRSRelease.class.php:325 common/frs/FRSRelease.class.php:328
#: common/frs/FRSRelease.class.php:332 common/frs/views/admin.php:66
@@ -1224,7 +1225,8 @@ msgstr ""
#: www/export/rss_project.php:103 www/export/rss_project.php:109
#: www/export/rss_project.php:115 www/export/rss_project.php:121
#: www/forum/admin/index.php:156 www/forum/admin/pendingmsgdetail.php:59
-#: www/forum/forum.php:58 www/forum/forum.php:95 www/forum/forum.php:160
+#: www/forum/forum.php:56 www/forum/forum.php:58
+#: www/forum/forum.php:95 www/forum/forum.php:160
#: www/forum/message.php:128 www/frs/r_follow.php:45
#: www/include/features_boxes.php:152 www/include/features_boxes.php:162
#: www/include/user_home.php:64 www/new/index.php:92 www/new/index.php:97
@@ -4312,6 +4314,14 @@ msgstr ""
msgid "Edit Message"
msgstr ""
+#: common/forum/ForumHTML.class.php:152
+msgid "Unpin this thread"
+msgstr ""
+
+#: common/forum/ForumHTML.class.php:156
+msgid "Pin this thread"
+msgstr ""
+
#: common/forum/ForumHTML.class.php:509 common/forum/ForumHTML.class.php:571
#: plugins/forumml/www/index.php:110 www/admin/massmail.php:128
#: www/admin/massmail.php:150 www/admin/pending-news.php:143
@@ -21861,6 +21871,10 @@ msgstr ""
msgid "No attachment found"
msgstr ""
+#: www/forum/forum.php:56
+msgid "Pinned thread"
+msgstr ""
+
#: www/forum/forum.php:58
msgid "Forum not found"
msgstr ""
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a6da4b53eca6e4510f07b7f385f47ebf64322dad
commit a6da4b53eca6e4510f07b7f385f47ebf64322dad
Author: Guy Morin <guy@guy-90X3A>
Date: Wed Mar 31 16:16:48 2021 +0200
Visited header link
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index b63464f..129fd79 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -153,7 +153,7 @@ header logo {
margin-left: .5em;
}
-header a {
+header a, header a:visited {
color: #eee;
font-size: .9em;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b47fec69f783cc67aa58bfac095212a5ecb1dd30
commit b47fec69f783cc67aa58bfac095212a5ecb1dd30
Author: Guy Morin <guy@guy-90X3A>
Date: Tue Mar 30 16:48:48 2021 +0200
Feedback text
diff --git a/src/www/forum/forum.php b/src/www/forum/forum.php
index 984577c..cd25b84 100644
--- a/src/www/forum/forum.php
+++ b/src/www/forum/forum.php
@@ -53,7 +53,7 @@ if (forge_check_perm('forum_admin', $group_id) &&
($thread_id)) {
}
if($pin === 't') {
unset($thread_id);
- $feedback = 'Discussion épinglée';
+ $feedback = _('Pinned thread');
}
unset($pin);
}
-----------------------------------------------------------------------
Summary of changes:
src/locale/fr.po | 16 +++++++++++++++-
src/locale/fusionforge.pot | 16 +++++++++++++++-
src/www/forum/forum.php | 2 +-
src/www/themes/funky-guy/css/theme.css | 17 +++++++++++------
4 files changed, 42 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
