summaryrefslogtreecommitdiffabout
path: root/ui-shared.c
authorLars Hjemli <hjemli@gmail.com>2008-04-13 08:57:11 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-13 08:57:11 (UTC)
commit931fc6d1e4986a4566647dda16af09bf69a28b89 (patch) (unidiff)
tree733a9b7292e98d60ae0e40b5f249fa250f32b2d6 /ui-shared.c
parent72a69b77e7bf10cc3674e61e1ddd4d81618ee533 (diff)
downloadcgit-931fc6d1e4986a4566647dda16af09bf69a28b89.zip
cgit-931fc6d1e4986a4566647dda16af09bf69a28b89.tar.gz
cgit-931fc6d1e4986a4566647dda16af09bf69a28b89.tar.bz2
More layout fixes
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-shared.c') (more/less context) (show whitespace changes)
-rw-r--r--ui-shared.c65
1 files changed, 50 insertions, 15 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 73e3d4c..782caa7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -344,224 +344,259 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
344 htmlf("<span class='age-weeks'>%.0f weeks</span>", 344 htmlf("<span class='age-weeks'>%.0f weeks</span>",
345 secs * 1.0 / TM_WEEK); 345 secs * 1.0 / TM_WEEK);
346 return; 346 return;
347 } 347 }
348 if (secs < TM_YEAR * 2) { 348 if (secs < TM_YEAR * 2) {
349 htmlf("<span class='age-months'>%.0f months</span>", 349 htmlf("<span class='age-months'>%.0f months</span>",
350 secs * 1.0 / TM_MONTH); 350 secs * 1.0 / TM_MONTH);
351 return; 351 return;
352 } 352 }
353 htmlf("<span class='age-years'>%.0f years</span>", 353 htmlf("<span class='age-years'>%.0f years</span>",
354 secs * 1.0 / TM_YEAR); 354 secs * 1.0 / TM_YEAR);
355} 355}
356 356
357void cgit_print_http_headers(struct cgit_context *ctx) 357void cgit_print_http_headers(struct cgit_context *ctx)
358{ 358{
359 if (ctx->page.mimetype && ctx->page.charset) 359 if (ctx->page.mimetype && ctx->page.charset)
360 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, 360 htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
361 ctx->page.charset); 361 ctx->page.charset);
362 else if (ctx->page.mimetype) 362 else if (ctx->page.mimetype)
363 htmlf("Content-Type: %s\n", ctx->page.mimetype); 363 htmlf("Content-Type: %s\n", ctx->page.mimetype);
364 if (ctx->page.filename) 364 if (ctx->page.filename)
365 htmlf("Content-Disposition: inline; filename=\"%s\"\n", 365 htmlf("Content-Disposition: inline; filename=\"%s\"\n",
366 ctx->page.filename); 366 ctx->page.filename);
367 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); 367 htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
368 htmlf("Expires: %s\n", http_date(ctx->page.expires)); 368 htmlf("Expires: %s\n", http_date(ctx->page.expires));
369 html("\n"); 369 html("\n");
370} 370}
371 371
372void cgit_print_docstart(struct cgit_context *ctx) 372void cgit_print_docstart(struct cgit_context *ctx)
373{ 373{
374 html(cgit_doctype); 374 html(cgit_doctype);
375 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 375 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
376 html("<head>\n"); 376 html("<head>\n");
377 html("<title>"); 377 html("<title>");
378 html_txt(ctx->page.title); 378 html_txt(ctx->page.title);
379 html("</title>\n"); 379 html("</title>\n");
380 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); 380 htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
381 if (ctx->cfg.robots && *ctx->cfg.robots) 381 if (ctx->cfg.robots && *ctx->cfg.robots)
382 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); 382 htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
383 html("<link rel='stylesheet' type='text/css' href='"); 383 html("<link rel='stylesheet' type='text/css' href='");
384 html_attr(ctx->cfg.css); 384 html_attr(ctx->cfg.css);
385 html("'/>\n"); 385 html("'/>\n");
386 html("</head>\n"); 386 html("</head>\n");
387 html("<body>\n"); 387 html("<body>\n");
388} 388}
389 389
390void cgit_print_docend() 390void cgit_print_docend()
391{ 391{
392 html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); 392 html("</div>\n</body>\n</html>\n");
393} 393}
394 394
395int print_branch_option(const char *refname, const unsigned char *sha1, 395int print_branch_option(const char *refname, const unsigned char *sha1,
396 int flags, void *cb_data) 396 int flags, void *cb_data)
397{ 397{
398 char *name = (char *)refname; 398 char *name = (char *)refname;
399 html_option(name, name, ctx.qry.head); 399 html_option(name, name, ctx.qry.head);
400 return 0; 400 return 0;
401} 401}
402 402
403int print_archive_ref(const char *refname, const unsigned char *sha1, 403int print_archive_ref(const char *refname, const unsigned char *sha1,
404 int flags, void *cb_data) 404 int flags, void *cb_data)
405{ 405{
406 struct tag *tag; 406 struct tag *tag;
407 struct taginfo *info; 407 struct taginfo *info;
408 struct object *obj; 408 struct object *obj;
409 char buf[256], *url; 409 char buf[256], *url;
410 unsigned char fileid[20]; 410 unsigned char fileid[20];
411 int *header = (int *)cb_data; 411 int *header = (int *)cb_data;
412 412
413 if (prefixcmp(refname, "refs/archives")) 413 if (prefixcmp(refname, "refs/archives"))
414 return 0; 414 return 0;
415 strncpy(buf, refname+14, sizeof(buf)); 415 strncpy(buf, refname+14, sizeof(buf));
416 obj = parse_object(sha1); 416 obj = parse_object(sha1);
417 if (!obj) 417 if (!obj)
418 return 1; 418 return 1;
419 if (obj->type == OBJ_TAG) { 419 if (obj->type == OBJ_TAG) {
420 tag = lookup_tag(sha1); 420 tag = lookup_tag(sha1);
421 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 421 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
422 return 0; 422 return 0;
423 hashcpy(fileid, tag->tagged->sha1); 423 hashcpy(fileid, tag->tagged->sha1);
424 } else if (obj->type != OBJ_BLOB) { 424 } else if (obj->type != OBJ_BLOB) {
425 return 0; 425 return 0;
426 } else { 426 } else {
427 hashcpy(fileid, sha1); 427 hashcpy(fileid, sha1);
428 } 428 }
429 if (!*header) { 429 if (!*header) {
430 html("<h1>download</h1>\n"); 430 html("<h1>download</h1>\n");
431 *header = 1; 431 *header = 1;
432 } 432 }
433 url = cgit_pageurl(ctx.qry.repo, "blob", 433 url = cgit_pageurl(ctx.qry.repo, "blob",
434 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid), 434 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
435 buf)); 435 buf));
436 html_link_open(url, NULL, "menu"); 436 html_link_open(url, NULL, "menu");
437 html_txt(strlpart(buf, 20)); 437 html_txt(strlpart(buf, 20));
438 html_link_close(); 438 html_link_close();
439 return 0; 439 return 0;
440} 440}
441 441
442void add_hidden_formfields(int incl_head, int incl_search, char *page) 442void add_hidden_formfields(int incl_head, int incl_search, char *page)
443{ 443{
444 char *url; 444 char *url;
445 445
446 if (!ctx.cfg.virtual_root) { 446 if (!ctx.cfg.virtual_root) {
447 url = fmt("%s/%s", ctx.qry.repo, page); 447 url = fmt("%s/%s", ctx.qry.repo, page);
448 if (ctx.qry.path) 448 if (ctx.qry.path)
449 url = fmt("%s/%s", url, ctx.qry.path); 449 url = fmt("%s/%s", url, ctx.qry.path);
450 html_hidden("url", url); 450 html_hidden("url", url);
451 } 451 }
452 452
453 if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch)) 453 if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
454 html_hidden("h", ctx.qry.head); 454 html_hidden("h", ctx.qry.head);
455 455
456 if (ctx.qry.sha1) 456 if (ctx.qry.sha1)
457 html_hidden("id", ctx.qry.sha1); 457 html_hidden("id", ctx.qry.sha1);
458 if (ctx.qry.sha2) 458 if (ctx.qry.sha2)
459 html_hidden("id2", ctx.qry.sha2); 459 html_hidden("id2", ctx.qry.sha2);
460 460
461 if (incl_search) { 461 if (incl_search) {
462 if (ctx.qry.grep) 462 if (ctx.qry.grep)
463 html_hidden("qt", ctx.qry.grep); 463 html_hidden("qt", ctx.qry.grep);
464 if (ctx.qry.search) 464 if (ctx.qry.search)
465 html_hidden("q", ctx.qry.search); 465 html_hidden("q", ctx.qry.search);
466 } 466 }
467} 467}
468 468
469char *hc(struct cgit_cmd *cmd, const char *page) 469char *hc(struct cgit_cmd *cmd, const char *page)
470{ 470{
471 return (strcmp(cmd->name, page) ? NULL : "active"); 471 return (strcmp(cmd->name, page) ? NULL : "active");
472} 472}
473 473
474void cgit_print_pageheader(struct cgit_context *ctx) 474void cgit_print_pageheader(struct cgit_context *ctx)
475{ 475{
476 struct cgit_cmd *cmd = cgit_get_cmd(ctx); 476 struct cgit_cmd *cmd = cgit_get_cmd(ctx);
477 477
478 html("<table id='header'>\n"); 478 html("<table id='header'>\n");
479 html("<tr>\n"); 479 html("<tr>\n");
480 html("<td class='logo' rowspan='2'><a href='"); 480 html("<td class='logo' rowspan='2'><a href='");
481 if (ctx->cfg.logo_link) 481 if (ctx->cfg.logo_link)
482 html_attr(ctx->cfg.logo_link); 482 html_attr(ctx->cfg.logo_link);
483 else 483 else
484 html_attr(cgit_rooturl()); 484 html_attr(cgit_rooturl());
485 html("'><img src='"); 485 html("'><img src='");
486 html_attr(ctx->cfg.logo); 486 html_attr(ctx->cfg.logo);
487 html("'/></a></td>\n"); 487 html("'/></a></td>\n");
488
488 html("<td class='main'>"); 489 html("<td class='main'>");
489 if (ctx->repo) { 490 if (ctx->repo) {
491/*
490 html("<a href='"); 492 html("<a href='");
491 html_attr(cgit_rooturl()); 493 html_attr(cgit_rooturl());
492 html("'>index</a> / "); 494 html("'>index</a> : ");
493 html_txt(ctx->repo->name); 495*/
496 reporevlink(NULL, ctx->repo->name, NULL, hc(cmd, "summary"),
497 ctx->qry.head, NULL, NULL);
498 html(" : ");
499 html_txt(ctx->qry.page);
500 html("</td><td class='form'>");
501 html("<form method='get' action=''>\n");
502 add_hidden_formfields(0, 1, ctx->qry.page);
503 html("<select name='h' onchange='this.form.submit();'>\n");
504 for_each_branch_ref(print_branch_option, ctx->qry.head);
505 html("</select> ");
506 html("<input type='submit' name='' value='switch'/>");
507 html("</form>");
494 } else 508 } else
495 html_txt(ctx->cfg.root_title); 509 html_txt(ctx->cfg.root_title);
496 html("</td></tr>\n"); 510 html("</td>\n");
497 html("<tr><td class='sub'>"); 511
498 if (ctx->repo) 512 html("<tr><td class='sub'");
513 if (ctx->repo) {
514 html(" colspan='2'>");
499 html_txt(ctx->repo->desc); 515 html_txt(ctx->repo->desc);
500 else 516 }
501 html_txt(ctx->cfg.index_info); 517/*
518 else if (ctx->cfg.root_subtitle)
519 html_txt(ctx->cfg.root_subtitle);
520*/
521 else {
522 html(">");
523 html_txt("a fast webinterface for the git dscm");
524 }
502 html("</td></tr>\n"); 525 html("</td></tr>\n");
526
527 html("</tr>\n");
503 html("</table>\n"); 528 html("</table>\n");
504 529
505 html("<table class='tabs'><tr><td>\n"); 530 html("<table class='tabs'><tr><td>\n");
506 if (ctx->repo) { 531 if (ctx->repo) {
507 reporevlink(NULL, "summary", NULL, hc(cmd, "summary"), 532 reporevlink(NULL, "summary", NULL, hc(cmd, "summary"),
508 ctx->qry.head, NULL, NULL); 533 ctx->qry.head, NULL, NULL);
509 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, 534 cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head,
510 ctx->qry.sha1, NULL); 535 ctx->qry.sha1, NULL);
511 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, 536 cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head,
512 NULL, NULL, 0, NULL, NULL); 537 NULL, NULL, 0, NULL, NULL);
513 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, 538 cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head,
514 ctx->qry.sha1, NULL); 539 ctx->qry.sha1, NULL);
515 cgit_commit_link("commit", NULL, hc(cmd, "commit"), 540 cgit_commit_link("commit", NULL, hc(cmd, "commit"),
516 ctx->qry.head, ctx->qry.sha1); 541 ctx->qry.head, ctx->qry.sha1);
517 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, 542 cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head,
518 ctx->qry.sha1, ctx->qry.sha2, NULL); 543 ctx->qry.sha1, ctx->qry.sha2, NULL);
519 cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head, 544 cgit_patch_link("patch", NULL, hc(cmd, "patch"), ctx->qry.head,
520 ctx->qry.sha1); 545 ctx->qry.sha1);
521 html("</td><td class='branch'>"); 546 html("</td><td class='form'>");
522 html("<form method='get' action=''>\n"); 547 html("<form class='right' method='get' action='");
523 add_hidden_formfields(0, 1, ctx->qry.page); 548 if (ctx->cfg.virtual_root)
524 html("<select name='h' onchange='this.form.submit();'>\n"); 549 html_attr(cgit_fileurl(ctx->qry.repo, "log",
525 for_each_branch_ref(print_branch_option, ctx->qry.head); 550 ctx->qry.path, NULL));
526 html("</select> "); 551 html("'>\n");
527 html("<input type='submit' name='' value='switch'/>"); 552 add_hidden_formfields(1, 0, "log");
553 html("<select name='qt'>\n");
554 html_option("grep", "log msg", ctx->qry.grep);
555 html_option("author", "author", ctx->qry.grep);
556 html_option("committer", "committer", ctx->qry.grep);
557 html("</select>\n");
558 html("<input class='txt' type='text' size='8' name='q' value='");
559 html_attr(ctx->qry.search);
560 html("'/>\n");
561 html("<input type='submit' value='search'/>\n");
562 html("</form>\n");
528 } else { 563 } else {
529 html("<a class='active' href='"); 564 html("<a class='active' href='");
530 html_attr(cgit_rooturl()); 565 html_attr(cgit_rooturl());
531 html("'>index</a>\n"); 566 html("'>index</a>\n");
532 } 567 }
533 html("</td></tr></table>\n"); 568 html("</td></tr></table>\n");
534 html("<div class='content'>"); 569 html("<div class='content'>");
535} 570}
536 571
537void cgit_print_filemode(unsigned short mode) 572void cgit_print_filemode(unsigned short mode)
538{ 573{
539 if (S_ISDIR(mode)) 574 if (S_ISDIR(mode))
540 html("d"); 575 html("d");
541 else if (S_ISLNK(mode)) 576 else if (S_ISLNK(mode))
542 html("l"); 577 html("l");
543 else if (S_ISGITLINK(mode)) 578 else if (S_ISGITLINK(mode))
544 html("m"); 579 html("m");
545 else 580 else
546 html("-"); 581 html("-");
547 html_fileperm(mode >> 6); 582 html_fileperm(mode >> 6);
548 html_fileperm(mode >> 3); 583 html_fileperm(mode >> 3);
549 html_fileperm(mode); 584 html_fileperm(mode);
550} 585}
551 586
552void cgit_print_snapshot_links(const char *repo, const char *head, 587void cgit_print_snapshot_links(const char *repo, const char *head,
553 const char *hex, int snapshots) 588 const char *hex, int snapshots)
554{ 589{
555 const struct cgit_snapshot_format* f; 590 const struct cgit_snapshot_format* f;
556 char *filename; 591 char *filename;
557 592
558 for (f = cgit_snapshot_formats; f->suffix; f++) { 593 for (f = cgit_snapshot_formats; f->suffix; f++) {
559 if (!(snapshots & f->bit)) 594 if (!(snapshots & f->bit))
560 continue; 595 continue;
561 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, 596 filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
562 f->suffix); 597 f->suffix);
563 cgit_snapshot_link(filename, NULL, NULL, (char *)head, 598 cgit_snapshot_link(filename, NULL, NULL, (char *)head,
564 (char *)hex, filename); 599 (char *)hex, filename);
565 html("<br/>"); 600 html("<br/>");
566 } 601 }
567} 602}