From 1378a843b2e5ce3fbc4429b07844cc37d42e0d8e Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 13 Feb 2014 09:25:42 +0000 Subject: [PATCH] new design for HTML pages --- NEWS | 6 ++ src/html.c | 3 +- www/Makefile.am | 1 + www/Makefile.in | 1 + www/css/ppastats.css | 57 ++-------------- www/css/wpitchoune.css | 173 +++++++++++++++++++++++++++++++++++++++++++++++++ www/footer.tpl | 1 + www/footer.tpl.in | 1 + www/header.tpl | 4 +- www/js/ppastats.js | 11 ++-- www/pkg.tpl | 39 +++++++---- www/pkg_version.tpl | 32 +++++---- www/ppa.tpl | 17 +++-- 13 files changed, 253 insertions(+), 93 deletions(-) create mode 100644 www/css/wpitchoune.css diff --git a/NEWS b/NEWS index ec5ac58..46d67e3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +v1.0.0 +------ + +* new design for HTML pages. + + * v0.0.9 ** Fixed compilation issue related to 'boolean' type. diff --git a/src/html.c b/src/html.c index 6dc0c76..a6acc2f 100644 --- a/src/html.c +++ b/src/html.c @@ -563,6 +563,7 @@ ppa_to_html(const char *owner, "js/jquery.jqplot.min.js", DEFAULT_WWW_DIR"/excanvas.js", "js/excanvas.js", DEFAULT_WWW_DIR"/ppastats.css", "css/ppastats.css", + DEFAULT_WWW_DIR"/wpitchoune.css", "css/wpitchoune.css", DEFAULT_WWW_DIR"/jquery.jqplot.min.css", "css/jquery.jqplot.min.css" }; @@ -575,7 +576,7 @@ ppa_to_html(const char *owner, mkdir(css_dir, 0777); mkdir(js_dir, 0777); - for (i = 0; i < 7; i++) { + for (i = 0; i < 8; i++) { f_dst = path_append(output_dir, www_files[2*i+1]); log_debug(_("Copying %s %s"), www_files[2*i], f_dst); diff --git a/www/Makefile.am b/www/Makefile.am index 1dc9534..0ad2063 100644 --- a/www/Makefile.am +++ b/www/Makefile.am @@ -7,6 +7,7 @@ defaultwww_DATA = \ js/ppastats.js\ js/jqplot.dateAxisRenderer.min.js\ js/jquery.jqplot.min.js\ + css/wpitchoune.css\ css/ppastats.css\ css/jquery.jqplot.min.css\ pkg.tpl\ diff --git a/www/Makefile.in b/www/Makefile.in index a1c1ef5..729987c 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -234,6 +234,7 @@ defaultwww_DATA = \ js/ppastats.js\ js/jqplot.dateAxisRenderer.min.js\ js/jquery.jqplot.min.js\ + css/wpitchoune.css\ css/ppastats.css\ css/jquery.jqplot.min.css\ pkg.tpl\ diff --git a/www/css/ppastats.css b/www/css/ppastats.css index f7fec11..ba76347 100644 --- a/www/css/ppastats.css +++ b/www/css/ppastats.css @@ -1,56 +1,7 @@ -body { - padding: 1em 1em 1em 1em; - font-family: "Ubuntu", sans-serif; - color: #000; - background-color: #fff; +table.jqplot-table-legend { + width: auto; } -em { - font-weight: bold; - font-style: normal; +#pkgs, #distros > ul, #versions > ul{ + list-style-type: none; } - -a { - color: #1982D1; - font-style: normal; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -#charts { - color: #000; - float: right; - width: 80%; - margin: 0 0 0 0; - padding: 0 0 0 0; -} - -#details { - width: 20%; - float: left; -} - -li { - list-style: none; - padding: 0em 0em 0em 1em; -} - -h1 { - text-transform: uppercase; -} - -ul { - margin: 0 0 0 0; - padding: 0 0 0; -} - -#footer { - padding-top: 2em; - color: #666; - clear: both; - text-align: right; - font-size: 75%; -} \ No newline at end of file diff --git a/www/css/wpitchoune.css b/www/css/wpitchoune.css new file mode 100644 index 0000000..32cb5d0 --- /dev/null +++ b/www/css/wpitchoune.css @@ -0,0 +1,173 @@ + +body { + background: #e2e2e2; + color: #333333; + font-family: Ubuntu,Arial,sans-serif; + line-height: 1.6; + font-weight: lighter; + margin: 1em 1em 1em 1em; + padding: 0 0 0 0; +} + +h1 { + font-size: 2.813em; + margin: 0 0 0.267em 0; + padding: 0 0 0 0; + font-weight: normal; +} + +h2 { + font-size: 2em; + margin: 0 0 0.375em; + padding: 0 0 0 0; + font-weight: normal; +} + +h3 { + font-size: 1.438em; + margin: 0 0 0.522em; + padding: 0 0 0 0; + font-weight: normal; +} + +h4 { + font-size: 1.219em; + margin: 0 0 0.615em; + padding: 0 0 0 0; + font-weight: normal; +} + +h5 { + font-size: 1em; + margin: 0 0 0.75em; + padding: 0 0 0 0; + font-weight: bold; +} + +h6 { + font-weight: normal; + font-size: 0.813em; + letter-spacing: 0.1em; + margin: 0 0 0.923em; + text-transform: uppercase; + padding: 0 0 0 0; +} + +em { + font-weight: bold; + font-style: normal; +} + +li { + margin: 0 0 0 1em; + line-height: 1.6; +} + +li p { + margin: 0 0 0 0; +} + +ul { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +a:link, a:visited { + color: #19B6EE; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +code, pre, tt { + font-family: "Ubuntu Mono","Courier New",Courier,monospace; + font-weight: normal; + color: #333333; +} + +pre { + background: none repeat scroll 0 0 #e0e0e0; + border-radius: 4px; + padding: 0.5em 0.5em; + margin: 0 0 0 0; + white-space: pre-wrap; + word-wrap: break-word; +} + +table { + width: 100%; + text-align: left; +} + +#footer { + margin: 0 0 0 0; + font-size: 0.8em; + font-weight: lighter; + clear: both; + text-align: right; +} + +#page { + margin: 0 0 0 0; + padding: 0 0 0 0; +} + +#main, #menu { + background: #ffffff; + + -moz-box-sizing: border-box; + + padding: 1em 1em 1em 1em; + + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + + -webkit-box-shadow: 0 2px 2px 0 #C2C2C2; + box-shadow: 0 2px 2px 0 #C2C2C2; +} + +#menu-list, #menu-list > li > ul { + list-style-type: none; +} + +/* menu on left col, content on right col */ + +#menu { + float: left; + width: 19%; +} + +#main { + float: right; + width: 80%; +} + +/* asciidoc */ + +#toc, #content { + margin: 0em 0em 2em 0em; + + background: #ffffff; + -moz-box-sizing: border-box; + padding: 2em 2em 2em 2em; + + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + + -webkit-box-shadow: 0 2px 2px 0 #C2C2C2; + box-shadow: 0 2px 2px 0 #C2C2C2; +} + +li { + margin: 0 0 0 0; + padding: 0 0 0 1em; +} + +ul { + margin: 0 0 0 0; + padding: 0 0 0 0; +} \ No newline at end of file diff --git a/www/footer.tpl b/www/footer.tpl index b0feb3a..6fdc985 100644 --- a/www/footer.tpl +++ b/www/footer.tpl @@ -1,5 +1,6 @@ + diff --git a/www/footer.tpl.in b/www/footer.tpl.in index 1c75569..3dc7f5e 100644 --- a/www/footer.tpl.in +++ b/www/footer.tpl.in @@ -1,5 +1,6 @@ + diff --git a/www/header.tpl b/www/header.tpl index 0bd0327..ff52748 100644 --- a/www/header.tpl +++ b/www/header.tpl @@ -1,8 +1,7 @@ @TITLE@ - + @@ -13,4 +12,5 @@ +
diff --git a/www/js/ppastats.js b/www/js/ppastats.js index d5e95cb..1824508 100644 --- a/www/js/ppastats.js +++ b/www/js/ppastats.js @@ -94,15 +94,16 @@ function ppastats_pkg(json_url) { $("#ppa_name").html(data["ppa_name"]); $("#pkg_name").html(data["name"]); + $("#versions").append("