new design for HTML pages

[ppastats.git] / src / html.c

diff --git a/src/html.c b/src/html.c
index 8a12524..a6acc2f 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 jeanfi@gmail.com
+ * Copyright (C) 2011-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -88,7 +88,7 @@ static char *get_header(const char *title, const char *script)
 
        if (res != tmp)
                free(tmp);
-       
+
        return res;
 }
 
@@ -470,22 +470,20 @@ version_to_html(struct ppa_stats *ppa,
                return ;
        }
 
-
        f_name = malloc(strlen(pkg->name)+1+strlen(version->version)+1);
        sprintf(f_name, "%s_%s", pkg->name, version->version);
 
        path = path_new(dir, f_name, ".html");
 
        script_tpl = "var data = %s;\n ppastats_ver();";
-       script = malloc(strlen(script_tpl) - 2 +strlen(json) + 1);
+       script = malloc(strlen(script_tpl) - 2 + strlen(json) + 1);
        sprintf(script, script_tpl, json);
-       
+
        create_html(path, f_name, body, script);
-                       
+
        free(json);
        free(path);
        free(f_name);
-
 }
 
 static void
@@ -549,7 +547,8 @@ ppa_to_html(const char *owner,
            const char *ppa,
            const char *package_status,
            const char *output_dir,
-           const int install_static_files)
+           const int install_static_files,
+           int ws_size)
 {
        struct ppa_stats *ppastats;
        char *path, *f_dst;
@@ -564,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" };
 
@@ -576,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);
@@ -588,7 +588,7 @@ ppa_to_html(const char *owner,
                free(js_dir);
        }
 
-       ppastats = create_ppa_stats(owner, ppa, package_status);
+       ppastats = create_ppa_stats(owner, ppa, package_status, ws_size);
 
        path = path_new(output_dir, "ppa", ".html");