Replace sidebar/logo

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index a41d2b2f03c181e73cf9ce2ce1b8657ad2851aaf..60c92690e12ceceeaf8c85f323a0f133653c65ca 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-shared.h"

 
 int files, add_lines, rem_lines;
 
 
 int files, add_lines, rem_lines;
 


@@ -25,7 +27,7 @@ void count_lines(char *line, int size)
 void inspect_files(struct diff_filepair *pair)
 {
        files++;
 void inspect_files(struct diff_filepair *pair)
 {
        files++;

-       if (cgit_repo->enable_log_linecount)
+       if (ctx.repo->enable_log_linecount)

                cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
                cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 


@@ -37,16 +39,16 @@ void print_commit(struct commit *commit)
        html("<tr><td>");
        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html("</td><td>");
        html("<tr><td>");
        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
        html("</td><td>");

-       cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
+       cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,

                         sha1_to_hex(commit->object.sha1));
                         sha1_to_hex(commit->object.sha1));

-       if (cgit_repo->enable_log_filecount) {
+       if (ctx.repo->enable_log_filecount) {

                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files);
                html("</td><td class='right'>");
                htmlf("%d", files);
                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files);
                html("</td><td class='right'>");
                htmlf("%d", files);

-               if (cgit_repo->enable_log_linecount) {
+               if (ctx.repo->enable_log_linecount) {

                        html("</td><td class='right'>");
                        htmlf("-%d/+%d", rem_lines, add_lines);
                }
                        html("</td><td class='right'>");
                        htmlf("-%d/+%d", rem_lines, add_lines);
                }


@@ -67,7 +69,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        int i;
 
        if (!tip)
        int i;
 
        if (!tip)

-               argv[1] = cgit_query_head;
+               argv[1] = ctx.qry.head;

 
        if (grep && pattern && (!strcmp(grep, "grep") ||
                                !strcmp(grep, "author") ||
 
        if (grep && pattern && (!strcmp(grep, "grep") ||
                                !strcmp(grep, "author") ||


@@ -94,9 +96,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        html("<tr class='nohover'><th class='left'>Age</th>"
             "<th class='left'>Message</th>");
 
        html("<tr class='nohover'><th class='left'>Age</th>"
             "<th class='left'>Message</th>");
 

-       if (cgit_repo->enable_log_filecount) {
+       if (ctx.repo->enable_log_filecount) {

                html("<th class='right'>Files</th>");
                html("<th class='right'>Files</th>");

-               if (cgit_repo->enable_log_linecount)
+               if (ctx.repo->enable_log_linecount)

                        html("<th class='right'>Lines</th>");
        }
        html("<th class='left'>Author</th></tr>\n");
                        html("<th class='right'>Lines</th>");
        }
        html("<th class='left'>Author</th></tr>\n");


@@ -123,17 +125,17 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager) {
                html("<div class='pager'>");
                if (ofs > 0) {
        if (pager) {
                html("<div class='pager'>");
                if (ofs > 0) {

-                       cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
-                                     cgit_query_sha1, cgit_query_path,
-                                     ofs - cnt, cgit_query_grep,
-                                     cgit_query_search);
+                       cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
+                                     ctx.qry.sha1, ctx.qry.path,
+                                     ofs - cnt, ctx.qry.grep,
+                                     ctx.qry.search);

                        html("&nbsp;");
                }
                if ((commit = get_revision(&rev)) != NULL) {
                        html("&nbsp;");
                }
                if ((commit = get_revision(&rev)) != NULL) {

-                       cgit_log_link("[next]", NULL, NULL, cgit_query_head,
-                                     cgit_query_sha1, cgit_query_path,
-                                     ofs + cnt, cgit_query_grep,
-                                     cgit_query_search);
+                       cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
+                                     ctx.qry.sha1, ctx.qry.path,
+                                     ofs + cnt, ctx.qry.grep,
+                                     ctx.qry.search);

                }
                html("</div>");
        }
                }
                html("</div>");
        }