More layout fixes

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cgit.css b/cgit.css
index e06fdeaba6406a6fff4669fd5fad2d59b082a4ae..8f3d00cc8b908f5d4ef4c350aaf471dd5dfb96f5 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -34,30 +34,50 @@ table#header td.logo {
 }
 
 table#header td.main {
-       font-size: 200%;
+       font-size: 250%;
+       padding-left: 10px;
+}
+
+table#header td.main a {
+       color: #000;
+}
+
+table#header td.form {
+       text-align: right;
+       vertical-align: bottom;
+       padding-right: 1em;
+       padding-bottom: 2px;
+}
+
+table#header td.form form,
+table#header td.form input,
+table#header td.form select {
+       font-size: 90%;
 }
 
 table#header td.sub {
        color: #777;
        border-top: solid 1px #ccc;
+       padding-left: 10px;
 }
 
 table.tabs {
-       border-bottom: solid 2px #ccc;
+       /* border-bottom: solid 2px #ccc; */
        border-collapse: collapse;
        margin-top: 2em;
-       margin-bottom: 1em;
+       margin-bottom: 0px;
        width: 100%;
 }
 
 table.tabs td {
-       padding: 0px 0.5em;
+       padding: 0px 1em;
        vertical-align: bottom;
 }
 
 table.tabs td a {
-       padding: 2px 1em;
-       color: #007;
+       padding: 2px 0.75em;
+       color: #777;
+       font-size: 110%;
 }
 
 table.tabs td a.active {
@@ -65,18 +85,25 @@ table.tabs td a.active {
        background-color: #ccc;
 }
 
-table.tabs td.branch {
+table.tabs td.form {
        text-align: right;
 }
 
-table.tabs td.branch form {
+table.tabs td.form form {
        padding-bottom: 2px;
        font-size: 90%;
 }
 
+table.tabs td.form input,
+table.tabs td.form select {
+       font-size: 90%;
+}
+
 div.content {
        margin: 0px;
-       padding: 1em;
+       padding: 2em;
+       border-top: solid 3px #ccc;
+       border-bottom: solid 3px #ccc;
 }
 
 
@@ -99,9 +126,12 @@ table.list tr.nohover:hover {
 }
 
 table.list th {
-       font-weight: normal;
-       border-bottom: solid 1px #ccc;
-       padding: 0.1em 0.5em 0.1em 0.5em;
+       font-weight: bold;
+       /* color: #888;
+       border-top: dashed 1px #888;
+       border-bottom: dashed 1px #888;
+       */
+       padding: 0.1em 0.5em 0.05em 0.5em;
        vertical-align: baseline;
 }
 
@@ -360,17 +390,17 @@ table.list td.repogroup {
 
 a.button {
        font-size: 80%;
-       color: #aaa;
+       color: #33c;
+/*
        background-color: #eee;
        border: solid 1px #aaa;
-       padding: 0em 0.5em;
        margin: 0.1em 0.25em;
+*/
+       padding: 0em 0.5em;
 }
 
 a.button:hover {
-       text-decoration: none;
-       color: #333;
-       background-color: #ccc;
+       text-decoration: underline;
 }
 
 a.primary {

diff --git a/ui-repolist.c b/ui-repolist.c
index eeeaf3d533d2be1546c42de9d769717a9f3350b8..9eba2226356c6ba759c488dff98b3abc1f0ebd26 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -70,7 +70,7 @@ void cgit_print_repolist()
             "<th class='left'>Owner</th>"
             "<th class='left'>Idle</th>");
        if (ctx.cfg.enable_index_links)
-               html("<th>Links</th>");
+               html("<th class='left'>Links</th>");
        html("</tr>\n");
 
        for (i=0; i<cgit_repolist.count; i++) {

diff --git a/ui-shared.c b/ui-shared.c
index 73e3d4cc81f2216bc2c9edaa495057ab8b0e6034..782caa78e181eb067e8ab18aca6a1578168389a7 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -389,7 +389,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
 
 void cgit_print_docend()
 {
-       html("</td>\n</tr>\n</table>\n</body>\n</html>\n");
+       html("</div>\n</body>\n</html>\n");
 }
 
 int print_branch_option(const char *refname, const unsigned char *sha1,
@@ -485,21 +485,46 @@ void cgit_print_pageheader(struct cgit_context *ctx)
        html("'><img src='");
        html_attr(ctx->cfg.logo);
        html("'/></a></td>\n");
+
        html("<td class='main'>");
        if (ctx->repo) {
+/*
                html("<a href='");
                html_attr(cgit_rooturl());
-               html("'>index</a> / ");
-               html_txt(ctx->repo->name);
+               html("'>index</a> : ");
+*/
+               reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
+                           ctx->qry.head, NULL, NULL);
+               html(" : ");
+               html_txt(ctx->qry.page);
+               html("</td><td class='form'>");
+               html("<form method='get' action=''>\n");
+               add_hidden_formfields(0, 1, ctx->qry.page);
+               html("<select name='h' onchange='this.form.submit();'>\n");
+               for_each_branch_ref(print_branch_option, ctx->qry.head);
+               html("</select> ");
+               html("<input type='submit' name='' value='switch'/>");
+               html("</form>");
        } else
                html_txt(ctx->cfg.root_title);
-       html("</td></tr>\n");
-       html("<tr><td class='sub'>");
-       if (ctx->repo)
+       html("</td>\n");
+
+       html("<tr><td class='sub'");
+       if (ctx->repo) {
+               html(" colspan='2'>");
                html_txt(ctx->repo->desc);
-       else
-               html_txt(ctx->cfg.index_info);
+       }
+/*
+       else if (ctx->cfg.root_subtitle)
+               html_txt(ctx->cfg.root_subtitle);
+*/
+       else {
+               html(">");
+               html_txt("a fast webinterface for the git dscm");
+       }
        html("</td></tr>\n");
+
+       html("</tr>\n");
        html("</table>\n");
 
        html("<table class='tabs'><tr><td>\n");
@@ -518,13 +543,23 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                               ctx->qry.sha1, ctx->qry.sha2, NULL);
                cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
                                ctx->qry.sha1);
-               html("</td><td class='branch'>");
-               html("<form method='get' action=''>\n");
-               add_hidden_formfields(0, 1, ctx->qry.page);
-               html("<select name='h' onchange='this.form.submit();'>\n");
-               for_each_branch_ref(print_branch_option, ctx->qry.head);
-               html("</select> ");
-               html("<input type='submit' name='' value='switch'/>");
+               html("</td><td class='form'>");
+               html("<form class='right' method='get' action='");
+               if (ctx->cfg.virtual_root)
+                       html_attr(cgit_fileurl(ctx->qry.repo, "log",
+                                              ctx->qry.path, NULL));
+               html("'>\n");
+               add_hidden_formfields(1, 0, "log");
+               html("<select name='qt'>\n");
+               html_option("grep", "log msg", ctx->qry.grep);
+               html_option("author", "author", ctx->qry.grep);
+               html_option("committer", "committer", ctx->qry.grep);
+               html("</select>\n");
+               html("<input class='txt' type='text' size='8' name='q' value='");
+               html_attr(ctx->qry.search);
+               html("'/>\n");
+               html("<input type='submit' value='search'/>\n");
+               html("</form>\n");
        } else {
                html("<a class='active' href='");
                html_attr(cgit_rooturl());