Convert pager navigation into a unordered list

It is common practice and semantically appropriate to use unordered
lists for long navigation lists.

This also fixes the layout of very long pager navigations in
Webkit-based browsers.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>

diff --git a/cgit.css b/cgit.css
index 54da076617aed6964d24b83e0f6ed1fcaea2e64f..a50d62b01d05c54e268f1c40e51ba8449818132d 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -538,17 +538,23 @@ div#cgit table.list td.sublevel-repo {
        padding-left: 1.5em;
 }
 
        padding-left: 1.5em;
 }
 

-div#cgit div.pager {
+div#cgit ul.pager {
+       list-style-type: none;

        text-align: center;
        margin: 1em 0em 0em 0em;
        text-align: center;
        margin: 1em 0em 0em 0em;

+       padding: 0;

 }
 
 }
 

-div#cgit div.pager a {
+div#cgit ul.pager li {
+       display: inline-block;
+       margin: 0.25em 0.5em;
+}
+
+div#cgit ul.pager a {

        color: #777;
        color: #777;

-       margin: 0em 0.5em;

 }
 
 }
 

-div#cgit div.pager .current {
+div#cgit ul.pager .current {

        font-weight: bold;
 }
 
        font-weight: bold;
 }
 

diff --git a/ui-log.c b/ui-log.c
index 954d3e1ac5e574bd2a13ab1cb97a35388bd2e38c..aaffb4ef279e17cac4a4bedaab16e55a22ad6b3a 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -405,21 +405,24 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
        if (pager) {
                commit->parents = NULL;
        }
        if (pager) {

-               html("</table><div class='pager'>");
+               html("</table><ul class='pager'>");

                if (ofs > 0) {
                if (ofs > 0) {

+                       html("<li>");

                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);

-                       html("&nbsp;");
+                       html("</li>");

                }
                if ((commit = get_revision(&rev)) != NULL) {
                }
                if ((commit = get_revision(&rev)) != NULL) {

+                       html("<li>");

                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg);

+                       html("</li>");

                }
                }

-               html("</div>");
+               html("</ul>");

        } else if ((commit = get_revision(&rev)) != NULL) {
                htmlf("<tr class='nohover'><td colspan='%d'>", columns);
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,
        } else if ((commit = get_revision(&rev)) != NULL) {
                htmlf("<tr class='nohover'><td colspan='%d'>", columns);
                cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL,

diff --git a/ui-repolist.c b/ui-repolist.c
index 66c88c4b639b68b95001d57cec234e83a41d0af0..a9751f6ff0af6cc4fc18eedb302c306673b6c07e 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -128,13 +128,15 @@ static void print_pager(int items, int pagelen, char *search, char *sort)
 {
        int i, ofs;
        char *class = NULL;
 {
        int i, ofs;
        char *class = NULL;

-       html("<div class='pager'>");
+       html("<ul class='pager'>");

        for (i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
                class = (ctx.qry.ofs == ofs) ? "current" : NULL;
        for (i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
                class = (ctx.qry.ofs == ofs) ? "current" : NULL;

+               html("<li>");

                cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
                                class, search, sort, ofs);
                cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
                                class, search, sort, ofs);

+               html("</li>");

        }
        }

-       html("</div>");
+       html("</ul>");

 }
 
 static int cmp(const char *s1, const char *s2)
 }
 
 static int cmp(const char *s1, const char *s2)