From: Chris McCormick Date: Wed, 22 Oct 2014 16:00:46 +0000 (+0800) Subject: Changed the look of the website. Added a new logo design (source SVG included). Fixed... X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=08f71340279dbcee1dfcccceef90a024cf4ed5fe;ds=sidebyside 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. --- diff --git a/Makefile b/Makefile index 65d0d8fc..9d2639a2 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/Makefile-web b/Makefile-web index 20a1a2f3..7f797e41 100644 --- a/Makefile-web +++ b/Makefile-web @@ -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 diff --git a/web/ccan-bg.png b/web/ccan-bg.png new file mode 100644 index 00000000..9e1e83f6 Binary files /dev/null and b/web/ccan-bg.png differ diff --git a/web/ccan.css b/web/ccan.css new file mode 100644 index 00000000..80bd6d8f --- /dev/null +++ b/web/ccan.css @@ -0,0 +1,177 @@ +* { +} + +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; +} diff --git a/web/ccan.png b/web/ccan.png new file mode 100644 index 00000000..55c8e589 Binary files /dev/null and b/web/ccan.png differ diff --git a/web/ccan.svg b/web/ccan.svg new file mode 100644 index 00000000..7fda664b --- /dev/null +++ b/web/ccan.svg @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + CC + N + + + + + + + CC + N + + + + diff --git a/web/logo.html b/web/logo.html index 9a15f28a..f4af2763 100644 --- a/web/logo.html +++ b/web/logo.html @@ -2,18 +2,17 @@ // Pages created in subdirs need ../ appended. $url_prefix = getenv("URLPREFIX"); ?> + -ccan + + ccan + + + - - - - - - -
- - -

Comprehensive C Archive Network

-

+ + diff --git a/web/menulist.html b/web/menulist.html index b49bcbc4..8b7fdef8 100644 --- a/web/menulist.html +++ b/web/menulist.html @@ -2,24 +2,19 @@ // Pages created in subdirs need ../ appended. $url_prefix = getenv("URLPREFIX"); ?> - - - - - - -
- Upload Code - - Download Code - - About - -
- - - -
-
-
+
+
+ +
+
+ + + +
+
+
+
diff --git a/web/staticall.php b/web/staticall.php index e976406b..39b529ce 100644 --- a/web/staticall.php +++ b/web/staticall.php @@ -6,7 +6,7 @@ include('static-configuration'); $tarballsize=round((filesize($argv[3]."/ccan.tar.bz2") + 1023) / 1024); ?> - +

List of all CCAN modules:

@@ -70,5 +70,5 @@ foreach ($dirs as $dir) { $d->close(); ?> -

+
diff --git a/web/staticindex.php b/web/staticindex.php index d9a59d2d..700714ba 100644 --- a/web/staticindex.php +++ b/web/staticindex.php @@ -4,7 +4,7 @@ include('logo.html'); include('menulist.html'); include('static-configuration'); ?> - +

The Idea

@@ -68,5 +68,5 @@ We also have an IRC channel: #ccan on Freenode

We also have a wiki; feel free to enhance it.

-
+
diff --git a/web/staticjunkcode.php b/web/staticjunkcode.php index bf342152..8f3e8c27 100644 --- a/web/staticjunkcode.php +++ b/web/staticjunkcode.php @@ -4,7 +4,7 @@ include('logo.html'); include('menulist.html'); include('static-configuration'); ?> - +

Contents of CCAN

@@ -30,5 +30,5 @@ foreach ($files as $file) { } ?> -

+
diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php index 2174f7a5..98edf9b5 100644 --- a/web/staticmoduleinfo.php +++ b/web/staticmoduleinfo.php @@ -17,8 +17,9 @@ $licence=extract_field('licence',$module_path); $license=extract_field('license',$module_path); $url_prefix = getenv("URLPREFIX"); ?> - - +
+
+ @@ -31,19 +32,19 @@ $url_prefix = getenv("URLPREFIX");

-
Browse Source
- +
+ - + - + - + - + + + - + + - + - + -

Module:

Summary:

Maintainer:

Author:

Dependencies: 

 '.$dep.' ';
@@ -71,7 +72,7 @@ if ($dependencies) {
 
 if ($extdepends) {
 ?>
-

External dependencies:

-

Description:

See Also: 

 '.$see.' ';
@@ -104,7 +105,7 @@ if ($see_also) {
 
 if ($example) {
 ?>
-

Example:

License:

License:

+ + diff --git a/web/staticupload.php b/web/staticupload.php index 9c4763cf..d692bf53 100644 --- a/web/staticupload.php +++ b/web/staticupload.php @@ -5,7 +5,7 @@ include('logo.html'); include('menulist.html'); include('static-configuration'); ?> - +

Upload Code

@@ -50,5 +50,5 @@ people can browse and download it.
-
+