Skip to content

Commit 21041eb

Browse files
jantjejantje
authored
Merge pull request #1598 from Sloeber/V4.4.2_update_wabsite
updated the web site for release 4.4.2
2 parents 93c3eb2 + 04b83a8 commit 21041eb

File tree

10 files changed

+119
-199
lines changed

10 files changed

+119
-199
lines changed

‎website/WebContent/archived-1.x.php

-70
This file was deleted.

‎website/WebContent/archived.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
require 'fragments/file-list.php';
2+
require 'fragments/file-buttons.php';
33
$version = "3.0";
44

55
if (isset ( $_GET ["ver"] ))
@@ -65,7 +65,7 @@
6565

6666
<a href="#top" scroll-to="top">Back to top</a>
6767
<h3>Pick your OS architecture in the following list</h3>
68-
<?php listFiles("V" . $version);
68+
<?php echo listVersionFiles($version);
6969
?>
7070

7171
<a href="#top" scroll-to="top">Back to top</a>

‎website/WebContent/fragments/file-buttons.php

+23-19
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,39 @@
11
<?php
2+
/*include '/eclipse/globals.txt';
3+
$version = $STABLE_VERSION_MAJOR . "." . $STABLE_VERSION_MINOR;
4+
$fullVersion = $version . "." . $STABLE_VERSION_PATCH;
5+
$version = "4.4";
6+
$fullVersion = "4.4.1";*/
27

