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

diff --git a/Makefile b/Makefile
index 65d0d8fc97f475ca9a5998a1ad509ce92cf528f8..9d2639a23d2caeb61abc02f8ec17a532c744724c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ ccan/%/info: ccan/%/_info
        $(CC) $(CCAN_CFLAGS) -o $@ -x c $<
 
 clean: tools-clean
        $(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
 
        $(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 20a1a2f3e70c039d121282ddc7fa379124487ae8..7f797e41d390a40c756fb5d695bbe055c262e1f1 100644 (file)
--- a/Makefile-web
+++ b/Makefile-web
@@ -20,7 +20,7 @@ modcheck:
 clean-tree:
        ! git status --porcelain | grep .
 
 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)
 
 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
 
 $(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)
 
 # 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)/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
        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 (file)
index 0000000..9e1e83f
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 (file)
index 0000000..80bd6d8
--- /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 (file)
index 0000000..55c8e58
Binary files /dev/null and b/web/ccan.png differ

diff --git a/web/ccan.svg b/web/ccan.svg
new file mode 100644 (file)
index 0000000..7fda664
--- /dev/null
+++ b/web/ccan.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="ccan.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-122.85714 : 306 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="389.14286 : 306 : 1"
+       inkscape:persp3d-origin="133.14286 : 220.66667 : 1"
+       id="perspective2985" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="263.10276"
+     inkscape:cy="-370.12924"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     inkscape:window-width="1065"
+     inkscape:window-height="719"
+     inkscape:window-x="297"
+     inkscape:window-y="5"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="0,1"
+       position="294.96454,-321.22851"
+       id="guide3001" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="574.7768,-432.34529"
+       id="guide3003" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-540.36218)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 266.88442,828.39033 41.12911,-57.27809 c 1.18559,-1.6511 2.14005,-1.4976 2.14005,0.34419 l 0,34.78839 c 0,1.84179 -0.95446,4.65376 -2.14005,6.30487 0,0 2.96234,52.54131 -41.12911,57.27808 -44.09145,4.73677 -3.46179,1.04166 -2.14005,-0.34421 0,0 16.38578,-11.41837 35.41684,-42.03522 19.03106,-30.61685 -34.46237,2.59308 -33.27679,0.94199 z"
+       id="rect3773"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssszszs" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.69960141;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3001"
+       width="83.084915"
+       height="55.408539"
+       x="388.37576"
+       y="1111.6819"
+       transform="matrix(0.65755576,-0.75340588,0,1,0,0)"
+       ry="8.5714283"
+       rx="8.3203764" />
+    <text
+       xml:space="preserve"
+       style="font-size:161.42332458px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
+       x="141.63165"
+       y="870.3808"
+       id="text3823"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3825"
+         x="141.63165"
+         y="870.3808">CC</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3827"
+       y="870.3808"
+       x="439.62967"
+       style="font-size:161.42332458px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Times New Roman;-inkscape-font-specification:Times New Roman"
+       xml:space="preserve"><tspan
+         y="870.3808"
+         x="439.62967"
+         id="tspan3829"
+         sodipodi:role="line">N</tspan></text>
+    <path
+       sodipodi:nodetypes="ssssszsss"
+       inkscape:connector-curvature="0"
+       id="path3831"
+       d="m 284.12042,1441.4296 24.38944,-57.6892 c 0.75652,-1.7895 1.59768,-1.6447 1.59768,0.2432 l 0,35.6591 c 0,1.8879 -0.71256,4.8191 -1.59768,6.5722 0,0 1.50908,40.7486 -29.53205,58.4925 -31.04115,17.7438 -2.22247,1.5804 -1.59769,-0.2433 l 14.1422,-41.2815 c 0.6248,-1.8238 -8.15842,0.037 -7.4019,-1.753 z"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946" />
+    <path
+       sodipodi:nodetypes="ssssszsss"
+       inkscape:connector-curvature="0"
+       id="path3833"
+       d="m 265.75547,1442.3424 42.15845,-58.7116 c 1.21526,-1.6924 2.19361,-1.5351 2.19361,0.3528 l 0,35.6591 c 0,1.8879 -0.97835,4.7702 -2.19361,6.4626 0,0 -12.49502,40.3957 -42.15845,58.7116 -29.66342,18.316 -3.0549,1.4111 -2.19361,-0.3528 l 17.99917,-36.8639 c 0.86129,-1.764 -17.02081,-3.5654 -15.80556,-5.2578 z"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946" />
+    <rect
+       rx="8.3203764"
+       ry="8.5714273"
+       transform="matrix(0.65755576,-0.75340588,0,1,0,0)"
+       y="1723.7775"
+       x="386.22098"
+       height="56.79525"
+       width="85.164284"
+       id="rect3835"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.69960141;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 339.86594,1441.4296 -24.38945,-57.6892 c -0.75651,-1.7895 -1.59766,-1.6447 -1.59766,0.2432 l 0,35.6591 c 0,1.8879 0.71255,4.8191 1.59766,6.5722 0,0 -1.50907,40.7486 29.53207,58.4925 31.04114,17.7438 2.22245,1.5804 1.59768,-0.2433 l -14.1422,-41.2815 c -0.62479,-1.8238 8.15843,0.037 7.4019,-1.753 z"
+       id="path3837"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssszsss"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
+       d="m 358.23088,1442.3424 -42.15843,-58.7116 c -1.21527,-1.6924 -2.19362,-1.5351 -2.19362,0.3528 l 0,35.6591 c 0,1.8879 0.97835,4.7702 2.19362,6.4626 0,0 12.49501,40.3957 42.15843,58.7116 29.66343,18.316 3.0549,1.4111 2.19361,-0.3528 l -17.99916,-36.8639 c -0.86128,-1.764 17.02082,-3.5654 15.80555,-5.2578 z"
+       id="path3839"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssszsss"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.69960141;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect3841"
+       width="85.164284"
+       height="56.79525"
+       x="-562.72729"
+       y="1008.8343"
+       transform="matrix(-0.65755576,-0.75340588,0,1,0,0)"
+       ry="8.5714273"
+       rx="8.3203764"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3843"
+       y="1482.5332"
+       x="141.63165"
+       style="font-size:161.42332458000001338px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSerif;-inkscape-font-specification:FreeSerif"
+       xml:space="preserve"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946"><tspan
+         y="1482.5332"
+         x="141.63165"
+         id="tspan3845"
+         sodipodi:role="line">CC</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:161.42332458000001338px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSerif;-inkscape-font-specification:FreeSerif"
+       x="439.62967"
+       y="1482.5332"
+       id="text3847"
+       sodipodi:linespacing="125%"
+       inkscape:export-filename="/home/chrism/dev/ccan/web/ccan.png"
+       inkscape:export-xdpi="78.723946"
+       inkscape:export-ydpi="78.723946"><tspan
+         sodipodi:role="line"
+         id="tspan3849"
+         x="439.62967"
+         y="1482.5332">N</tspan></text>
+    <path
+       sodipodi:nodetypes="ssssszszs"
+       inkscape:connector-curvature="0"
+       id="path3851"
+       d="M 353.67481,828.39033 312.5457,771.11224 c -1.18559,-1.6511 -2.14005,-1.4976 -2.14005,0.34419 l 0,34.78839 c 0,1.84179 0.95446,4.65376 2.14005,6.30487 0,0 -2.96234,52.54131 41.12911,57.27808 44.09145,4.73677 3.46179,1.04166 2.14005,-0.34421 0,0 -16.38578,-11.41837 -35.41684,-42.03522 -19.03106,-30.61685 34.46237,2.59308 33.27679,0.94199 z"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" />
+    <rect
+       rx="8.3203764"
+       ry="8.5714283"
+       transform="matrix(-0.65755576,-0.75340588,0,1,0,0)"
+       y="400.66544"
+       x="-555.36047"
+       height="55.408539"
+       width="83.084915"
+       id="rect3853"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3.69960141;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  </g>
+</svg>

