You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2022/09/14 08:52:53 UTC

[groovy-website] branch asf-site updated: remove some outdated information

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 62b9566  remove some outdated information
62b9566 is described below

commit 62b9566ae2082b9aedeaa446226d65fc50046844
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Sep 14 18:52:01 2022 +1000

    remove some outdated information
---
 site/src/site/assets/css/style.css       | 15 ++++++++++-----
 site/src/site/includes/bottommenu.groovy | 12 ++++++++----
 site/src/site/pages/contribute.groovy    | 17 +++--------------
 site/src/site/sitemap-dev.groovy         |  1 -
 site/src/site/sitemap-user.groovy        | 17 -----------------
 5 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/site/src/site/assets/css/style.css b/site/src/site/assets/css/style.css
index 96919de..e31dbe0 100644
--- a/site/src/site/assets/css/style.css
+++ b/site/src/site/assets/css/style.css
@@ -303,13 +303,18 @@ code, kbd, pre, samp {
     color: #db4800;
 }
 
-.colset-3-footer .col-1, .colset-3-footer .col-2, .colset-3-footer .col-3 {
-    min-width: 180px;
+.colset-3-footer .col-1 {
+    min-width: 140px;
+    float: left;
+}
+
+.colset-3-footer .col-2, .colset-3-footer .col-3 {
+    min-width: 160px;
     float: left;
 }
 
 .colset-3-footer .col-3 {
-    min-width: 220px;
+    min-width: 200px;
 }
 
 .colset-3-article article {
@@ -405,9 +410,9 @@ h8 {
 
 #footer .col-right {
     float: right;
-    width: 300px;
+    width: 450px;
     text-align: right;
-    padding-top: 10px
+    padding-top: 5px
 }
 
 #footer .colset-3-footer {
diff --git a/site/src/site/includes/bottommenu.groovy b/site/src/site/includes/bottommenu.groovy
index fb044db..d323f54 100644
--- a/site/src/site/includes/bottommenu.groovy
+++ b/site/src/site/includes/bottommenu.groovy
@@ -16,14 +16,18 @@ footer(id: 'footer') {
             }
             div(class: 'col-right') {
                 p {
-                    yield "The Groovy programming language is supported by the " 
+                    yield 'The Groovy programming language is supported by the '
+                    br()
                     a href: 'http://www.apache.org', 'Apache Software Foundation'
-                    yield " and the Groovy community"
+                    yield " and the Groovy community."
                 }
-                img(src: relative('img/asf_logo.png'), title: 'The Apache Software Foundation', alt: 'The Apache Software Foundation', class:'img-responsive')
+                div('text-align':'right') {
+                    img(src: relative('img/asf_logo.png'), title: 'The Apache Software Foundation', alt: 'The Apache Software Foundation', style:'width:60%')
+                }
+                p "Apache&reg; and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation."
             }
         }
         div(class: 'clearfix', "&copy; 2003-${Calendar.instance[Calendar.YEAR]} the Apache Groovy project &mdash; " +
-                "Groovy is Open Source, ${$a(href: 'http://www.apache.org/licenses/LICENSE-2.0.html', 'Apache 2 License')}")
+                "Groovy is Open Source, ${$a(href: 'http://www.apache.org/licenses/LICENSE-2.0.html', 'Apache 2 License')}. ${$a(href: 'https://privacy.apache.org/policies/privacy-policy-public.html', 'Privacy policy')}.")
     }
 }
