Skip to content

C
ccan
Commit 08f71340 authored by Chris McCormick's avatar Chris McCormick
Browse files
Options

Changed the look of the website. Added a new logo design (source SVG... 

Changed the look of the website. Added a new logo design (source SVG included). Fixed an issue with junkcode prefix not being set (broken links and images on current site). Removed /tmp/ccan in clean as it was preventing 'make webpages' running twice. Brought the HTML closer to standards compliance (doctype, encoding). Added meta tag for mobile device browsers to render nicely.
parent 1567e4bd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 461 additions and 59 deletions
Makefile
View file @ 08f71340
......@@ -77,6 +77,7 @@ ccan/%/info: ccan/%/_info
$(CC) $(CCAN_CFLAGS) -o $@ -x c $<
clean: tools-clean
$(RM) /tmp/ccan
$(RM) `find * -name '*.o'` `find * -name '.depends'` `find * -name '*.a'` `find * -name info` `find * -name '*.d'`
$(RM) inter-depends lib-depends test-depends ccan/*-Makefile
......
Makefile-web
View file @ 08f71340
......@@ -20,7 +20,7 @@ modcheck:
clean-tree:
! git status --porcelain | grep .
webpages: modcheck clean-tree $(WEB_SUBDIRS) $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.jpg $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) junkpages
webpages: modcheck clean-tree $(WEB_SUBDIRS) $(WEBDIR)/index.html $(WEBDIR)/upload.html $(WEBDIR)/uploader.php $(WEBDIR)/example-config.h $(WEBDIR)/ccan.png $(WEBDIR)/ccan-bg.png $(WEBDIR)/ccan.css $(DIRECT_TARBALLS) $(DEPEND_TARBALLS) $(WEBDIR)/ccan.tar.bz2 $(WEBDIR)/Makefile-ccan $(ALL_PAGES) junkpages
junkpages: $(WEBDIR)/list.html $(WEBDIR)/junkcode $(JUNKPAGES) $(JUNKBALLS)
$(WEB_SUBDIRS): $(WEBDIR)
......@@ -31,7 +31,7 @@ $(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode
$(WEBDIR)/junkcode/%.html: $(WEBDIR)/junkcode/%.tar.bz2
cd $(WEBDIR) && tar xfj junkcode/$*.tar.bz2
php5 web/staticjunkcode.php junkcode/$* $* > $@
URLPREFIX=../ php5 web/staticjunkcode.php junkcode/$* $* > $@
# We want tarball to contain ccan/; we put junkcode in, but don't depend on it.
$(WEBDIR)/ccan.tar.bz2: config.h Makefile Makefile-ccan $(shell git ls-files ccan tools licenses)
......@@ -58,7 +58,13 @@ $(WEBDIR)/example-config.h: config.h
$(WEBDIR)/Makefile-ccan: Makefile-ccan
cp $< $@
$(WEBDIR)/ccan.jpg: web/ccan.jpg
$(WEBDIR)/ccan.png: web/ccan.png
cp $< $@
$(WEBDIR)/ccan-bg.png: web/ccan-bg.png
cp $< $@
$(WEBDIR)/ccan.css: web/ccan.css
cp $< $@
$(WEBDIR)/info/%.html: $(WEBDIR)/tarballs/%.tar.bz2 $(WEBDIR)/tarballs/with-deps/%.tar.bz2
......
web/ccan.css 0 → 100644
View file @ 08f71340
* {
}
html {
border: 0px;
margin: 0px;
padding: 0px;
}
body {
background-color: transparent;
margin-left: auto;
margin-right: auto;
color: #333333;
}
.menulist {
border-radius: 5px;
margin-left: auto;
margin-right: auto;
background-image: url(ccan-bg.png);
background-position: initial initial;
background-repeat: initial initial;
font-family: FreeSans, Arial;
}
.menulist-inner {
max-width: 950px;
margin-left: auto;
margin-right: auto;
text-align: center;
}
ul.menu {
float: left;
margin-top: 0.75em;
margin-left: 0;
padding-left: 0;
}
.menu li {
list-style-type: none;
margin-left: auto;
display: inline-block !important;
}
/* On phones the menu should display stacked */
@media screen and (max-width:420px) {
.menu li {
display: block !important;
padding: 0.5em;
}
ul.menu {
float: none;
}
.search {
text-align: center !important;
}
}
.menu a {
font-weight: bold;
text-decoration: none;
color: darkblue !important;
margin-left: 0.5em;
margin-right: 0.5em;
}
.menu a:hover {
color: #222222 !important;
}
.search {
text-align: right;
padding-top: 0.5em;
padding-right: 0.5em;
}
.search input {
margin-bottom: 1em;
}
table {
background: none;
}
table a {
}
table a:hover {
}
table a:visited {
}
tbody {
}
tr {
}
td {
}
th {
}
hr {
display: none;
}
a {
}
a:hover {
color: #222222;
}
a:visited {
color: #0044aa;
}
p {
margin-left: 1em;
}
h1 {
}
h2 {
}
input {
padding: 0.25em;
border-radius: 2px;
border: 1px solid #555555;
padding-left: 1em;
padding-right: 1em;
font-weight: bold;
font-family: FreeSans, Arial;
}
img {
}
.content {
padding: 1em;
max-width: 950px;
margin-left: auto;
margin-right: auto;
font-family: FreeSans, Arial;
}
.logo {
padding: 1em;
padding-top: 0.5em;
margin-bottom: 1em;
padding-bottom: 1em;
background-color: white;
min-height: 63px;
font-family: 'Raleway', sans-serif;
}
.logo img {
width: 250px;
float: left;
margin-bottom: 1em;
margin-right: 1em;
}
.logo h1 {
font-size: 1.5em;
font-weight: 300;
width: 100%;
text-align: right;
margin-top: 0;
}
web/ccan.svg 0 → 100644
View file @ 08f71340
This diff is collapsed.
web/logo.html
View file @ 08f71340
......@@ -2,18 +2,17 @@
// Pages created in subdirs need ../ appended.
$url_prefix = getenv("URLPREFIX");
?>
<!doctype html>
<html>
<head>
<title>ccan</title>
<meta charset="utf-8">
<title>ccan</title>
<link rel="stylesheet" type="text/css" href="<?=$url_prefix?>ccan.css"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href='http://fonts.googleapis.com/css?family=Raleway:300' rel='stylesheet' type='text/css'>
<head>
<body bgcolor="FFFFCC">
<table align="center" width="100%" bgcolor="FFFFFF">
<tr>
<th>
<img src="<?=$url_prefix?>ccan.jpg" width="250" height="80">
</th>
<th>
<h1>Comprehensive C Archive Network <h1>
</th>
</tr>
</table>
<body>
<div class='logo'>
<a href='<?=$url_prefix?>'><img src="<?=$url_prefix?>ccan.png" border="0"/></a>
<h1>Comprehensive C Archive Network</h1>
</div>
web/menulist.html
View file @ 08f71340
......@@ -2,24 +2,19 @@
// Pages created in subdirs need ../ appended.
$url_prefix = getenv("URLPREFIX");
?>
<table align="center" width="100%" cellpadding="4" cellspacing="1" border="0" bgcolor="lightblue">
<tr align="left" bgcolor="CCFFCC" >
<td align="center">
<a href="<?=$url_prefix?>upload.html">Upload Code</a>
</td>
<td align="center">
<a href="<?=$url_prefix?>list.html">Download Code</a>
</td>
<td align="center">
<a href="<?=$url_prefix?>index.html">About</a>
</td>
<td align="center">
<form method="get" action="http://www.google.com/search">
<input type="text" name="q" size="25"
maxlength="255" value="" />
<input type="hidden" name="sitesearch" value="ccodearchive.net"/>
<input type="submit" value="Search CCAN (Google)" />
</form>
</td>
</table>
<hr>
<div class="menulist">
<div class="menulist-inner">
<ul class="menu">
<li><a href="<?=$url_prefix?>upload.html">Upload Code</a></li>
<li><a href="<?=$url_prefix?>list.html">Download Code</a></li>
<li><a href="<?=$url_prefix?>index.html">About</a></li>
</ul>
<div class="search">
<form method="get" action="http://www.google.com/search">
<input type="text" name="q" size="25" maxlength="255" value="" />
<input type="hidden" name="sitesearch" value="ccodearchive.net"/>
<input type="submit" value="Search CCAN (Google)" />
</form>
</div>
</div>
</div>
web/staticall.php
View file @ 08f71340
......@@ -6,7 +6,7 @@ include('static-configuration');
$tarballsize=round((filesize($argv[3]."/ccan.tar.bz2") + 1023) / 1024);
?>
<div class='content'>
<h1> List of all CCAN modules: </h1>
<p>
......@@ -70,5 +70,5 @@ foreach ($dirs as $dir) {
$d->close();
?>
</table>
<hr>
</div>
</body></html>
web/staticindex.php
View file @ 08f71340
......@@ -4,7 +4,7 @@ include('logo.html');
include('menulist.html');
include('static-configuration');
?>
<div class='content'>
<h2>The Idea</h2>
<p>
......@@ -68,5 +68,5 @@ We also have an IRC channel: #ccan on <a href="http://freenode.net">Freenode</a>
<p>
We also have a <a href="http://github.com/rustyrussell/ccan/wiki/">wiki</a>; feel free to enhance it.
</p>
<hr>
</div>
</body></html>
web/staticjunkcode.php
View file @ 08f71340
......@@ -4,7 +4,7 @@ include('logo.html');
include('menulist.html');
include('static-configuration');
?>
<div class='content'>
<h1> Contents of CCAN <?=$argv[1]?> </h1>
<p>
......@@ -30,5 +30,5 @@ foreach ($files as $file) {
}
?>
</table>
<hr>
</div>
</body></html>
web/staticmoduleinfo.php
View file @ 08f71340
......@@ -17,8 +17,9 @@ $licence=extract_field('licence',$module_path);
$license=extract_field('license',$module_path);
$url_prefix = getenv("URLPREFIX");
?>
<table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="3" cellspacing="1">
<tr align="center" bgcolor="FFFFCC">
<div class='content'>
<table align="center" width="70%" border="0" cellpadding="3" cellspacing="1">
<tr align="center">
<td>
<a href="<?=$repo_base.$module?>">Browse Source</a>
</td>
......@@ -31,19 +32,19 @@ $url_prefix = getenv("URLPREFIX");
<p>
</p>
<table align="center" bgcolor="lightblue" width="70%" border="0" cellpadding="8" cellspacing="1">
<tr align="left" bgcolor="FFFFCC">
<table align="center" width="70%" border="0" cellpadding="8" cellspacing="1">
<tr align="left">
<td><h3>Module: </h3> <?=$module?> </td>
</tr>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>Summary: </h3> <?=$summary?></td>
</tr>
<?php
if ($maintainer) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>Maintainer: </h3> <?=$maintainer?></td>
</tr>
<?php
......@@ -51,7 +52,7 @@ if ($maintainer) {
if ($author) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>Author: </h3> <?=$author?></td>
</tr>
<?php
......@@ -59,7 +60,7 @@ if ($author) {
if ($dependencies) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>Dependencies: </h3> <pre> <?php
foreach (preg_split("/\s+/", $dependencies) as $dep) {
echo '<a href="'.substr($dep, 5).'.html">'.$dep.'</a> ';
......@@ -71,7 +72,7 @@ if ($dependencies) {
if ($extdepends) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>External dependencies: </h3> <?php
foreach (split("\n", $extdepends) as $dep) {
$fields=preg_split("/\s+/", $dep);
......@@ -85,14 +86,14 @@ if ($extdepends) {
<?php
}
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>Description: </h3> <?=$description;?> </td>
</tr>
<?php
if ($see_also) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>See Also: </h3> <pre> <?php
foreach (preg_split("/[\s,]+/", trim($see_also)) as $see) {
echo '<a href="'.substr($see, 5).'.html">'.$see.'</a> ';
......@@ -104,7 +105,7 @@ if ($see_also) {
if ($example) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>Example: </h3> <pre><?=$example?></pre></td>
</tr>
<?php
......@@ -112,7 +113,7 @@ if ($example) {
if ($licence) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>License: </h3> <?=$licence?></td>
</tr>
<?php
......@@ -120,11 +121,12 @@ if ($licence) {
if ($license) {
?>
<tr align="left" bgcolor="FFFFCC">
<tr align="left">
<td><h3>License: </h3> <?=$license?></td>
</tr>
<?php
}
?>
</table><hr>
</table>
</div>
</body></html>
web/staticupload.php
View file @ 08f71340
......@@ -5,7 +5,7 @@ include('logo.html');
include('menulist.html');
include('static-configuration');
?>
<html>
<div class='content'>
<h3 align="center"> Upload Code</h3>
<table width="70%" align="center">
......@@ -50,5 +50,5 @@ people can browse and download it.
</tr>
</table>
</form>
<hr>
</div>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7