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 1880fdf639adb46ed7c814cb90cba49d26b8147b (commit)
via bc00764fabf4d05c7c7af06919ceb6660e167cca (commit)
via 645c1ab10689953d16fbe442a663d6063585fdb3 (commit)
via 67b96108851cb97220c7d14b9059ba6748a85fa8 (commit)
via 99b26f5240e1dbd1d32614e0e30bf0437f0079e1 (commit)
via 7789f0aaa60f77b719cc4ae6622a1239cf975261 (commit)
via 329ba9d1c33e3f78a1174188d1f91eb6bddd70bf (commit)
via 84a3076dd90368688913239bd1abc241530d2d9a (commit)
via d9c7cd509b80961a183f2e8a8c0caefd9ab529a8 (commit)
via 8675ce2f96af022d727defab8170e6bffaea43be (commit)
via 322725753f36f9fd1be52f5c909c1d908c6b39d4 (commit)
via 1358b0e8f5ef4aca5091af26360fe5fca2d092c4 (commit)
from e1426872b5593ad2a0ada0ed22faea5e7c2d794f (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=1880fdf639adb46ed7c814cb90cba49d26b8147b
commit 1880fdf639adb46ed7c814cb90cba49d26b8147b
Author: Franck Villaume <[email protected]>
Date: Mon Aug 16 13:16:45 2021 +0200
fix PHP syntax
diff --git a/src/common/include/html.php b/src/common/include/html.php
index 1401b9c..c1d4b26 100644
--- a/src/common/include/html.php
+++ b/src/common/include/html.php
@@ -1614,13 +1614,11 @@ function html_trove_limit_navigation_box($php_self,
$querytotalcount, $trove_bro
$html_limit .= html_e('strong', array(), $ahrefcontent);
} else {
$getChar = '?';
- if (strpos($php_self, $getChar)) {
- $getChar = '&';
- }
- $html_limit .=
- util_make_link($php_self.$getChar.'page='.$i,
$ahrefcontent);
- }
-
+ if (strpos($php_self, $getChar)) {
+ $getChar = '&';
+ }
+ $html_limit .=
+ util_make_link($php_self.$getChar.'page='.$i,
$ahrefcontent);
}
$html_limit .= ' ';
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bc00764fabf4d05c7c7af06919ceb6660e167cca
commit bc00764fabf4d05c7c7af06919ceb6660e167cca
Author: Franck Villaume <[email protected]>
Date: Mon Aug 16 13:16:34 2021 +0200
clean-up tabs
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index cba9315..74c0538 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -105,28 +105,27 @@ class Theme_Funky_Guy extends Layout {
// Back to top button
echo html_ao('script', array('type' => 'text/javascript'));
echo '
- $(document).ready(function(){
- //Check to see if the window is top if not then display button
- $(window).scroll(function(){
- // Show button after 200px
- var showAfter = 200;
- if ($(this).scrollTop() > showAfter ) {
- $("#backToTop").fadeIn(800);
- } else {
- $("#backToTop").fadeOut(800);
- }
- });
+ jQuery(document).ready(function() {
+ //Check to see if the window is top if not then
display button
+ jQuery(window).scroll(function(){
+ // Show button after 200px
+ var showAfter = 200;
+ if (jQuery(this).scrollTop() >
showAfter ) {
+
jQuery("#backToTop").fadeIn(800);
+ } else {
+
jQuery("#backToTop").fadeOut(800);
+ }
+ });
- //Click event to scroll to top
- $("#backToTop").click(function(){
- $("html, body").animate({scrollTop : 0},800);
- return false;
- });
-
- });
- ';
+ //Click event to scroll to top
+ jQuery("#backToTop").click(function(){
+ jQuery("html, body").animate({scrollTop
: 0},800);
+ return false;
+ });
+
+ });
+ ';
echo html_ac(html_ap() -1); // </script>
-
}
function hamburgerButton() {
@@ -258,23 +257,23 @@ class Theme_Funky_Guy extends Layout {
// Loader
echo html_ao('script');
echo '
- var loader = document.getElementById("loader");
- function loadSubmit(event) {
- loader.style.top = "0";
- loader.classList.add("loading");
- }
- function unloadSubmit() {
- loader.style.top = "-100%";
- loader.classList.remove("loading");
- }
- loader.addEventListener("mouseup", unloadSubmit);
- var max = document.getElementsByTagName("FORM").length;
- if(max > 0){
- for (let i = 0 ; i < max ; i++){
- document.forms[i].addEventListener("submit", loadSubmit);
- }
- }
- ';
+ var loader = document.getElementById("loader");
+ function loadSubmit(event) {
+ loader.style.top = "0";
+ loader.classList.add("loading");
+ }
+ function unloadSubmit() {
+ loader.style.top = "-100%";
+ loader.classList.remove("loading");
+ }
+ loader.addEventListener("mouseup", unloadSubmit);
+ var max = document.getElementsByTagName("FORM").length;
+ if(max > 0){
+ for (let i = 0 ; i < max ; i++){
+
document.forms[i].addEventListener("submit", loadSubmit);
+ }
+ }
+ ';
echo html_ac(html_ap() -1); // </script>
echo '</html>' . "\n";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=645c1ab10689953d16fbe442a663d6063585fdb3
commit 645c1ab10689953d16fbe442a663d6063585fdb3
Merge: e142687 67b9610
Author: Franck Villaume <[email protected]>
Date: Mon Aug 16 12:55:45 2021 +0200
Merge remote-tracking branch 'gmorin/master'
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=67b96108851cb97220c7d14b9059ba6748a85fa8
commit 67b96108851cb97220c7d14b9059ba6748a85fa8
Author: Guy Morin <guy@guy-90X3A>
Date: Thu Aug 12 19:12:31 2021 +0200
Fix trove navigation
diff --git a/src/common/include/html.php b/src/common/include/html.php
index 17bfb0c..1401b9c 100644
--- a/src/common/include/html.php
+++ b/src/common/include/html.php
@@ -1613,7 +1613,14 @@ function html_trove_limit_navigation_box($php_self,
$querytotalcount, $trove_bro
if ($page == $i) {
$html_limit .= html_e('strong', array(), $ahrefcontent);
} else {
- $html_limit .= util_make_link($php_self.'?page='.$i,
$ahrefcontent);
+ $getChar = '?';
+ if (strpos($php_self, $getChar)) {
+ $getChar = '&';
+ }
+ $html_limit .=
+ util_make_link($php_self.$getChar.'page='.$i,
$ahrefcontent);
+ }
+
}
$html_limit .= ' ';
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=99b26f5240e1dbd1d32614e0e30bf0437f0079e1
commit 99b26f5240e1dbd1d32614e0e30bf0437f0079e1
Author: Guy Morin <guy@guy-90X3A>
Date: Tue Aug 10 09:29:03 2021 +0200
Delete useless line
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index 7130f8f..cba9315 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -259,7 +259,6 @@ class Theme_Funky_Guy extends Layout {
echo html_ao('script');
echo '
var loader = document.getElementById("loader");
- var backToTop = document.getElementById("backToTop");
function loadSubmit(event) {
loader.style.top = "0";
loader.classList.add("loading");
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7789f0aaa60f77b719cc4ae6622a1239cf975261
commit 7789f0aaa60f77b719cc4ae6622a1239cf975261
Author: Guy Morin <guy@guy-90X3A>
Date: Tue Aug 10 09:00:18 2021 +0200
Loader position fixed
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index 1707118..7130f8f 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -261,9 +261,6 @@ class Theme_Funky_Guy extends Layout {
var loader = document.getElementById("loader");
var backToTop = document.getElementById("backToTop");
function loadSubmit(event) {
- $("html, body").animate({ scrollTop: 0 }, 200);
- $("#backToTop").hide();
- $("#backToTop").removeAttr("id");
loader.style.top = "0";
loader.classList.add("loading");
}
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index c6d47f7..72ec1cc 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -707,12 +707,13 @@ footer img {
#loader {
display: flex;
background: #0006;
- position: absolute;
+ position: fixed;
top: -100%;
left: 0;
width: 100%;
height: 100%;
opacity: 0;
+ z-index: 99;
}
.loading {
opacity: 1 !important;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=329ba9d1c33e3f78a1174188d1f91eb6bddd70bf
commit 329ba9d1c33e3f78a1174188d1f91eb6bddd70bf
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Aug 9 21:52:45 2021 +0200
Modify opacity
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index e85f4a7..c6d47f7 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -237,7 +237,7 @@ header option {
display: none;
}
#backToTop:hover,#backToTop:active {
- background-color: #fff9;
+ background-color: #fff;
border-color:#789;
cursor: pointer;
transition: background-color 0.8s ease;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=84a3076dd90368688913239bd1abc241530d2d9a
commit 84a3076dd90368688913239bd1abc241530d2d9a
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Aug 9 21:50:58 2021 +0200
Add opacity
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index a6f1b0c..e85f4a7 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -219,10 +219,10 @@ header option {
/* =backToTop */
#backToTop {
position: fixed;
- background-color:#dfdfdf;
+ background-color:#dfdfdf99;
border: 1px solid #abc;
bottom: 4.5em;
- color: #505d77;
+ color: #21293C;
font-size: .8em;
font-weight: bold;
right: calc(50% - 5em);
@@ -237,7 +237,7 @@ header option {
display: none;
}
#backToTop:hover,#backToTop:active {
- background-color: #fff;
+ background-color: #fff9;
border-color:#789;
cursor: pointer;
transition: background-color 0.8s ease;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d9c7cd509b80961a183f2e8a8c0caefd9ab529a8
commit d9c7cd509b80961a183f2e8a8c0caefd9ab529a8
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Aug 9 19:31:59 2021 +0200
More hide a button
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index 02347fc..1707118 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -111,9 +111,9 @@ class Theme_Funky_Guy extends Layout {
// Show button after 200px
var showAfter = 200;
if ($(this).scrollTop() > showAfter ) {
- $("#backToTop").fadeIn(800);
+ $("#backToTop").fadeIn(800);
} else {
- $("#backToTop").fadeOut(800);
+ $("#backToTop").fadeOut(800);
}
});
@@ -122,7 +122,7 @@ class Theme_Funky_Guy extends Layout {
$("html, body").animate({scrollTop : 0},800);
return false;
});
-
+
});
';
echo html_ac(html_ap() -1); // </script>
@@ -259,9 +259,11 @@ class Theme_Funky_Guy extends Layout {
echo html_ao('script');
echo '
var loader = document.getElementById("loader");
+ var backToTop = document.getElementById("backToTop");
function loadSubmit(event) {
$("html, body").animate({ scrollTop: 0 }, 200);
- $("#backToTop").fadeOut(200);
+ $("#backToTop").hide();
+ $("#backToTop").removeAttr("id");
loader.style.top = "0";
loader.classList.add("loading");
}
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index 95bce71..a6f1b0c 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -230,7 +230,7 @@ header option {
padding: .5em 0;
border-radius: 1em;
text-align: center;
- z-index: 9999;
+ z-index: 19;
cursor: pointer;
text-decoration: none;
transition: background-color 0.8s ease;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8675ce2f96af022d727defab8170e6bffaea43be
commit 8675ce2f96af022d727defab8170e6bffaea43be
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Aug 9 18:46:10 2021 +0200
Hide a button
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index 89a0d39..02347fc 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -261,6 +261,7 @@ class Theme_Funky_Guy extends Layout {
var loader = document.getElementById("loader");
function loadSubmit(event) {
$("html, body").animate({ scrollTop: 0 }, 200);
+ $("#backToTop").fadeOut(200);
loader.style.top = "0";
loader.classList.add("loading");
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=322725753f36f9fd1be52f5c909c1d908c6b39d4
commit 322725753f36f9fd1be52f5c909c1d908c6b39d4
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Aug 9 18:30:34 2021 +0200
Back to top button
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index e92d408..89a0d39 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -96,11 +96,37 @@ class Theme_Funky_Guy extends Layout {
);'."\n";
}
echo html_ac(html_ap() -1);
+ // Hamburger button
echo html_ao('script', array('type' => 'text/javascript'));
echo 'function checkMenu(){
document.getElementById("hamburgerButton").checked =
true;
}';
- echo html_ac(html_ap() -1);
+ echo html_ac(html_ap() -1); // </script>
+ // Back to top button
+ echo html_ao('script', array('type' => 'text/javascript'));
+ echo '
+ $(document).ready(function(){
+ //Check to see if the window is top if not then display button
+ $(window).scroll(function(){
+ // Show button after 200px
+ var showAfter = 200;
+ if ($(this).scrollTop() > showAfter ) {
+ $("#backToTop").fadeIn(800);
+ } else {
+ $("#backToTop").fadeOut(800);
+ }
+ });
+
+ //Click event to scroll to top
+ $("#backToTop").click(function(){
+ $("html, body").animate({scrollTop : 0},800);
+ return false;
+ });
+
+ });
+ ';
+ echo html_ac(html_ap() -1); // </script>
+
}
function hamburgerButton() {
@@ -124,7 +150,9 @@ class Theme_Funky_Guy extends Layout {
} else {
$params['title'] = $params['title'] . " -
".forge_get_config('forge_name');
}
-
+ echo html_ao('a', array('href' => '#', 'id' => 'backToTop'));
+ echo "⇧ TOP ⇧"; // Upwards arrow character
+ echo html_ac(html_ap() -1); // </a>
echo html_ao('header', array('role' => 'banner'));
echo html_ao('nav', array('role' => 'navigation'));
@@ -230,24 +258,25 @@ class Theme_Funky_Guy extends Layout {
// Loader
echo html_ao('script');
echo '
- var loader = document.getElementById("loader");
- function loadSubmit(event) {
- loader.style.top = "0";
- loader.classList.add("loading");
- }
- function unloadSubmit() {
- loader.style.top = "-100%";
- loader.classList.remove("loading");
- }
- loader.addEventListener("mouseup", unloadSubmit);
- var max = document.getElementsByTagName("FORM").length;
- if(max > 0){
- for (let i = 0 ; i < max ; i++){
- document.forms[i].addEventListener("submit", loadSubmit);
- }
+ var loader = document.getElementById("loader");
+ function loadSubmit(event) {
+ $("html, body").animate({ scrollTop: 0 }, 200);
+ loader.style.top = "0";
+ loader.classList.add("loading");
+ }
+ function unloadSubmit() {
+ loader.style.top = "-100%";
+ loader.classList.remove("loading");
+ }
+ loader.addEventListener("mouseup", unloadSubmit);
+ var max = document.getElementsByTagName("FORM").length;
+ if(max > 0){
+ for (let i = 0 ; i < max ; i++){
+ document.forms[i].addEventListener("submit", loadSubmit);
}
- ';
- echo html_ac(html_ap() -1);
+ }
+ ';
+ echo html_ac(html_ap() -1); // </script>
echo '</html>' . "\n";
}
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index ec66a02..95bce71 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -216,17 +216,42 @@ header option {
background:#31394c;
}
+/* =backToTop */
+#backToTop {
+ position: fixed;
+ background-color:#dfdfdf;
+ border: 1px solid #abc;
+ bottom: 4.5em;
+ color: #505d77;
+ font-size: .8em;
+ font-weight: bold;
+ right: calc(50% - 5em);
+ width: 10em;
+ padding: .5em 0;
+ border-radius: 1em;
+ text-align: center;
+ z-index: 9999;
+ cursor: pointer;
+ text-decoration: none;
+ transition: background-color 0.8s ease;
+ display: none;
+}
+#backToTop:hover,#backToTop:active {
+ background-color: #fff;
+ border-color:#789;
+ cursor: pointer;
+ transition: background-color 0.8s ease;
+}
+
#searchBox input[type=text] {
- height: 1.8em;
- padding: .1em 26px .1em .4em;
- border-radius: .3em;
- border: 1px solid #789;
- display: inline;
- width: 9em;
- font-size: inherit;
- color: #fff;
- background: #31394c;
- box-shadow: none;
+ padding: .1em 26px .1em .4em;
+ border-radius: .3em;
+ border: 1px solid #789;
+ display: inline;
+ font-size: inherit;
+ color: #fff;
+ background: #31394c;
+ box-shadow: none;
}
#searchBox input[type=submit] {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1358b0e8f5ef4aca5091af26360fe5fca2d092c4
commit 1358b0e8f5ef4aca5091af26360fe5fca2d092c4
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Aug 9 15:58:59 2021 +0200
Loader allows back button event
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index e001648..e92d408 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -227,6 +227,7 @@ class Theme_Funky_Guy extends Layout {
echo html_ao('div', array('id' => 'loader'));
echo html_ao('div');
echo html_ac(html_ap() -2); // </div>
+ // Loader
echo html_ao('script');
echo '
var loader = document.getElementById("loader");
@@ -234,13 +235,18 @@ class Theme_Funky_Guy extends Layout {
loader.style.top = "0";
loader.classList.add("loading");
}
+ function unloadSubmit() {
+ loader.style.top = "-100%";
+ loader.classList.remove("loading");
+ }
+ loader.addEventListener("mouseup", unloadSubmit);
var max = document.getElementsByTagName("FORM").length;
- if( max > 0 ){
+ if(max > 0){
for (let i = 0 ; i < max ; i++){
document.forms[i].addEventListener("submit", loadSubmit);
}
}
- ';
+ ';
echo html_ac(html_ap() -1);
echo '</html>' . "\n";
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index 5fd0ba0..ec66a02 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -429,7 +429,7 @@ a.topTabSelected:hover {
border: 1px solid #c2c3c4;
border-radius: 6px;
padding:4px 8px 12px 8px;
- margin-bottom: 0;
+ margin-bottom: 1em;
box-shadow: 1px 1px 4px #c2c3c4;
}
@@ -645,7 +645,7 @@ table.listing tbody tr:nth-child(odd),
border-top-left-radius: 6px;
border-top-right-radius: 6px;
display: inline-block;
- padding: 4px 8px;
+ padding: 6px 8px 1px 8px;
}
.submenu a:hover {
color: #ff9;
@@ -704,6 +704,9 @@ footer img {
margin: auto;
z-index: 20;
}
+#backbuttonstate {
+ display: none;
+}
/* Safari */
@-webkit-keyframes spin {
@@ -882,7 +885,7 @@ input, select {
background-color: #e10;
border: none;
color: white;
- text-shadow: 0 0 1px #300;
+ text-shadow: 0 0 1px #960;
padding: .2em .4em;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/html.php | 7 +++-
src/www/themes/funky-guy/Theme.class.php | 63 ++++++++++++++++++++++++--------
src/www/themes/funky-guy/css/theme.css | 57 ++++++++++++++++++++++-------
3 files changed, 97 insertions(+), 30 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