diff --git a/site/src/site/pages/contribute.groovy b/site/src/site/pages/contribute.groovy
index 5e72eae..46459f0 100644
--- a/site/src/site/pages/contribute.groovy
+++ b/site/src/site/pages/contribute.groovy
@@ -2,7 +2,7 @@ layout 'layouts/main.groovy', true,
         pageTitle: 'The Apache Groovy programming language - Contribute',
         mainContent: contents {
             div(id: 'content', class: 'page-1') {
-                div(class: 'row') {
+                section(class: 'row') {
                     div(class: 'row-fluid') {
                         div(class: 'col-lg-8 col-lg-pull-0') {
                             include template: 'includes/contribute-button.groovy'
@@ -205,7 +205,7 @@ layout 'layouts/main.groovy', true,
                                     }
                                 }
                             }
-							
+
                             hr(class: 'divider')
 
                             h2('Donating to Friends of Groovy Open Collective')
@@ -215,24 +215,13 @@ layout 'layouts/main.groovy', true,
 								${$a(href:'https://opencollective.com/friends-of-groovy', 'Friends of Groovy Open Collective')}
 								This initiative is designed to complement the Apache project and the many contributions we get from our great community and supporters.
 							"""
-							
+
                             hr(class: 'divider')
 
                             h2('Build status')
 
                             p "The Groovy sources are tested thanks to our ${$a(href:'buildstatus.html','continuous integration server')}."
-							
-							hr(class: 'divider')
 
-                            h2('Help Wanted')
-
-                            p {
-                                yield "We try to keep a list of tasks that we would greatly appreciate help with in the Apache "
-                                a(href: 'https://helpwanted.apache.org/', 'Help Wanted')
-                                yield " app:"
-                            }
-                            div(style: "width: 100%; margin-left: 0px; margin-right: 0px;", type:"helpwanted", project:"groovy", description:"the Apache Groovy Project")
-                            script(src: "https://helpwanted.apache.org/widget.js", type: "text/javascript")
                         }
                     }
                 }
diff --git a/site/src/site/sitemap-dev.groovy b/site/src/site/sitemap-dev.groovy
index 7a25c7f..623cade 100644
--- a/site/src/site/sitemap-dev.groovy
+++ b/site/src/site/sitemap-dev.groovy
@@ -44,7 +44,6 @@ menu {
 
     group('Socialize') {
         item 'Discuss on the mailing-list', "${userSiteBase}mailing-lists.html",                'fa-envelope'
-        item 'Groovy newsletter',           "${userSiteBase}groovy-weekly.html",                'fa-envelope-o'
         item 'Groovy on Twitter',           'https://twitter.com/ApacheGroovy',                 'fa-twitter'
         item 'Events and conferences',      "${userSiteBase}events.html",                       'fa-calendar'
         item 'Source code on GitHub',       'https://github.com/apache/groovy',                 'fa-github'
diff --git a/site/src/site/sitemap-user.groovy b/site/src/site/sitemap-user.groovy
index 5a724e4..a95a63e 100644
--- a/site/src/site/sitemap-user.groovy
+++ b/site/src/site/sitemap-user.groovy
@@ -42,7 +42,6 @@ menu {
 
     group('Socialize') {
         item 'Discuss on the mailing-list', 'mailing-lists.html',                               'fa-envelope'
-        item 'Groovy newsletter',           'groovy-weekly.html',                               'fa-envelope-o'
         item 'Groovy on Twitter',           'https://twitter.com/ApacheGroovy',                 'fa-twitter'
         item 'Events and conferences',      'events.html',                                      'fa-calendar'
         item 'Source code on GitHub',       'https://github.com/apache/groovy',                 'fa-github'
@@ -230,22 +229,6 @@ allEvents {
             plus some special events like BoF sessions and other surprises.</p>
         '''
     }
-    event('GR8Conf & JDK IO') {
-        location 'Copenhagen, Denmark'
-        date 'November 16-17, 2022'
-        url 'http://gr8conf.eu/'
-        logo 'img/confs/gr8conf-jdkio.svg'
-        description '''
-            <p>
-            Since 2009, GR8Conf has provided a high-quality conference experience for the tight-knit
-            Apache Groovy programming language community. This year, we are joining forces with JDK IO - an annual
-            conference run by the Danish Java user group covering technologies relevant to the entire JVM.
-            The combined conference will be known as GR8Conf & JDK IO and will focus on All Things Groovy
-            and Java, with DevOps, Microservices and Frontend Technologies sprinkled in.
-            </p>
-            <p>We feature the Hackergarten and have an awesome Meet & Greet with craft beers brewed by the crew!</p>
-        '''
-    }
 }
 
 books {