From 71fa4318e3e7993dadba574ed46a5e64aefee256 Mon Sep 17 00:00:00 2001 From: Ceki Gulcu Date: Sat, 22 Oct 2022 18:24:28 +0200 Subject: [PATCH] added sponsor box --- .gitattributes | 2 + loop.sh | 1 + mvni.sh | 50 +++++++++++++++++++ src/site/pages/codes.html | 9 ++-- src/site/pages/css/site3.css | 38 +++++--------- src/site/pages/docs.html | 5 +- src/site/pages/download.html | 1 + src/site/pages/extensions.html | 3 +- src/site/pages/faq.html | 3 +- src/site/pages/legacy.html | 2 +- src/site/pages/license.html | 3 ++ src/site/pages/localization.html | 2 +- src/site/pages/log4shell.html | 2 + src/site/pages/manual.html | 4 +- src/site/pages/migrator.html | 32 ++++-------- src/site/pages/news.html | 2 +- src/site/pages/templates/sponsoredBy.js | 15 ++++++ src/site/resources/images/logos/exoscale.png | Bin 0 -> 3879 bytes 18 files changed, 112 insertions(+), 62 deletions(-) create mode 100644 .gitattributes create mode 100644 loop.sh create mode 100644 mvni.sh create mode 100644 src/site/pages/templates/sponsoredBy.js create mode 100644 src/site/resources/images/logos/exoscale.png diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5ba3bf5 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +mvni.sh text eol=lf +loop.sh text eol=lf \ No newline at end of file diff --git a/loop.sh b/loop.sh new file mode 100644 index 0000000..63c097c --- /dev/null +++ b/loop.sh @@ -0,0 +1 @@ +java ~/skunk/scripts/src/main/java/ch/qos/FileWatcher.java src/site/pages c:/cygwin64/bin/bash -c "source mvni.sh" diff --git a/mvni.sh b/mvni.sh new file mode 100644 index 0000000..519fc69 --- /dev/null +++ b/mvni.sh @@ -0,0 +1,50 @@ + +function scpLogback() { + + echo ${ARGS} + SOURCE=/home/ceki/slf4j-site/target/site + + pushd $SOURCE + #i=0; + for file in ${ARGS} + do + echo "scp ${file} yvo.qos.ch:/var/www/logback.qos.ch/htdocs/${file}"; + scp ${file} yvo.qos.ch:/var/www/www.slf4j.org/htdocs/${file}; + #i=$((i + 1)); + done + popd +} + +function doRsync() { + ssh root@ge.qos.ch "rsync -r -p -z -l --exclude=log/ --delete rsync://yvo.qos.ch/www/www.slf4j.org /var/www" +} + + +ARGS="${@}" + +#echo "a0=${0}" +#echo "a1=${1}" +#echo "a2=${2}" +echo "ARGS=${ARGS}" + +echo "This is triggered command. Triggered by ${ARGS}" + +echo "JAVA_HOME=$JAVA_HOME" +echo "MAVEN_HOME=${MAVEN_HOME}" #=/java/maven-3.5.2/ + + +MVN_COMMAND=${MAVEN_HOME}/bin/mvn + +pushd ~/slf4j-site + +echo "======================" +${MVN_COMMAND} install +scpLogback; +doRsync; + +popd + +exit + + + diff --git a/src/site/pages/codes.html b/src/site/pages/codes.html index ddf1aba..4445d18 100644 --- a/src/site/pages/codes.html +++ b/src/site/pages/codes.html @@ -12,13 +12,12 @@ -
+
+ -
-

SLF4J warning or error messages and their meanings

+

SLF4J warning or error messages and their meanings

-
- + diff --git a/src/site/pages/css/site3.css b/src/site/pages/css/site3.css index 7ab067f..0d2b01e 100644 --- a/src/site/pages/css/site3.css +++ b/src/site/pages/css/site3.css @@ -83,31 +83,14 @@ img.sponsorIcon { height: var(--sponsor-icon-height); } -/** works kind of OK */ -/*pre code {*/ -/* white-space: pre-wrap!important;*/ -/* word-wrap: break-word;*/ -/* overflow-x: auto;*/ -/*}*/ - - -/*.example, pre, code {*/ - -/* white-space: pre-wrap;*/ -/* overflow-x: scroll;*/ -/* overflow: scroll;*/ -/* overflow-wrap: break-word; !* synonymous to word-wrap *!*/ -/*}*/ - - pre, div.bodyTable { overflow: auto; overflow-wrap: normal; } .example, pre > code { - word-break: normal; + /*word-break: normal;*/ white-space: pre; - overflow: visible; + overflow: auto; min-height: 2ex; /*overflow-wrap: normal; !* synonymous to word-wrap *!*!*/ /*white-space: pre;*/ @@ -182,6 +165,12 @@ div#ad, div#sponsor { float: right; + display: flex; + flex-direction: column; + justify-content: flex-start; + + max-width: 10rem; + border-color: #F00; margin: 0px; margin-top: 1rem; @@ -189,10 +178,6 @@ div#sponsor { padding: 0px; } -div.pub { - margin: 0px; - padding: 0px; -} p.sponsoredBy { padding: 2px; margin: 0px; @@ -202,7 +187,9 @@ p.sponsoredBy { border-top: solid 1px #CCCCCC; border-bottom: solid 1px #CCCCCC; } - +div.spotify { + background-color: #FFEEDD; +} img.spotify { max-height: calc(var(--main-logo-height)); } @@ -211,7 +198,6 @@ img.exoscale { max-height: calc(var(--main-logo-height) * 0.8); } - #content { /*grid-area: contentArea;*/ } @@ -386,7 +372,7 @@ div.license { background: #f5f5f5; } .source, .command, .console { - white-space: pre-wrap !important; + white-space: pre; overflow-x: auto; border-top: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD; diff --git a/src/site/pages/docs.html b/src/site/pages/docs.html index 5ccb11a..f4c8cf4 100644 --- a/src/site/pages/docs.html +++ b/src/site/pages/docs.html @@ -12,6 +12,7 @@
+

Documentation

@@ -25,9 +26,9 @@

Documentation

  • Bridging legacy APIs
  • SLF4J Migrator
  • Comments on the CVE-2021-44228 vulnerability
    • -
  • SLF4J extensions
    • + -
  • Localization/Internalization support
    • +
  • javadocs
  • diff --git a/src/site/pages/download.html b/src/site/pages/download.html index c6362c1..5712aeb 100644 --- a/src/site/pages/download.html +++ b/src/site/pages/download.html @@ -14,6 +14,7 @@
    +

    STABLE version

    diff --git a/src/site/pages/extensions.html b/src/site/pages/extensions.html index f79d57b..f33009f 100644 --- a/src/site/pages/extensions.html +++ b/src/site/pages/extensions.html @@ -12,9 +12,8 @@ -
    - +

    SLF4J extensions

    SLF4J extensions are packaged within slf4j-ext.jar diff --git a/src/site/pages/faq.html b/src/site/pages/faq.html index 4db4449..3cac248 100644 --- a/src/site/pages/faq.html +++ b/src/site/pages/faq.html @@ -13,7 +13,8 @@ -

    +
    +

    Frequently Asked Questions about SLF4J

    diff --git a/src/site/pages/legacy.html b/src/site/pages/legacy.html index e8bb31b..59a3e67 100644 --- a/src/site/pages/legacy.html +++ b/src/site/pages/legacy.html @@ -14,8 +14,8 @@
    - +

    Bridging legacy APIs

    Often, some of the components you depend on rely on a logging diff --git a/src/site/pages/license.html b/src/site/pages/license.html index 0120951..1048f22 100644 --- a/src/site/pages/license.html +++ b/src/site/pages/license.html @@ -15,6 +15,9 @@

    +

    Licensing terms for SLF4J

    diff --git a/src/site/pages/localization.html b/src/site/pages/localization.html index 3a9f62b..b5ac778 100644 --- a/src/site/pages/localization.html +++ b/src/site/pages/localization.html @@ -13,8 +13,8 @@
    - +

    Localization support

    A

    + +

    Comments on the log4shell(CVE-2021-44228) vulnerability

    diff --git a/src/site/pages/manual.html b/src/site/pages/manual.html index c53588c..b2221a3 100644 --- a/src/site/pages/manual.html +++ b/src/site/pages/manual.html @@ -14,8 +14,8 @@ -
    - +
    +

    SLF4J user manual

    diff --git a/src/site/pages/migrator.html b/src/site/pages/migrator.html index d44458e..df9b013 100644 --- a/src/site/pages/migrator.html +++ b/src/site/pages/migrator.html @@ -1,29 +1,20 @@ - + - - - + + + + SLF4J Migrator - - - - - + -
    - - -
    - -
    - + + -
    + +
    +

    SLF4J Migrator

    The SLF4J migrator is a small Java tool for migrating Java source @@ -229,6 +220,5 @@

    Limitations when migrating from JUL

    -
    diff --git a/src/site/pages/news.html b/src/site/pages/news.html index 6ab077c..3ccf919 100644 --- a/src/site/pages/news.html +++ b/src/site/pages/news.html @@ -16,8 +16,8 @@
    - +

    SLF4J News

    Please note that you can receive SLF4J related announcements by diff --git a/src/site/pages/templates/sponsoredBy.js b/src/site/pages/templates/sponsoredBy.js new file mode 100644 index 0000000..9137ecc --- /dev/null +++ b/src/site/pages/templates/sponsoredBy.js @@ -0,0 +1,15 @@ + +document.write('

    '); \ No newline at end of file diff --git a/src/site/resources/images/logos/exoscale.png b/src/site/resources/images/logos/exoscale.png new file mode 100644 index 0000000000000000000000000000000000000000..8cad01d31f1c12c487a3cc6237a14844d1c6a3b8 GIT binary patch literal 3879 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 L%Me-%c@+B}9w1ma literal 0 HcmV?d00001