Skip to content

Commit

Permalink
added sponsor box
Browse files Browse the repository at this point in the history
  • Loading branch information
ceki committed Oct 22, 2022
1 parent 6507a5d commit 71fa431
Show file tree
Hide file tree
Showing 18 changed files with 112 additions and 62 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mvni.sh text eol=lf
loop.sh text eol=lf
1 change: 1 addition & 0 deletions loop.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java ~/skunk/scripts/src/main/java/ch/qos/FileWatcher.java src/site/pages c:/cygwin64/bin/bash -c "source mvni.sh"
50 changes: 50 additions & 0 deletions mvni.sh
Original file line number Diff line number Diff line change
@@ -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 [email protected] "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



9 changes: 4 additions & 5 deletions src/site/pages/codes.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@

<script src="templates/header3.js" type="text/javascript"></script>

<div id="content">
<div id="content">
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<center>
<h2>SLF4J warning or error messages and their meanings</h2>
<h2>SLF4J warning or error messages and their meanings</h2>

</center>



<!-- ====================================================== -->

Expand Down
38 changes: 12 additions & 26 deletions src/site/pages/css/site3.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;*/
Expand Down Expand Up @@ -182,17 +165,19 @@ 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;
margin-left: 1rem;
padding: 0px;
}

div.pub {
margin: 0px;
padding: 0px;
}
p.sponsoredBy {
padding: 2px;
margin: 0px;
Expand All @@ -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));
}
Expand All @@ -211,7 +198,6 @@ img.exoscale {
max-height: calc(var(--main-logo-height) * 0.8);
}


#content {
/*grid-area: contentArea;*/
}
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/site/pages/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<script src="templates/header3.js" type="text/javascript"></script>

<div id="content">
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<h1>Documentation</h1>

Expand All @@ -25,9 +26,9 @@ <h1>Documentation</h1>
<li><a href="legacy.html">Bridging legacy APIs</a></li>
<li><a href="migrator.html">SLF4J Migrator</a></li>
<li><a href="log4shell.html">Comments on the CVE-2021-44228 vulnerability</a></li>
<li><a href="extensions.html">SLF4J extensions</a></li>
<!--<li><a href="extensions.html">SLF4J extensions</a></li> -->

<li><a href="localization.html">Localization/Internalization support</a></li>
<!--<li><a href="localization.html">Localization/Internalization support</a></li> -->

<li><a href="apidocs/index.html">javadocs</a></li>
<li>
Expand Down
1 change: 1 addition & 0 deletions src/site/pages/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<script src="templates/header3.js" type="text/javascript"></script>

<div id="content">
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<h2>STABLE version</h2>

Expand Down
3 changes: 1 addition & 2 deletions src/site/pages/extensions.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@

<script src="templates/header3.js" type="text/javascript"></script>


<div id="content">

<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
<h1>SLF4J extensions</h1>

<p>SLF4J extensions are packaged within <em>slf4j-ext.jar</em>
Expand Down
3 changes: 2 additions & 1 deletion src/site/pages/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<script src="templates/header3.js" type="text/javascript"></script>


<div id="content">
<div id="content">
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<h2><a name="top">Frequently Asked Questions about SLF4J</a></h2>

Expand Down
2 changes: 1 addition & 1 deletion src/site/pages/legacy.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@


<div id="content">


<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
<h2>Bridging legacy APIs</h2>

<p>Often, some of the components you depend on rely on a logging
Expand Down
3 changes: 3 additions & 0 deletions src/site/pages/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

<div id="content">

<!-- too much overlap
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
-->

<h1>Licensing terms for SLF4J</h1>

Expand Down
2 changes: 1 addition & 1 deletion src/site/pages/localization.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<script src="templates/header3.js" type="text/javascript"></script>

<div id="content">


<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
<h1>Localization support</h1>

<p>A <a
Expand Down
2 changes: 2 additions & 0 deletions src/site/pages/log4shell.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<script src="templates/header3.js" type="text/javascript"></script>
<div id="content">

<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<!-- h1 takes too much space -->
<h2>Comments on the log4shell(CVE-2021-44228) vulnerability</h2>

Expand Down
4 changes: 2 additions & 2 deletions src/site/pages/manual.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<script src="templates/header3.js" type="text/javascript"></script>


<div id="content">

<div id="content">
<script type="text/javascript" src="templates/sponsoredBy.js" ></script>

<h2>SLF4J user manual</h2>

Expand Down
32 changes: 11 additions & 21 deletions src/site/pages/migrator.html
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html>

<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>SLF4J Migrator</title>
<link rel="stylesheet" type="text/css" media="screen" href="css/site.css" />
</head>
<body>
<script type="text/javascript">prefix='';</script>
<script type="text/javascript" src="js/jquery-min.js"></script>
<script type="text/javascript">prefix='';</script>

<div id="container">

<script src="templates/header.js" type="text/javascript"></script>
<div id="left">
<script src="templates/left.js" type="text/javascript"></script>
</div>
<div id="right">
<script src="templates/right.js" type="text/javascript"></script>
</div>
</head>
<body onLoad="enableMenuEventListeners(); hljs.highlightAll(); decorate();">

<div id="content">
<script src="templates/header3.js" type="text/javascript"></script>

<div id="content">

<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
<h1>SLF4J Migrator</h1>

<p>The SLF4J migrator is a small Java tool for migrating Java source
Expand Down Expand Up @@ -229,6 +220,5 @@ <h3>Limitations when migrating from JUL</h3>

<script src="templates/footer.js" type="text/javascript"></script>
</div>
</div>
</body>
</html>
2 changes: 1 addition & 1 deletion src/site/pages/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@


<div id="content">


<script type="text/javascript" src="templates/sponsoredBy.js" ></script>
<h1>SLF4J News</h1>

<p>Please note that you can receive SLF4J related announcements by
Expand Down
15 changes: 15 additions & 0 deletions src/site/pages/templates/sponsoredBy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@

document.write('<div id="sponsor">');

document.write(' <p class="sponsoredBy">&nbsp;Sponsored by:</p>');

document.write(' <div class="spotify"><a href="' + prefix +'count/spotify.html" style="">'+
'<img class="spotify" alt="Spotify R&amp;D" src="' + prefix + 'images/logos/spotify-rnd-black.png"/>'+
'</a></div>');

document.write(' <div><a href="' + prefix +'count/exoscale.html" style="">'+
'<img class="exoscale" alt="Exoscale" src="' + prefix + 'images/logos/exoscale.png"/>'+
'</a></div>');

// close div.sponsor
document.write('</div>');
Binary file added src/site/resources/images/logos/exoscale.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 71fa431

Please sign in to comment.