diff --git a/web/logo.html b/web/logo.html
index 9a15f28a410bc57fe578d850e31667df09123b23..f4af2763bc1417a3c075c14adae5973c42211966 100644 (file)
--- a/web/logo.html
+++ b/web/logo.html
@@ -2,18 +2,17 @@
 // Pages created in subdirs need ../ appended.
 $url_prefix = getenv("URLPREFIX");
 ?>
 // Pages created in subdirs need ../ appended.
 $url_prefix = getenv("URLPREFIX");
 ?>

+<!doctype html>

 <html>
 <head>
 <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>
 <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>

diff --git a/web/menulist.html b/web/menulist.html
index b49bcbc45168bc6617344c62262c98f806ac9feb..8b7fdef89a0367f972c76a84d33455d70bbb9a48 100644 (file)
--- a/web/menulist.html
+++ b/web/menulist.html
@@ -2,24 +2,19 @@
 // Pages created in subdirs need ../ appended.
 $url_prefix = getenv("URLPREFIX");
 ?>
 // 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>

diff --git a/web/staticall.php b/web/staticall.php
index e976406b3330a9082d20c5c5c69e38eca90869a9..39b529cefe1a6456187d11a42d54d49bb416e2ca 100644 (file)
--- 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);
 ?>
 
 $tarballsize=round((filesize($argv[3]."/ccan.tar.bz2") + 1023) / 1024);
 ?>

