diff options
-rw-r--r-- | site/common/snippets/where-share.php | 2 | ||||
-rw-r--r-- | site/contrib/index.php | 10 | ||||
-rw-r--r-- | site/css/main.css | 14 | ||||
-rw-r--r-- | site/download/index.php | 61 | ||||
-rw-r--r-- | site/footer.php | 2 | ||||
-rw-r--r-- | site/github/index.php | 14 | ||||
-rw-r--r-- | site/gitorious/index.php | 10 | ||||
-rw-r--r-- | site/index.php | 22 |
8 files changed, 60 insertions, 75 deletions
diff --git a/site/common/snippets/where-share.php b/site/common/snippets/where-share.php index 5bebf05..e55a155 100644 --- a/site/common/snippets/where-share.php +++ b/site/common/snippets/where-share.php @@ -1,4 +1,4 @@ - <div class="section"> + <div class="s"> <h2><?php echo gettext("Where should I host and share my code?"); ?></h2> <p> diff --git a/site/contrib/index.php b/site/contrib/index.php index 2a2a19e..937d037 100644 --- a/site/contrib/index.php +++ b/site/contrib/index.php @@ -34,9 +34,9 @@ <body> - <div class="contain"> + <div class="c"> - <div id="libreboot" class="section intro"> + <div id="libreboot" class="s"> <h1><?php echo gettext("Libreboot project maintainers"); ?></h1> @@ -47,7 +47,7 @@ </div> - <div class="section"> + <div class="s"> <h2>Francis Rowe</h2> <p> @@ -78,13 +78,9 @@ </div> - <div class="section footer"> - <?php include "../footer.php"; ?> - - </div> </div> diff --git a/site/css/main.css b/site/css/main.css index fbe8434..1f2b16f 100644 --- a/site/css/main.css +++ b/site/css/main.css @@ -1,13 +1,11 @@ -body{background:#eee;color:#333;font:400 .82em Lato,helvetica,sans-serif;text-align:justify} +body{background:#eee;color:#333;font:.82em Lato,sans-serif} h1,h2,h3{margin:0px} p,aside,li{margin:.1em 0px .3em} -body,img,.ulnav{padding:0px;margin:0px} +body,img,.l{padding:0px;margin:0px} a{color:#33a;font-size:110%} a:hover{color:#000} img{margin:0px 1em 0px;width:7em;float:right} -.contain{width:58em;margin:0 auto} -.section{background:#fff;} -.subsection{background:#eee;} -.section,.subsection{margin:.4em .4em;padding:.3em .9em;border-radius:.5em;box-shadow:0px 0px 2px #222} -.ulnav{margin-bottom:.5em} -.ulnav li{display:inline;margin-right:1em} +.c{width:58em;margin:0 auto} +.s{background:#fff;margin:.4em .4em;padding:.3em .9em;border-radius:.5em;box-shadow:0px 0px 2px #222} +.l{margin-bottom:.5em} +.l li{display:inline;margin-right:1em} diff --git a/site/download/index.php b/site/download/index.php index 22ddc48..2dc260a 100644 --- a/site/download/index.php +++ b/site/download/index.php @@ -35,15 +35,15 @@ <body> - <div class="contain"> + <div class="c"> - <div id="libreboot" class="section intro"> + <div id="libreboot" class="s"> <h1><?php echo gettext("Download libreboot"); ?></h1> <p><?php echo gettext("Links to HTTP mirrors, rsync mirrors and git repositories. Download libreboot here."); ?></p> - <ul class="ulnav"> + <ul class="l"> <li><a href="#http"><?php echo gettext("HTTP mirrors"); ?></a></li> <li><a href="#mirror"><?php echo gettext("Rsync mirrors"); ?></a></li> <li><a href="#git"><?php echo gettext("Git repositories (development)"); ?></a></li> @@ -55,7 +55,7 @@ </div> - <div class="section" id="gpg"> + <div class="s" id="gpg"> <h1 id="gpg"><?php echo gettext("GPG signing key"); ?></h1> @@ -84,7 +84,7 @@ </div> - <div class="section" id="http"> + <div class="s" id="http"> <h1><?php echo gettext("HTTP mirrors (releases)"); ?></h1> @@ -160,7 +160,7 @@ </div> - <div class="section" id="git"> + <div class="s" id="git"> <h1><?php echo gettext("Git repositories (development)"); ?></h1> @@ -185,7 +185,7 @@ <p> <?php echo gettext("You might not see a progress bar; it's still cloning, so just be patient."); ?> </p> - <ul class="ulnav"> + <ul class="l"> <li><b><a href="../github/"><?php echo gettext("Please do not use GitHub!"); ?></a></b></li> <li><b><a href="../gitorious/"><?php echo gettext("Please do not use Gitorious/GitLab!"); ?></a></b></li> <li><a href="http://projects.mtjm.eu/projects/libreboot"><?php echo gettext("Bug tracker"); ?></a></li> @@ -217,26 +217,29 @@ <?php echo gettext("Once you have made your change(s), you can use this to check the status:"); ?><br/> $ <b>git status</b> </p> + </div> - <div class="subsection"> - - <p> - <?php echo gettext("If you are modifying an existing file, make sure to update the copyright license header in that file; in source files or scripts, this would usually be at the top, and for documentation it is typically at the bottom of the document. It is good practise to use your real name in the commit logs."); ?><br/> - <?php echo gettext("Example: <i>Copyright (C) 20XX John Doe <john@doe.com></i>"); ?> - </p> - <p> - <?php echo gettext("Generally speaking, using the same license as the file that you are modifying is much simpler."); ?> - <?php echo gettext("If you are submitting new files, please make sure that they are under a free license (copyleft preferred)."); ?> - <?php echo gettext("You can find a list on:"); ?> - <a href="https://www.gnu.org/licenses/license-list.html">https://www.gnu.org/licenses/license-list.html</a>. - </p> - <p> - <i> - <?php echo gettext("The libreboot project will not accept documentation released under the <u>GNU Free Documentation License</u>, because we do not want to endorse or support the Invariant clauses that this license allows. Changes submitted under this license will be rejected, even if it contains no Invariant sections."); ?> - </i> - </p> - - </div> + <div class="s"> + + <p> + <?php echo gettext("If you are modifying an existing file, make sure to update the copyright license header in that file; in source files or scripts, this would usually be at the top, and for documentation it is typically at the bottom of the document. It is good practise to use your real name in the commit logs."); ?><br/> + <?php echo gettext("Example: <i>Copyright (C) 20XX John Doe <john@doe.com></i>"); ?> + </p> + <p> + <?php echo gettext("Generally speaking, using the same license as the file that you are modifying is much simpler."); ?> + <?php echo gettext("If you are submitting new files, please make sure that they are under a free license (copyleft preferred)."); ?> + <?php echo gettext("You can find a list on:"); ?> + <a href="https://www.gnu.org/licenses/license-list.html">https://www.gnu.org/licenses/license-list.html</a>. + </p> + <p> + <i> + <?php echo gettext("The libreboot project will not accept documentation released under the <u>GNU Free Documentation License</u>, because we do not want to endorse or support the Invariant clauses that this license allows. Changes submitted under this license will be rejected, even if it contains no Invariant sections."); ?> + </i> + </p> + + </div> + + <div class="s"> <p> <?php echo gettext("The status command will show any untracked files that you have. Add them using <b>git add path/to/file</b>. You should also add any other files that are listed as modified in the git status. If there are deleted files in the git status, you can use <b>git rm path/to/file</b>. As long as you have added all the untracked files, it is generally easier to use:"); ?><br/> @@ -300,7 +303,7 @@ </div> - <div class="section" id="trisquel"> + <div class="s" id="trisquel"> <p> <?php echo gettext("Libreboot includes statically linked executables of utilities built from the libreboot source code. These are built on in Trisquel GNU/Linux. There were links to the Trisquel source ISO here, as a lazy way to provide CCS, but this was inefficient. Archives for only those dependencies that comprise the CCS will be added here later instead. If you need CCS, for now simply contact the libreboot project using the details on the home page, and the source for the version of Trisquel used to build that release (whichever version it is) will be provided. You can also get it on the Trisquel website."); ?> @@ -308,13 +311,9 @@ </div> - <div class="section footer"> - <?php include "../footer.php"; ?> - - </div> </div> diff --git a/site/footer.php b/site/footer.php index 6c5c969..6d61112 100644 --- a/site/footer.php +++ b/site/footer.php @@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ ?> + <div class="s"> <p> <?php echo gettext("This page is released under <a href=\"https://www.gnu.org/licenses/agpl-3.0.html\">GNU AGPLv3 or higher</a>, and available in a git repository:"); ?> <a href="<?php echo $lbWebsiteGitwebAddress; ?>"><?php echo gettext("browse the repository"); ?></a>. @@ -24,3 +25,4 @@ <p> <?php echo gettext("This website is hosted on a libreboot system, running a <a href=\"https://www.gnu.org/distros/\">fully libre GNU/Linux distribution</a>."); ?> </p> + </div> diff --git a/site/github/index.php b/site/github/index.php index e3fddb3..55aaea6 100644 --- a/site/github/index.php +++ b/site/github/index.php @@ -34,9 +34,9 @@ <body> - <div class="contain"> + <div class="c"> - <div id="libreboot" class="section intro"> + <div id="libreboot" class="s"> <h1><?php echo gettext("Please do not use GitHub!"); ?></h1> @@ -54,7 +54,7 @@ </div> - <div class="section"> + <div class="s"> <h2><?php echo gettext("What's wrong with GitHub?"); ?></h2> <ul> <li> @@ -102,7 +102,7 @@ include_once "../common/snippets/where-share.php"; ?> - <div class="section"> + <div class="s"> <p> [<a href="http://tom.preston-werner.com/2011/11/22/open-source-everything.html">1</a>] @@ -121,7 +121,7 @@ </div> - <div class="section"> + <div class="s"> <p> <?php echo gettext("This text on this page was adapted from <a href=\"http://librecmc.org/librecmc/wiki?name=github\">http://librecmc.org/librecmc/wiki?name=github</a>, licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA 4.0</a> like the original."); ?> @@ -129,13 +129,9 @@ </div> - <div class="section footer"> - <?php include "../footer.php"; ?> - - </div> </div> diff --git a/site/gitorious/index.php b/site/gitorious/index.php index 86097c7..13bdbbe 100644 --- a/site/gitorious/index.php +++ b/site/gitorious/index.php @@ -34,9 +34,9 @@ <body> - <div class="contain"> + <div class="c"> - <div id="libreboot" class="section intro"> + <div id="libreboot" class="s"> <h1><?php echo gettext("Please do not use Gitorious or GitLab!"); ?></h1> @@ -54,7 +54,7 @@ </div> - <div class="section"> + <div class="s"> <h2><?php echo gettext("What's wrong with Gitorious?"); ?></h2> <ul> <li> @@ -99,13 +99,9 @@ include_once "../common/snippets/where-share.php"; ?> - <div class="section footer"> - <?php include "../footer.php"; ?> - - </div> </div> diff --git a/site/index.php b/site/index.php index 717d493..f3aaaad 100644 --- a/site/index.php +++ b/site/index.php @@ -34,9 +34,9 @@ <body> - <div class="contain"> + <div class="c"> - <div id="libreboot" class="section intro"> + <div id="libreboot" class="s"> <p> <img src="logo/logo-small.png" alt="" title="<?php include "logo/license.txt"; ?>" /> </p> @@ -46,7 +46,7 @@ echo gettext("Libreboot is a <a href=\"https://www.fsf.org/about/what-is-free-software\">free</a> (libre) BIOS/UEFI replacement for your computer. Based on <a href=\"http://coreboot.org/\">coreboot</a>, the aim is to distribute low-level boot firmware that is 100% free software, and to make coreboot easy to use."); ?> </p> - <ul class="ulnav"> + <ul class="l"> <li><a href="docs/index.html#why"><?php echo gettext("Why should I use libreboot?"); ?></a></li> <li><a href="download/#git"><?php echo gettext("How to contribute"); ?></a></li> <li><a href="docs/tasks.html"><?php echo gettext("List of tasks"); ?></a></li> @@ -54,9 +54,9 @@ </ul> </div> - <div class="section"> + <div class="s"> <h1><?php echo gettext("Download libreboot"); ?></h1> - <ul class="ulnav"> + <ul class="l"> <li><a href="git/rom"><?php echo gettext("ROM images"); ?></a></li> <li><a href="git/libreboot_util.tar.xz"><?php echo gettext("Utilities"); ?></a></li> <li><a href="git/libreboot_docs.tar.xz"><?php echo gettext("Documentation (archived)"); ?></a></li> @@ -64,30 +64,30 @@ <li><a href="git/crossgcc/">crossgcc</a></li> <li><?php echo gettext("...based on "); ?><a href="<?php echo $lbFirmwareGitwebAddress; ?>;a=commit;h=<?php include "git/commitid"; ?>"><?php echo gettext("this"); ?></a><?php echo gettext(" commit"); ?></li> </ul> - <ul class="ulnav"> + <ul class="l"> <li><a href="git/release.html"><?php echo gettext("List of changes"); ?></a></li> <li><a href="git/sha512sum.txt"><?php echo gettext("SHA512 manifest"); ?></a></li> <li><a href="git/sha512sum.txt.sig"><?php echo gettext("SHA512 manifest (GPG signature)"); ?></a></li> <li><a href="download/#gpg"><?php echo gettext("How to use GPG"); ?></a></li> </ul> - <ul class="ulnav"> + <ul class="l"> <li><?php echo gettext("Other resources:"); ?></li> <li><a href="download/#http"><?php echo gettext("Archived releases"); ?></a></li> <li><a href="download/#git"><?php echo gettext("Git repositories"); ?></a></li> <li><a href="<?php echo $lbFirmwareGitwebAddress; ?>"><?php echo gettext("Browse the main git repository"); ?></a></li> </ul> </div> - <div class="section"> + <div class="s"> <h1><?php echo gettext("Useful information"); ?></h1> - <ul class="ulnav"> + <ul class="l"> <li><a href="docs/index.html"><?php echo gettext("Documentation"); ?></a></li> <li><a href="docs/hcl/index.html#supported_list"><?php echo gettext("List of supported systems"); ?></a></li> <li><a href="docs/install/index.html"><?php echo gettext("How to install libreboot"); ?></a></li> <li><a href="docs/gnulinux/index.html"><?php echo gettext("How to install GNU/Linux"); ?></a></li> </ul> <h2><?php echo gettext("Contact details"); ?></h2> - <ul class="ulnav"> + <ul class="l"> <li><a href="contrib/"><?php echo gettext("List of maintainers"); ?></a></li> <li><a href="<?php echo $userMailingListAddress; ?>"><?php echo gettext("User support mailing list"); ?></a></li> <li><a href="<?php echo $devMailingListAddress; ?>"><?php echo gettext("Development mailing list"); ?></a></li> @@ -95,11 +95,9 @@ </ul> </div> - <div class="section footer"> <?php include "footer.php"; ?> - </div> </div> |