diff options
| -rw-r--r-- | site/contrib/index.php | 1 | ||||
| -rw-r--r-- | site/download/index.php | 50 | ||||
| -rw-r--r-- | site/functions.php | 8 | ||||
| -rw-r--r-- | site/index.php | 1 | ||||
| -rw-r--r-- | site/variables.php | 24 |
5 files changed, 42 insertions, 42 deletions
diff --git a/site/contrib/index.php b/site/contrib/index.php index df70d19..524c101 100644 --- a/site/contrib/index.php +++ b/site/contrib/index.php @@ -19,6 +19,7 @@ ?> <?php include_once "../variables.php"; + include_once "../functions.php"; ?> <!DOCTYPE html> <html> diff --git a/site/download/index.php b/site/download/index.php index 3e50b40..8de4669 100644 --- a/site/download/index.php +++ b/site/download/index.php @@ -94,9 +94,6 @@ <?php echo gettext("These releases are more rigorously tested."); ?> <?php echo gettext("However, they might be out of date compared to the current development snapshots."); ?> </p> - <p> - <?php echo gettext("These archives are not updated very often, and will not receive any further changes."); ?> - </p> <p> <?php echo gettext("Download libreboot from one of these mirrors."); ?> @@ -113,54 +110,57 @@ <?php /* show HTTP mirrors */ - echo list_items($lbHttpMirror, gettext("HTTP mirrors not added yet."),0,count($lbHttpMirror)); + echo mirrorList($lbHttpMirror, gettext("HTTP mirrors not added yet."),0,count($lbHttpMirror)); ?> <h2 id="ftp">FTP mirrors</h2> <?php - /* show HTTP mirrors */ - echo list_items($lbFtpMirror,gettext("FTP mirrors not added yet."),0,count($lbFtpMirror)); + /* show FTP mirrors */ + echo mirrorList($lbFtpMirror,gettext("FTP mirrors not added yet."),0,count($lbFtpMirror)); ?> - - <h2 id="mirror"><?php echo gettext("Rsync mirrors (for mirroring libreboot)"); ?></h2> - <p> - <?php echo gettext("Create a directory in your web server document root (e.g. libreboot/), and add one of these to your crontab:"); ?> - </p> + </div> + + <div class="s"> + + <h1 id="mirror"><?php echo gettext("Rsync mirrors (for mirroring libreboot)"); ?></h1> + <p> + <?php echo gettext("Create a directory in your web server document root (e.g. libreboot/), and add one of these to your crontab:"); ?> + </p> <?php if (count($lbRsyncServer)>0) { ?> - <h3><?php echo gettext("Main rsync mirror:"); ?></h3> - <p> - $ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[0]; ?> /path/to/docroot/libreboot/</b> - </p> + <h2><?php echo gettext("Main rsync mirror:"); ?></h2> + <p> + $ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[0]; ?> /path/to/docroot/libreboot/</b> + </p> <?php if(count($lbRsyncServer)>1) { ?> - <h3><?php echo gettext("Backup rsync mirrors:"); ?></h3> - <p> + <h2><?php echo gettext("Backup rsync mirrors:"); ?></h2> + <p> <?php for ($server=1; $server<count($lbRsyncServer); $server++) { ?> - $ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[$server]; ?> /path/to/docroot/libreboot/</b><br/> + $ <b>rsync -avxP --delete --stats <?php echo $lbRsyncServer[$server]; ?> /path/to/docroot/libreboot/</b><br/> <?php } ?> - </p> + </p> <?php } } else { ?> - <p> - <b><?php echo gettext("No mirrors available yet."); ?></b> - </p> + <p> + <b><?php echo gettext("No mirrors available yet."); ?></b> + </p> <?php } ?> - <p> - <?php echo gettext("Are you running a mirror? Contact the libreboot project (details are on the home page), and the link will be added here."); ?> - </p> + <p> + <?php echo gettext("Are you running a mirror? Contact the libreboot project (details are on the home page), and the link will be added here."); ?> + </p> </div> diff --git a/site/functions.php b/site/functions.php index 689326a..0e20d2b 100644 --- a/site/functions.php +++ b/site/functions.php @@ -22,23 +22,21 @@ /* Functions */ /* Generic function for showing a list of URLs */ - function list_items($arrayMirrors,$strNotFoundMessage,$forIndexStart,$forIndexbelow) { + function mirrorList($arrayMirrors,$strNotFoundMessage,$forIndexStart,$forIndexbelow) { ?> - <ul> <?php if (count($arrayMirrors)>0) { for ($server=$forIndexStart; $server<$forIndexbelow; $server++) { ?> - <li><a href="<?php echo $arrayMirrors[$server]; ?>"><?php echo $arrayMirrors[$server]; ?></a></li> + <p><a href="<?php echo $arrayMirrors[$server][0]; ?>"><?php echo $arrayMirrors[$server][0]; ?></a> (<?php echo $arrayMirrors[$server][1]; ?>)</p> <?php } } else { ?> - <li><?php echo $strNotFoundMessage; ?></li> + <p><?php echo $strNotFoundMessage; ?></p> <?php } ?> - </ul> <?php } ?> diff --git a/site/index.php b/site/index.php index 02de923..246a327 100644 --- a/site/index.php +++ b/site/index.php @@ -19,6 +19,7 @@ ?> <?php include_once "variables.php"; + include_once "functions.php"; ?> <!DOCTYPE html> <html> diff --git a/site/variables.php b/site/variables.php index 29aa4e8..06b6f4b 100644 --- a/site/variables.php +++ b/site/variables.php @@ -39,20 +39,20 @@ /* HTTP mirrors (for release archives) */ $lbHttpMirror = array( - "http://mirrors.mit.edu/libreboot/", - "http://www.mirrorservice.org/sites/libreboot.org/release/", - "https://freedombox.org/libreboot/", - "http://elmondo74.fr/libreboot/", - "http://elgrande74.net/libreboot/", - "http://mirror.linux.ro/libreboot/", - "https://ginette.swordarmor.fr/libreboot/", - "http://ginette.swordarmor.fr/libreboot/", - "http://libreboot.nedson.net/" + array("http://mirrors.mit.edu/libreboot/","MIT University, USA"), + array("http://www.mirrorservice.org/sites/libreboot.org/release/","University of Kent, UK"), + array("https://freedombox.org/libreboot/","freedombox.org, Switzerland"), + array("http://elmondo74.fr/libreboot/","elmondo74.fr, France"), + array("http://elgrande74.net/libreboot/","elgrande74.net, France"), + array("http://mirror.linux.ro/libreboot/","linux.ro, Romania"), + array("https://ginette.swordarmor.fr/libreboot/","swordarmor.fr, France"), + array("http://ginette.swordarmor.fr/libreboot/","swordarmor.fr, France"), + array("http://libreboot.nedson.net/","nedson.net, Canada") ); - /* HTTP mirrors (for release archives) */ + /* FTP mirrors (for release archives) */ $lbFtpMirror = array( - "ftp://ftp.mirrorservice.org/sites/libreboot.org/release/", - "ftp://ftp.linux.ro/libreboot/" + array("ftp://ftp.mirrorservice.org/sites/libreboot.org/release/","University of Kent, UK"), + array("ftp://ftp.linux.ro/libreboot/","linux.ro, Romania") ); /* rsync servers (for release archives). Put the main one first */ |