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 22f64a7b60c7328af0f7852047e42b8d77952120 (commit)
via cd8d3350dd94ef11fe812b5480d5cadb47b9c4f5 (commit)
via 7bd257d3f9252540b46281beee138d87741f47bb (commit)
via 7ec6c277ff1faf551a64c8768e3312f3440b8c39 (commit)
via f07643f501e0037e103efc2885d65fdc013d7b78 (commit)
from 7e397e62da5a2e7494bb7705bc02c6f6fa572e97 (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=22f64a7b60c7328af0f7852047e42b8d77952120
commit 22f64a7b60c7328af0f7852047e42b8d77952120
Merge: 7e397e6 cd8d335
Author: Franck Villaume <[email protected]>
Date: Tue Apr 13 19:02:42 2021 +0200
Merge remote-tracking branch 'gmorin/master'
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cd8d3350dd94ef11fe812b5480d5cadb47b9c4f5
commit cd8d3350dd94ef11fe812b5480d5cadb47b9c4f5
Author: Guy Morin <guy@guy-90X3A>
Date: Tue Apr 13 15:39:31 2021 +0200
Loader on submit
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index 6b1eb72..14757b7 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -223,6 +223,26 @@ class Theme_Funky_Guy extends Layout {
echo html_ac(html_ap() -1);
plugin_hook('webanalytics_url');
echo html_ac(html_ap() -1);
+
+ echo html_ao('div', array('id' => 'loader'));
+ echo html_ao('div');
+ echo html_ac(html_ap() -2); // </div>
+ echo html_ao('script');
+ echo '
+ var loader = document.getElementById("loader");
+ function loadSubmit(event) {
+ loader.style.top = "0";
+ loader.classList.add("loading");
+ }
+ 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>' . "\n";
}
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index f5fdbf9..ccde96e 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -665,6 +665,57 @@ table.listing tbody tr:nth-child(odd),
text-align:center;
}
+footer {
+ padding: 1.5em .5em .5em .5em;
+ background: #efefef;
+ border-top: 1px solid #ccc;
+ margin: 0;
+ text-align: center;
+ color: #dcdcdc;
+}
+
+footer img {
+ float: right;
+}
+
+/* loader */
+#loader {
+ display: flex;
+ background: #0006;
+ position: absolute;
+ top: -100%;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ opacity: 0;
+}
+.loading {
+ opacity: 1 !important;
+ ransition: opacity ease-in 1s;
+}
+#loader div {
+ border: 8px solid #fff;
+ border-radius: 50%;
+ border-top: 8px solid #0000;
+ width: 60px;
+ height: 60px;
+ -webkit-animation: spin 2s linear infinite; /* Safari */
+ animation: spin 2s linear infinite;
+ margin: auto;
+ z-index: 20;
+}
+
+/* Safari */
+@-webkit-keyframes spin {
+ 0% { -webkit-transform: rotate(0deg); }
+ 100% { -webkit-transform: rotate(360deg); }
+}
+
+@keyframes spin {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(360deg); }
+}
+
/* error_msg, warning_msg or feedback function
----------------------------------------------- */
span.active, span.deleted, span.pending, span.suspended {
@@ -744,19 +795,6 @@ p.information {
margin: 2px 3px 3px;
}
-footer {
- padding: 1.5em .5em .5em .5em;
- background: #efefef;
- border-top: 1px solid #ccc;
- margin: 0;
- text-align: center;
- color: #dcdcdc;
-}
-
-footer img {
- float: right;
-}
-
.info-box h2{
font-size: 1.3em;
border-radius: 0.5em 0.5em 0 0;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7bd257d3f9252540b46281beee138d87741f47bb
commit 7bd257d3f9252540b46281beee138d87741f47bb
Author: Guy Morin <guy@guy-90X3A>
Date: Tue Apr 13 11:01:13 2021 +0200
Padding
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index b7c3d7c..f5fdbf9 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -876,8 +876,8 @@ input::-webkit-inner-spin-button { -webkit-appearance:
none; }
@media only screen and (max-width:1023px) {
-nav {
- padding: 0 0 .3em 0;
+nav logo {
+ padding-bottom: .3em;
}
/* =hamburgerMenuOn */
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7ec6c277ff1faf551a64c8768e3312f3440b8c39
commit 7ec6c277ff1faf551a64c8768e3312f3440b8c39
Author: Guy Morin <guy@guy-90X3A>
Date: Mon Apr 12 15:30:29 2021 +0200
Skip links
diff --git a/src/www/themes/funky-wOw/css/theme.css
b/src/www/themes/funky-wOw/css/theme.css
index 6b312db..7ad69cc 100644
--- a/src/www/themes/funky-wOw/css/theme.css
+++ b/src/www/themes/funky-wOw/css/theme.css
@@ -113,6 +113,27 @@ hr {
height: 1px;
}
+/* =skipLinks */
+header .skipLink {
+ top: -5em;
+ opacity: 0;
+ padding: 1.5em;
+ position: absolute;
+ z-index: 20;
+ background-color: #F7F7F7;
+ border-left:1px solid #444;
+ border-right:1px solid #444;
+ border-bottom:1px solid #444;
+ border-bottom-left-radius: 6px;
+ border-bottom-right-radius: 6px;
+}
+
+header .skipLink:focus {
+ top: 0;
+ opacity: 1;
+ transition: all ease-out 0.3s;
+}
+
/* =header */
#header {
background: white url("../images/header/header-bg.png");
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index 39ddc10..d1646c5 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -109,7 +109,19 @@ class Theme_Funky extends Layout {
}
echo html_ao('header', array('role' => 'banner'));
+
+ $skipToContent = _('Skip to content');
+ $skipToMenu = _('Skip to menu');
+ echo html_ao('a', array('href' => '#content', 'class' =>
'skipLink'));
+ echo $skipToContent;
+ echo html_ac(html_ap() -1); // </a>
+ echo html_ao('a', array('href' => '#menu', 'class' =>
'skipLink',
+ 'onclick' => 'checkMenu()'));
+ echo $skipToMenu;
+ echo html_ac(html_ap() -1); // </a>
+
echo $this->listTableTop(array(), array(), 'fullwidth',
'header');
+ echo util_make_link('#', null, array('id' => 'menu', 'name' =>
'menu'));
$cells = array();
$cells[] = array(util_make_link('/',
html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge
Home'))), 'id' => 'header-col1');
$items = $this->navigation->getUserLinks();
@@ -136,6 +148,7 @@ class Theme_Funky extends Layout {
echo html_ac(html_ap() -1); // </nav>
echo html_ac(html_ap() -1); // </header>
+ echo util_make_link('#', null, array('id' => 'content', 'name'
=> 'content'));
echo html_ao('main', array('id' => 'maindiv', 'role' =>
'main'));
plugin_hook('message');
diff --git a/src/www/themes/funky/css/theme.css
b/src/www/themes/funky/css/theme.css
index 711b24b..c36b0a2 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -113,6 +113,27 @@ hr {
height: 1px;
}
+/* =skipLinks */
+header .skipLink {
+ top: -5em;
+ opacity: 0;
+ padding: 1.5em;
+ position: absolute;
+ z-index: 20;
+ background-color: #F7F7F7;
+ border-left:1px solid #444;
+ border-right:1px solid #444;
+ border-bottom:1px solid #444;
+ border-bottom-left-radius: 6px;
+ border-bottom-right-radius: 6px;
+}
+
+header .skipLink:focus {
+ top: 0;
+ opacity: 1;
+ transition: all ease-out 0.3s;
+}
+
/* =header */
#header {
background: white url("../images/header/header-bg.png");
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f07643f501e0037e103efc2885d65fdc013d7b78
commit f07643f501e0037e103efc2885d65fdc013d7b78
Author: Guy Morin <guy@guy-90X3A>
Date: Fri Apr 9 16:13:27 2021 +0200
Skip links and transition effect
diff --git a/src/www/themes/funky-guy/Theme.class.php
b/src/www/themes/funky-guy/Theme.class.php
index 7d4514c..6b1eb72 100644
--- a/src/www/themes/funky-guy/Theme.class.php
+++ b/src/www/themes/funky-guy/Theme.class.php
@@ -96,6 +96,11 @@ class Theme_Funky_Guy extends Layout {
);'."\n";
}
echo html_ac(html_ap() -1);
+ echo html_ao('script', array('type' => 'text/javascript'));
+ echo 'function checkMenu(){
+ document.getElementById("hamburgerButton").checked =
true;
+ }';
+ echo html_ac(html_ap() -1);
}
function hamburgerButton() {
@@ -122,13 +127,23 @@ class Theme_Funky_Guy extends Layout {
echo html_ao('header', array('role' => 'banner'));
echo html_ao('nav', array('role' => 'navigation'));
+
+ $skipToContent = _('Skip to content');
+ $skipToMenu = _('Skip to menu');
+ echo html_ao('a', array('href' => '#content', 'class' =>
'skipLink'));
+ echo $skipToContent;
+ echo html_ac(html_ap() -1); // </a>
+ echo html_ao('a', array('href' => '#menu', 'class' =>
'skipLink',
+ 'onclick' => 'checkMenu()'));
+ echo $skipToMenu;
+ echo html_ac(html_ap() -1); // </a>
+
echo $this->hamburgerButton();
echo html_ao('logo');
echo util_make_link('/', html_image('header/header-logo.png',
null, null, array('alt'=>'FusionForge Home', 'height'=>'40')));
echo html_ac(html_ap() -1); // </logo>
echo $this->searchBox();
- echo html_ao('div', array('id' => 'userlinksdiv'));
- echo html_ao('ul');
+
$items = $this->navigation->getUserLinks();
for ($j = 0; $j < count($items['titles']); $j++) {
$links[] = html_ao('li')
@@ -138,10 +153,14 @@ class Theme_Funky_Guy extends Layout {
$params['links'] = &$links;
plugin_hook('headermenu', $params);
$template = isset($params['template']) ? $params['template'] :
null;
+
+ echo html_ao('div', array('id' => 'userlinksdiv'));
+ echo html_ao('ul');
echo implode($template, $links);
echo html_ac(html_ap() -1); // </ul>
echo html_ac(html_ap() -1); // </div> #userlinkdiv
+ echo util_make_link('#', null, array('id' => 'menu', 'name' =>
'menu'));
echo html_ao('div', array('id' => 'menudiv'));
echo html_ao('input', array('id' => 'hamburgerButton', 'type'
=> 'checkbox'));
echo html_ac(html_ap() -1); // </input>
@@ -150,10 +169,11 @@ class Theme_Funky_Guy extends Layout {
echo html_ac(html_ap() -1); // </div> #hamburgermenudiv
echo html_ao('div', array('id' => 'userlinkshamburgerdiv'));
echo html_ao('ul');
- echo implode($template, $links);
+ echo implode($template, array_reverse($links));
echo html_ac(html_ap() -1); // </ul>
echo html_ac(html_ap() -1); // </div> #userlinkhamburgerdiv
echo html_ac(html_ap() -1); // </div> #menudiv
+
echo $this->quickNav();
echo '<!-- inner tabs -->' . "\n";
echo html_ao('div', array('class' => 'innertabs'));
@@ -165,6 +185,8 @@ class Theme_Funky_Guy extends Layout {
echo html_ac(html_ap() -1); // </nav>
echo html_ac(html_ap() -2); // </header>
+ echo util_make_link('#', null, array('id' => 'content', 'name'
=> 'content'));
+
echo html_ao('main', array('id' => 'maindiv', 'role' =>
'main'));
plugin_hook('message');
diff --git a/src/www/themes/funky-guy/css/theme.css
b/src/www/themes/funky-guy/css/theme.css
index 22dbfe8..b7c3d7c 100644
--- a/src/www/themes/funky-guy/css/theme.css
+++ b/src/www/themes/funky-guy/css/theme.css
@@ -7,7 +7,7 @@
* Copyright 2013-2014,2017, Franck Villaume - TrivialDev
* Copyright 2014, Benoit Debaenst - TrivialDev
* Copyright 2015, Roland Mas
- * Copyright 2021, Guy Morin
+ * Copyright 2021, Guy Morin - DGFiP
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -145,6 +145,21 @@ nav {
margin: auto;
}
+header .skipLink {
+ top: -5em;
+ opacity: 0;
+ padding: 1.5em;
+ position: absolute;
+ z-index: 20;
+ background-color: #21293C;
+}
+
+header .skipLink:focus {
+ top: 0;
+ opacity: 1;
+ transition: all ease-out 0.3s;
+}
+
header div {
color: #aaa;
}
@@ -861,6 +876,10 @@ input::-webkit-inner-spin-button { -webkit-appearance:
none; }
@media only screen and (max-width:1023px) {
+nav {
+ padding: 0 0 .3em 0;
+}
+
/* =hamburgerMenuOn */
header nav label {
cursor: pointer;
@@ -873,12 +892,9 @@ div[role="search"] {
}
#userlinksdiv,
-#quicknav {
- display: none;
-}
-
+#quicknav,
#quicknavdiv {
- padding: 0 1em .6em 0;
+ display: none;
}
#menudiv,
@@ -887,16 +903,21 @@ div[role="search"] {
width: 100%;
}
-#menudiv input,
-#menudiv input:not(:checked) ~ #hamburgermenudiv {
- display: none;
- height: 0;
- transition: all ease-in-out .9s;
+#menudiv input:checked ~ #hamburgermenudiv {
+ display: block;
+ height: auto;
+ max-height: 100vh;
+ opacity: 1;
+ visibility: visible;
+ transition: all ease-out .4s;
}
-#menudiv input:checked ~ #hamburgermenudiv {
+#menudiv input:not(:checked) ~ #hamburgermenudiv {
display: block;
- height: 100%;
+ height: 0;
+ max-height: 0;
+ opacity: 0;
+ visibility: hidden;
}
#hamburgermenudiv .tabGenerator {
@@ -928,10 +949,6 @@ div[role="search"] {
width: 100%;
}
-#userlinkshamburgerdiv ul {
- flex-direction: column-reverse;
-}
-
#userlinkshamburgerdiv li {
font-size: .9em;
}
-----------------------------------------------------------------------
Summary of changes:
src/www/themes/funky-guy/Theme.class.php | 48 ++++++++++++-
src/www/themes/funky-guy/css/theme.css | 115 +++++++++++++++++++++++--------
src/www/themes/funky-wOw/css/theme.css | 21 ++++++
src/www/themes/funky/Theme.class.php | 13 ++++
src/www/themes/funky/css/theme.css | 21 ++++++
5 files changed, 185 insertions(+), 33 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