3-
function my_offset($curfile, $prefix) {
4-
preg_match ( '/\d/', $curfile, $m, PREG_OFFSET_CAPTURE, strlen ( $prefix ) );
5-
if (sizeof ( $m ))
6-
return $m [0] [1];
7-
return strlen ( $prefix );
8+
9+
function listFiles($os,$version,$fullVersion){
10+
$listFilesOutput= internalListFiles("V" . $version . '_' . $os);
11+
$listFilesOutput= $listFilesOutput . internalListFiles("V" . $fullVersion . '_' . $os);
12+
$listFilesOutput= $listFilesOutput . internalListFiles("sloeber-ide-V" . $fullVersion . '-' . $os);
13+
return $listFilesOutput;
814
}
9-
function my_bitness($curfile, $prefix) {
10-
return substr ( $curfile, my_offset ( $curfile, $prefix ), 2 );
15+
function listVersionFiles($version){
16+
$listFilesOutput= internalListFiles("V" . $version );
17+
$listFilesOutput= $listFilesOutput . internalListFiles("sloeber-ide-V" . $version);
18+
return $listFilesOutput;
1119
}
12-
function listFiles($prefix) {
20+
21+
function internalListFiles($prefix) {
1322
include "files.php";
1423
global $filter;
1524
$filter = $prefix;
25+
$lines=$lines." ".$prefix." ";
1626
date_default_timezone_set ( 'UTC' );
1727

1828
$files = array_filter ( $files, "filter" );
1929
sort ( $files );
20-
$lines = array (
21-
"32" => "",
22-
"64" => ""
23-
);
2430
foreach ( $files as &$file ) {
25-
$curfile = basename ( $file );
26-
$bitness=my_bitness ( $curfile, $prefix );
27-
$lines[$bitness]= '<div class="text-center col-md-4 col-md-offset-4">';
28-
$lines[$bitness]= $lines[$bitness] . ' <a href="' . $file . '" class="btn btn-success btn-lg text-center">Download <b>' . $bitness . ' bits</b> Bundle <i class="glyphicon glyphicon-cloud-download"></i></a>';
29-
$lines[$bitness]= $lines[$bitness] . '</div>';
31+
$line= '<div class="text-center col-md-4 col-md-offset-4">';
32+
$line= $line . ' <a href="' . $file . '" class="btn btn-success btn-lg text-center">Download <b>' . basename ( $file ) . '</b><i class="glyphicon glyphicon-cloud-download"></i></a>';
33+
$line= $line . '</div>';
34+
$lines=$lines.$line;
3035
}
31-
echo $lines [ "64" ];
32-
echo $lines [ "32" ];
36+
return $lines ;
3337
}
3438
function filter($file) {
3539
global $filter;

‎website/WebContent/fragments/file-list.php

-65
This file was deleted.

‎website/WebContent/fragments/files.php

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
"https://github.com/Sloeber/arduino-eclipse-plugin/releases/download/V4_4_1_0/V4.4.1_mac64.2022-09-05_06-48-31.zip",
7070
"https://github.com/Sloeber/arduino-eclipse-plugin/releases/download/V4_4_1_0/V4.4.1_win64.2022-09-05_06-48-31.zip",
7171

72+
"https://github.com/Sloeber/arduino-eclipse-plugin/releases/download/V4_4_2_0/sloeber-ide-V4.4.2-linux.gtk.x86_64.tar.gz",
73+
"https://github.com/Sloeber/arduino-eclipse-plugin/releases/download/V4_4_2_0/sloeber-ide-V4.4.2-macosx.cocoa.aarch64.zip",
74+
"https://github.com/Sloeber/arduino-eclipse-plugin/releases/download/V4_4_2_0/sloeber-ide-V4.4.2-macosx.cocoa.x86_64.zip",
75+
"https://github.com/Sloeber/arduino-eclipse-plugin/releases/download/V4_4_2_0/sloeber-ide-V4.4.2-win32.win32.x86_64.zip",
76+
7277
);
7378

7479
?>

‎website/WebContent/fragments/navbar.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@
5252
<li class="dropdown">
5353
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Community <b class="caret"></b></a>
5454
<ul class="dropdown-menu">
55-
<li><a href="http://forum.arduino.cc/index.php?topic=79595" target="_blank">Forum Discussion</a></li>
56-
<li><a href="https://github.com/jantje/arduino-eclipse-plugin/issues" target="_blank">Report Issue</a></li>
55+
<li><a href="https://github.com/Sloeber/arduino-eclipse-plugin/discussions" target="_blank">Forum Discussion</a></li>
56+
<li><a href="https://github.com/jantje/arduino-eclipse-plugin/issues" target="_blank">Reported Issue</a></li>
5757
<li><a href="https://github.com/jantje/arduino-eclipse-plugin" target="_blank"><img src="css/github.png" class="pull-right" height="20"/>Github</a></li>
58+
<li><a href="https://github.com/Sloeber/arduino-eclipse-plugin/wiki" target="_blank">Github Wiki (for contributors)</a></li>
5859
</ul>
5960
</li>
6061
</ul>

‎website/WebContent/fragments/testFiles.php

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
require 'file-buttons.php';
3+
$version = "4.4";
4+
$fullVersion=$version.".2";
5+
6+
?>
7+
8+
<!DOCTYPE html>
9+
<html lang="en">
10+
<head>
11+
<meta charset="utf-8">
12+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
13+
<meta name="viewport" content="width=device-width, initial-scale=1">
14+
<meta name="description" content="">
15+
<link rel="shortcut icon" href="http://eclipse.baeyens.it/favicon.ico">
16+
<title>test fileList</title>
17+
18+
<body role="document">
19+
20+
21+
<p>Linux</p>
22+
<?php
23+
echo listFiles( "lin",$version,$fullVersion) . "AAAAAA";
24+
?>
25+
26+
<p>Windows</p>
27+
<?php
28+
echo listFiles( "win",$version,$fullVersion). "AAAAAA";?>
29+
30+
<p>Mac</p>
31+
<?php
32+
echo listFiles( "mac",$version,$fullVersion). "AAAAAA";?>
33+
34+
</body>
35+
</html>

‎website/WebContent/globals.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
$STABLE_VERSION_MAJOR=4;
33
$STABLE_VERSION_MINOR=4;
4-
$STABLE_VERSION_PATCH=1;
4+
$STABLE_VERSION_PATCH=2;
55
?>

‎website/WebContent/index.shtml

+2-8
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
This represents a completely <b>free and open</b> Arduino IDE alternative!<br>
4141
Download the product, unpack and play!<br>
4242
</p>
43-
<h1>Sloeber V4.4.1 Support for bootloader and arduino way size (and lots of fixes)</h1>
43+
<h1>Sloeber V4.4.2 contains some minor fixes among them incompatibility fixes with the latest eclipse </h1>
4444
<p>Welcome to a next stage for your Arduino projects!</p>
4545
<p>
4646
<a href="learn.shtml" class="btn btn-primary btn-lg" role="button">Learn more &raquo;</a>
@@ -61,13 +61,7 @@
6161
<a class="list-group-item" href="https://www.youtube.com/playlist?list=PLCSjf7QmP3TCOLIw0lMPbwHtKrO-nwfKG">Watch <b>videos</b> of other projects of Jantje</a>
6262
</div>
6363
</div>
64-
<div class="col-md-4">
65-
<h2><span class="glyphicon glyphicon-star" style="color:orange"></span>&nbsp;News</h2>
66-
<div>
67-
<a class="twitter-timeline" data-dnt="true" href="https://twitter.com/Arduino_jantje" height="400" data-widget-id="433339655606394880" data-chrome="nofooter noheader">Latest News</a>
68-
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
69-
</div>
70-
</div>
64+
7165
<div class="col-md-4">
7266
<h2><span class="glyphicon glyphicon-heart" style="color:red"></span>&nbsp;Help us!</h2>
7367
<ul class="list-group">

0 commit comments

Comments
 (0)