-
+<div class='content'>

 <h1> List of all CCAN modules: </h1>
 
 <p>
 <h1> List of all CCAN modules: </h1>
 
 <p>


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

-<hr>
+</div>

 </body></html>
 </body></html>

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

-
+<div class='content'>

 <h2>The Idea</h2>
 
 <p>
 <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>
 <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>
 </body></html>

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

-
+<div class='content'>

 <h1> Contents of CCAN <?=$argv[1]?> </h1>
 <p>
 
 <h1> Contents of CCAN <?=$argv[1]?> </h1>
 <p>
 


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

-<hr>
+</div>

 </body></html>
 </body></html>

diff --git a/web/staticmoduleinfo.php b/web/staticmoduleinfo.php
index 2174f7a598c8c78ef11bed1141010e46684a7791..98edf9b52a746b209ac916fe3b410f00b6d16eb0 100644 (file)
--- 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");
 ?>
 $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>
 <td>
 <a href="<?=$repo_base.$module?>">Browse Source</a>
 </td>


@@ -31,19 +32,19 @@ $url_prefix = getenv("URLPREFIX");
 <p>
 </p>
 
 <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>
 
 <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) {
 ?>
 <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
 <td><h3>Maintainer: </h3> <?=$maintainer?></td>
 </tr>
 <?php


@@ -51,7 +52,7 @@ if ($maintainer) {
 
 if ($author) {
 ?>
 
 if ($author) {
 ?>

-<tr align="left" bgcolor="FFFFCC"> 
+<tr align="left"> 

 <td><h3>Author: </h3> <?=$author?></td>
 </tr>
 <?php
 <td><h3>Author: </h3> <?=$author?></td>
 </tr>
 <?php


@@ -59,7 +60,7 @@ if ($author) {
 
 if ($dependencies) {
 ?>
 
 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> ';
 <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) {
 ?>
 
 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);
 <td><h3>External dependencies: </h3> <?php
        foreach (split("\n", $extdepends) as $dep) {
                $fields=preg_split("/\s+/", $dep);


@@ -85,14 +86,14 @@ if ($extdepends) {
 <?php 
 }
 ?>
 <?php 
 }
 ?>

-<tr align="left" bgcolor="FFFFCC">
+<tr align="left">

 <td><h3>Description: </h3> <?=$description;?> </td>
 </tr>
 
 <?php 
 if ($see_also) {
 ?>
 <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> ';
 <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) {
 ?>
 
 if ($example) {
 ?>

-<tr align="left" bgcolor="FFFFCC"> 
+<tr align="left"> 

 <td><h3>Example: </h3> <pre><?=$example?></pre></td>
 </tr>
 <?php
 <td><h3>Example: </h3> <pre><?=$example?></pre></td>
 </tr>
 <?php


@@ -112,7 +113,7 @@ if ($example) {
 
 if ($licence) {
 ?>
 
 if ($licence) {
 ?>

-<tr align="left" bgcolor="FFFFCC"> 
+<tr align="left"> 

 <td><h3>License: </h3> <?=$licence?></td>
 </tr>
 <?php
 <td><h3>License: </h3> <?=$licence?></td>
 </tr>
 <?php


@@ -120,11 +121,12 @@ if ($licence) {
 
 if ($license) {
 ?>
 
 if ($license) {
 ?>

-<tr align="left" bgcolor="FFFFCC"> 
+<tr align="left"> 

 <td><h3>License: </h3> <?=$license?></td>
 </tr>
 <?php
 }
 ?>
 <td><h3>License: </h3> <?=$license?></td>
 </tr>
 <?php
 }
 ?>

-</table><hr>
+</table>
+</div>

 </body></html>
 </body></html>

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

-<html>
+<div class='content'>

 <h3 align="center"> Upload Code</h3>
 
 <table width="70%" align="center">
 <h3 align="center"> Upload Code</h3>
 
 <table width="70%" align="center">


@@ -50,5 +50,5 @@ people can browse and download it.
 </tr>
 </table>
 </form>
 </tr>
 </table>
 </form>

-<hr>
+</div>

 </html>
 </html>