author | Lars Hjemli <hjemli@gmail.com> | 2009-08-18 11:14:11 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-18 11:14:11 (UTC) |
commit | 73b54f7d7e21fbb15c50e21eafe1737df96b2073 (patch) (unidiff) | |
tree | 50b27e54f940e4a3c645e48a73431d4014e18eed | |
parent | cb92d05b6b729cd0e219b43d7a79aff832a9c1ac (diff) | |
parent | 6421dc38db02eff8d3ada93e87a2f7e5292af131 (diff) | |
download | cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.zip cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.gz cgit-73b54f7d7e21fbb15c50e21eafe1737df96b2073.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | ui-shared.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/ui-shared.c b/ui-shared.c index cf06511..07d5dd4 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -249,522 +249,525 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
249 | if (rev && strcmp(rev, ctx.qry.head)) { | 249 | if (rev && strcmp(rev, ctx.qry.head)) { |
250 | html(delim); | 250 | html(delim); |
251 | html("id="); | 251 | html("id="); |
252 | html_url_arg(rev); | 252 | html_url_arg(rev); |
253 | } | 253 | } |
254 | html("'>"); | 254 | html("'>"); |
255 | html_txt(name); | 255 | html_txt(name); |
256 | html("</a>"); | 256 | html("</a>"); |
257 | } | 257 | } |
258 | 258 | ||
259 | void cgit_summary_link(char *name, char *title, char *class, char *head) | 259 | void cgit_summary_link(char *name, char *title, char *class, char *head) |
260 | { | 260 | { |
261 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 261 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
262 | } | 262 | } |
263 | 263 | ||
264 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 264 | void cgit_tag_link(char *name, char *title, char *class, char *head, |
265 | char *rev) | 265 | char *rev) |
266 | { | 266 | { |
267 | reporevlink("tag", name, title, class, head, rev, NULL); | 267 | reporevlink("tag", name, title, class, head, rev, NULL); |
268 | } | 268 | } |
269 | 269 | ||
270 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 270 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
271 | char *rev, char *path) | 271 | char *rev, char *path) |
272 | { | 272 | { |
273 | reporevlink("tree", name, title, class, head, rev, path); | 273 | reporevlink("tree", name, title, class, head, rev, path); |
274 | } | 274 | } |
275 | 275 | ||
276 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 276 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
277 | char *rev, char *path) | 277 | char *rev, char *path) |
278 | { | 278 | { |
279 | reporevlink("plain", name, title, class, head, rev, path); | 279 | reporevlink("plain", name, title, class, head, rev, path); |
280 | } | 280 | } |
281 | 281 | ||
282 | void cgit_log_link(char *name, char *title, char *class, char *head, | 282 | void cgit_log_link(char *name, char *title, char *class, char *head, |
283 | char *rev, char *path, int ofs, char *grep, char *pattern, | 283 | char *rev, char *path, int ofs, char *grep, char *pattern, |
284 | int showmsg) | 284 | int showmsg) |
285 | { | 285 | { |
286 | char *delim; | 286 | char *delim; |
287 | 287 | ||
288 | delim = repolink(title, class, "log", head, path); | 288 | delim = repolink(title, class, "log", head, path); |
289 | if (rev && strcmp(rev, ctx.qry.head)) { | 289 | if (rev && strcmp(rev, ctx.qry.head)) { |
290 | html(delim); | 290 | html(delim); |
291 | html("id="); | 291 | html("id="); |
292 | html_url_arg(rev); | 292 | html_url_arg(rev); |
293 | delim = "&"; | 293 | delim = "&"; |
294 | } | 294 | } |
295 | if (grep && pattern) { | 295 | if (grep && pattern) { |
296 | html(delim); | 296 | html(delim); |
297 | html("qt="); | 297 | html("qt="); |
298 | html_url_arg(grep); | 298 | html_url_arg(grep); |
299 | delim = "&"; | 299 | delim = "&"; |
300 | html(delim); | 300 | html(delim); |
301 | html("q="); | 301 | html("q="); |
302 | html_url_arg(pattern); | 302 | html_url_arg(pattern); |
303 | } | 303 | } |
304 | if (ofs > 0) { | 304 | if (ofs > 0) { |
305 | html(delim); | 305 | html(delim); |
306 | html("ofs="); | 306 | html("ofs="); |
307 | htmlf("%d", ofs); | 307 | htmlf("%d", ofs); |
308 | delim = "&"; | 308 | delim = "&"; |
309 | } | 309 | } |
310 | if (showmsg) { | 310 | if (showmsg) { |
311 | html(delim); | 311 | html(delim); |
312 | html("showmsg=1"); | 312 | html("showmsg=1"); |
313 | } | 313 | } |
314 | html("'>"); | 314 | html("'>"); |
315 | html_txt(name); | 315 | html_txt(name); |
316 | html("</a>"); | 316 | html("</a>"); |
317 | } | 317 | } |
318 | 318 | ||
319 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 319 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
320 | char *rev) | 320 | char *rev) |
321 | { | 321 | { |
322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 322 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
323 | name[ctx.cfg.max_msg_len] = '\0'; | 323 | name[ctx.cfg.max_msg_len] = '\0'; |
324 | name[ctx.cfg.max_msg_len - 1] = '.'; | 324 | name[ctx.cfg.max_msg_len - 1] = '.'; |
325 | name[ctx.cfg.max_msg_len - 2] = '.'; | 325 | name[ctx.cfg.max_msg_len - 2] = '.'; |
326 | name[ctx.cfg.max_msg_len - 3] = '.'; | 326 | name[ctx.cfg.max_msg_len - 3] = '.'; |
327 | } | 327 | } |
328 | reporevlink("commit", name, title, class, head, rev, NULL); | 328 | reporevlink("commit", name, title, class, head, rev, NULL); |
329 | } | 329 | } |
330 | 330 | ||
331 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 331 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
332 | char *rev, char *path) | 332 | char *rev, char *path) |
333 | { | 333 | { |
334 | reporevlink("refs", name, title, class, head, rev, path); | 334 | reporevlink("refs", name, title, class, head, rev, path); |
335 | } | 335 | } |
336 | 336 | ||
337 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 337 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
338 | char *rev, char *archivename) | 338 | char *rev, char *archivename) |
339 | { | 339 | { |
340 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 340 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
341 | } | 341 | } |
342 | 342 | ||
343 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 343 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
344 | char *new_rev, char *old_rev, char *path) | 344 | char *new_rev, char *old_rev, char *path) |
345 | { | 345 | { |
346 | char *delim; | 346 | char *delim; |
347 | 347 | ||
348 | delim = repolink(title, class, "diff", head, path); | 348 | delim = repolink(title, class, "diff", head, path); |
349 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 349 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
350 | html(delim); | 350 | html(delim); |
351 | html("id="); | 351 | html("id="); |
352 | html_url_arg(new_rev); | 352 | html_url_arg(new_rev); |
353 | delim = "&"; | 353 | delim = "&"; |
354 | } | 354 | } |
355 | if (old_rev) { | 355 | if (old_rev) { |
356 | html(delim); | 356 | html(delim); |
357 | html("id2="); | 357 | html("id2="); |
358 | html_url_arg(old_rev); | 358 | html_url_arg(old_rev); |
359 | } | 359 | } |
360 | html("'>"); | 360 | html("'>"); |
361 | html_txt(name); | 361 | html_txt(name); |
362 | html("</a>"); | 362 | html("</a>"); |
363 | } | 363 | } |
364 | 364 | ||
365 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 365 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
366 | char *rev) | 366 | char *rev) |
367 | { | 367 | { |
368 | reporevlink("patch", name, title, class, head, rev, NULL); | 368 | reporevlink("patch", name, title, class, head, rev, NULL); |
369 | } | 369 | } |
370 | 370 | ||
371 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 371 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
372 | char *path) | 372 | char *path) |
373 | { | 373 | { |
374 | reporevlink("stats", name, title, class, head, NULL, path); | 374 | reporevlink("stats", name, title, class, head, NULL, path); |
375 | } | 375 | } |
376 | 376 | ||
377 | void cgit_object_link(struct object *obj) | 377 | void cgit_object_link(struct object *obj) |
378 | { | 378 | { |
379 | char *page, *shortrev, *fullrev, *name; | 379 | char *page, *shortrev, *fullrev, *name; |
380 | 380 | ||
381 | fullrev = sha1_to_hex(obj->sha1); | 381 | fullrev = sha1_to_hex(obj->sha1); |
382 | shortrev = xstrdup(fullrev); | 382 | shortrev = xstrdup(fullrev); |
383 | shortrev[10] = '\0'; | 383 | shortrev[10] = '\0'; |
384 | if (obj->type == OBJ_COMMIT) { | 384 | if (obj->type == OBJ_COMMIT) { |
385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 385 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
386 | ctx.qry.head, fullrev); | 386 | ctx.qry.head, fullrev); |
387 | return; | 387 | return; |
388 | } else if (obj->type == OBJ_TREE) | 388 | } else if (obj->type == OBJ_TREE) |
389 | page = "tree"; | 389 | page = "tree"; |
390 | else if (obj->type == OBJ_TAG) | 390 | else if (obj->type == OBJ_TAG) |
391 | page = "tag"; | 391 | page = "tag"; |
392 | else | 392 | else |
393 | page = "blob"; | 393 | page = "blob"; |
394 | name = fmt("%s %s...", typename(obj->type), shortrev); | 394 | name = fmt("%s %s...", typename(obj->type), shortrev); |
395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 395 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
396 | } | 396 | } |
397 | 397 | ||
398 | void cgit_print_date(time_t secs, char *format, int local_time) | 398 | void cgit_print_date(time_t secs, char *format, int local_time) |
399 | { | 399 | { |
400 | char buf[64]; | 400 | char buf[64]; |
401 | struct tm *time; | 401 | struct tm *time; |
402 | 402 | ||
403 | if (!secs) | 403 | if (!secs) |
404 | return; | 404 | return; |
405 | if(local_time) | 405 | if(local_time) |
406 | time = localtime(&secs); | 406 | time = localtime(&secs); |
407 | else | 407 | else |
408 | time = gmtime(&secs); | 408 | time = gmtime(&secs); |
409 | strftime(buf, sizeof(buf)-1, format, time); | 409 | strftime(buf, sizeof(buf)-1, format, time); |
410 | html_txt(buf); | 410 | html_txt(buf); |
411 | } | 411 | } |
412 | 412 | ||
413 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 413 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
414 | { | 414 | { |
415 | time_t now, secs; | 415 | time_t now, secs; |
416 | 416 | ||
417 | if (!t) | 417 | if (!t) |
418 | return; | 418 | return; |
419 | time(&now); | 419 | time(&now); |
420 | secs = now - t; | 420 | secs = now - t; |
421 | 421 | ||
422 | if (secs > max_relative && max_relative >= 0) { | 422 | if (secs > max_relative && max_relative >= 0) { |
423 | cgit_print_date(t, format, ctx.cfg.local_time); | 423 | cgit_print_date(t, format, ctx.cfg.local_time); |
424 | return; | 424 | return; |
425 | } | 425 | } |
426 | 426 | ||
427 | if (secs < TM_HOUR * 2) { | 427 | if (secs < TM_HOUR * 2) { |
428 | htmlf("<span class='age-mins'>%.0f min.</span>", | 428 | htmlf("<span class='age-mins'>%.0f min.</span>", |
429 | secs * 1.0 / TM_MIN); | 429 | secs * 1.0 / TM_MIN); |
430 | return; | 430 | return; |
431 | } | 431 | } |
432 | if (secs < TM_DAY * 2) { | 432 | if (secs < TM_DAY * 2) { |
433 | htmlf("<span class='age-hours'>%.0f hours</span>", | 433 | htmlf("<span class='age-hours'>%.0f hours</span>", |
434 | secs * 1.0 / TM_HOUR); | 434 | secs * 1.0 / TM_HOUR); |
435 | return; | 435 | return; |
436 | } | 436 | } |
437 | if (secs < TM_WEEK * 2) { | 437 | if (secs < TM_WEEK * 2) { |
438 | htmlf("<span class='age-days'>%.0f days</span>", | 438 | htmlf("<span class='age-days'>%.0f days</span>", |
439 | secs * 1.0 / TM_DAY); | 439 | secs * 1.0 / TM_DAY); |
440 | return; | 440 | return; |
441 | } | 441 | } |
442 | if (secs < TM_MONTH * 2) { | 442 | if (secs < TM_MONTH * 2) { |
443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 443 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
444 | secs * 1.0 / TM_WEEK); | 444 | secs * 1.0 / TM_WEEK); |
445 | return; | 445 | return; |
446 | } | 446 | } |
447 | if (secs < TM_YEAR * 2) { | 447 | if (secs < TM_YEAR * 2) { |
448 | htmlf("<span class='age-months'>%.0f months</span>", | 448 | htmlf("<span class='age-months'>%.0f months</span>", |
449 | secs * 1.0 / TM_MONTH); | 449 | secs * 1.0 / TM_MONTH); |
450 | return; | 450 | return; |
451 | } | 451 | } |
452 | htmlf("<span class='age-years'>%.0f years</span>", | 452 | htmlf("<span class='age-years'>%.0f years</span>", |
453 | secs * 1.0 / TM_YEAR); | 453 | secs * 1.0 / TM_YEAR); |
454 | } | 454 | } |
455 | 455 | ||
456 | void cgit_print_http_headers(struct cgit_context *ctx) | 456 | void cgit_print_http_headers(struct cgit_context *ctx) |
457 | { | 457 | { |
458 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) | 458 | if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1")) |
459 | return; | 459 | return; |
460 | 460 | ||
461 | if (ctx->page.status) | 461 | if (ctx->page.status) |
462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); | 462 | htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg); |
463 | if (ctx->page.mimetype && ctx->page.charset) | 463 | if (ctx->page.mimetype && ctx->page.charset) |
464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 464 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
465 | ctx->page.charset); | 465 | ctx->page.charset); |
466 | else if (ctx->page.mimetype) | 466 | else if (ctx->page.mimetype) |
467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 467 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
468 | if (ctx->page.size) | 468 | if (ctx->page.size) |
469 | htmlf("Content-Length: %ld\n", ctx->page.size); | 469 | htmlf("Content-Length: %ld\n", ctx->page.size); |
470 | if (ctx->page.filename) | 470 | if (ctx->page.filename) |
471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 471 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
472 | ctx->page.filename); | 472 | ctx->page.filename); |
473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 473 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 474 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
475 | if (ctx->page.etag) | 475 | if (ctx->page.etag) |
476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); | 476 | htmlf("ETag: \"%s\"\n", ctx->page.etag); |
477 | html("\n"); | 477 | html("\n"); |
478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) | 478 | if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD")) |
479 | exit(0); | 479 | exit(0); |
480 | } | 480 | } |
481 | 481 | ||
482 | void cgit_print_docstart(struct cgit_context *ctx) | 482 | void cgit_print_docstart(struct cgit_context *ctx) |
483 | { | 483 | { |
484 | if (ctx->cfg.embedded) { | 484 | if (ctx->cfg.embedded) { |
485 | if (ctx->cfg.header) | 485 | if (ctx->cfg.header) |
486 | html_include(ctx->cfg.header); | 486 | html_include(ctx->cfg.header); |
487 | return; | 487 | return; |
488 | } | 488 | } |
489 | 489 | ||
490 | char *host = cgit_hosturl(); | 490 | char *host = cgit_hosturl(); |
491 | html(cgit_doctype); | 491 | html(cgit_doctype); |
492 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 492 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
493 | html("<head>\n"); | 493 | html("<head>\n"); |
494 | html("<title>"); | 494 | html("<title>"); |
495 | html_txt(ctx->page.title); | 495 | html_txt(ctx->page.title); |
496 | html("</title>\n"); | 496 | html("</title>\n"); |
497 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 497 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
498 | if (ctx->cfg.robots && *ctx->cfg.robots) | 498 | if (ctx->cfg.robots && *ctx->cfg.robots) |
499 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 499 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
500 | html("<link rel='stylesheet' type='text/css' href='"); | 500 | html("<link rel='stylesheet' type='text/css' href='"); |
501 | html_attr(ctx->cfg.css); | 501 | html_attr(ctx->cfg.css); |
502 | html("'/>\n"); | 502 | html("'/>\n"); |
503 | if (ctx->cfg.favicon) { | 503 | if (ctx->cfg.favicon) { |
504 | html("<link rel='shortcut icon' href='"); | 504 | html("<link rel='shortcut icon' href='"); |
505 | html_attr(ctx->cfg.favicon); | 505 | html_attr(ctx->cfg.favicon); |
506 | html("'/>\n"); | 506 | html("'/>\n"); |
507 | } | 507 | } |
508 | if (host && ctx->repo) { | 508 | if (host && ctx->repo) { |
509 | html("<link rel='alternate' title='Atom feed' href='"); | 509 | html("<link rel='alternate' title='Atom feed' href='"); |
510 | html(cgit_httpscheme()); | 510 | html(cgit_httpscheme()); |
511 | html_attr(cgit_hosturl()); | 511 | html_attr(cgit_hosturl()); |
512 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 512 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
513 | fmt("h=%s", ctx->qry.head))); | 513 | fmt("h=%s", ctx->qry.head))); |
514 | html("' type='application/atom+xml'/>\n"); | 514 | html("' type='application/atom+xml'/>\n"); |
515 | } | 515 | } |
516 | if (ctx->cfg.head_include) | 516 | if (ctx->cfg.head_include) |
517 | html_include(ctx->cfg.head_include); | 517 | html_include(ctx->cfg.head_include); |
518 | html("</head>\n"); | 518 | html("</head>\n"); |
519 | html("<body>\n"); | 519 | html("<body>\n"); |
520 | if (ctx->cfg.header) | 520 | if (ctx->cfg.header) |
521 | html_include(ctx->cfg.header); | 521 | html_include(ctx->cfg.header); |
522 | } | 522 | } |
523 | 523 | ||
524 | void cgit_print_docend() | 524 | void cgit_print_docend() |
525 | { | 525 | { |
526 | html("</div> <!-- class=content -->\n"); | 526 | html("</div> <!-- class=content -->\n"); |
527 | if (ctx.cfg.embedded) { | 527 | if (ctx.cfg.embedded) { |
528 | html("</div> <!-- id=cgit -->\n"); | 528 | html("</div> <!-- id=cgit -->\n"); |
529 | if (ctx.cfg.footer) | 529 | if (ctx.cfg.footer) |
530 | html_include(ctx.cfg.footer); | 530 | html_include(ctx.cfg.footer); |
531 | return; | 531 | return; |
532 | } | 532 | } |
533 | if (ctx.cfg.footer) | 533 | if (ctx.cfg.footer) |
534 | html_include(ctx.cfg.footer); | 534 | html_include(ctx.cfg.footer); |
535 | else { | 535 | else { |
536 | htmlf("<div class='footer'>generated by cgit %s at ", | 536 | htmlf("<div class='footer'>generated by cgit %s at ", |
537 | cgit_version); | 537 | cgit_version); |
538 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 538 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
539 | html("</div>\n"); | 539 | html("</div>\n"); |
540 | } | 540 | } |
541 | html("</div> <!-- id=cgit -->\n"); | 541 | html("</div> <!-- id=cgit -->\n"); |
542 | html("</body>\n</html>\n"); | 542 | html("</body>\n</html>\n"); |
543 | } | 543 | } |
544 | 544 | ||
545 | int print_branch_option(const char *refname, const unsigned char *sha1, | 545 | int print_branch_option(const char *refname, const unsigned char *sha1, |
546 | int flags, void *cb_data) | 546 | int flags, void *cb_data) |
547 | { | 547 | { |
548 | char *name = (char *)refname; | 548 | char *name = (char *)refname; |
549 | html_option(name, name, ctx.qry.head); | 549 | html_option(name, name, ctx.qry.head); |
550 | return 0; | 550 | return 0; |
551 | } | 551 | } |
552 | 552 | ||
553 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 553 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
554 | int flags, void *cb_data) | 554 | int flags, void *cb_data) |
555 | { | 555 | { |
556 | struct tag *tag; | 556 | struct tag *tag; |
557 | struct taginfo *info; | 557 | struct taginfo *info; |
558 | struct object *obj; | 558 | struct object *obj; |
559 | char buf[256], *url; | 559 | char buf[256], *url; |
560 | unsigned char fileid[20]; | 560 | unsigned char fileid[20]; |
561 | int *header = (int *)cb_data; | 561 | int *header = (int *)cb_data; |
562 | 562 | ||
563 | if (prefixcmp(refname, "refs/archives")) | 563 | if (prefixcmp(refname, "refs/archives")) |
564 | return 0; | 564 | return 0; |
565 | strncpy(buf, refname+14, sizeof(buf)); | 565 | strncpy(buf, refname+14, sizeof(buf)); |
566 | obj = parse_object(sha1); | 566 | obj = parse_object(sha1); |
567 | if (!obj) | 567 | if (!obj) |
568 | return 1; | 568 | return 1; |
569 | if (obj->type == OBJ_TAG) { | 569 | if (obj->type == OBJ_TAG) { |
570 | tag = lookup_tag(sha1); | 570 | tag = lookup_tag(sha1); |
571 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 571 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
572 | return 0; | 572 | return 0; |
573 | hashcpy(fileid, tag->tagged->sha1); | 573 | hashcpy(fileid, tag->tagged->sha1); |
574 | } else if (obj->type != OBJ_BLOB) { | 574 | } else if (obj->type != OBJ_BLOB) { |
575 | return 0; | 575 | return 0; |
576 | } else { | 576 | } else { |
577 | hashcpy(fileid, sha1); | 577 | hashcpy(fileid, sha1); |
578 | } | 578 | } |
579 | if (!*header) { | 579 | if (!*header) { |
580 | html("<h1>download</h1>\n"); | 580 | html("<h1>download</h1>\n"); |
581 | *header = 1; | 581 | *header = 1; |
582 | } | 582 | } |
583 | url = cgit_pageurl(ctx.qry.repo, "blob", | 583 | url = cgit_pageurl(ctx.qry.repo, "blob", |
584 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 584 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
585 | buf)); | 585 | buf)); |
586 | html_link_open(url, NULL, "menu"); | 586 | html_link_open(url, NULL, "menu"); |
587 | html_txt(strlpart(buf, 20)); | 587 | html_txt(strlpart(buf, 20)); |
588 | html_link_close(); | 588 | html_link_close(); |
589 | return 0; | 589 | return 0; |
590 | } | 590 | } |
591 | 591 | ||
592 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | 592 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
593 | { | 593 | { |
594 | char *url; | 594 | char *url; |
595 | 595 | ||
596 | if (!ctx.cfg.virtual_root) { | 596 | if (!ctx.cfg.virtual_root) { |
597 | url = fmt("%s/%s", ctx.qry.repo, page); | 597 | url = fmt("%s/%s", ctx.qry.repo, page); |
598 | if (ctx.qry.path) | 598 | if (ctx.qry.path) |
599 | url = fmt("%s/%s", url, ctx.qry.path); | 599 | url = fmt("%s/%s", url, ctx.qry.path); |
600 | html_hidden("url", url); | 600 | html_hidden("url", url); |
601 | } | 601 | } |
602 | 602 | ||
603 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 603 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
604 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 604 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
605 | html_hidden("h", ctx.qry.head); | 605 | html_hidden("h", ctx.qry.head); |
606 | 606 | ||
607 | if (ctx.qry.sha1) | 607 | if (ctx.qry.sha1) |
608 | html_hidden("id", ctx.qry.sha1); | 608 | html_hidden("id", ctx.qry.sha1); |
609 | if (ctx.qry.sha2) | 609 | if (ctx.qry.sha2) |
610 | html_hidden("id2", ctx.qry.sha2); | 610 | html_hidden("id2", ctx.qry.sha2); |
611 | if (ctx.qry.showmsg) | 611 | if (ctx.qry.showmsg) |
612 | html_hidden("showmsg", "1"); | 612 | html_hidden("showmsg", "1"); |
613 | 613 | ||
614 | if (incl_search) { | 614 | if (incl_search) { |
615 | if (ctx.qry.grep) | 615 | if (ctx.qry.grep) |
616 | html_hidden("qt", ctx.qry.grep); | 616 | html_hidden("qt", ctx.qry.grep); |
617 | if (ctx.qry.search) | 617 | if (ctx.qry.search) |
618 | html_hidden("q", ctx.qry.search); | 618 | html_hidden("q", ctx.qry.search); |
619 | } | 619 | } |
620 | } | 620 | } |
621 | 621 | ||
622 | const char *fallback_cmd = "repolist"; | 622 | const char *fallback_cmd = "repolist"; |
623 | 623 | ||
624 | char *hc(struct cgit_cmd *cmd, const char *page) | 624 | char *hc(struct cgit_cmd *cmd, const char *page) |
625 | { | 625 | { |
626 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 626 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
627 | } | 627 | } |
628 | 628 | ||
629 | static void print_header(struct cgit_context *ctx) | 629 | static void print_header(struct cgit_context *ctx) |
630 | { | 630 | { |
631 | html("<table id='header'>\n"); | 631 | html("<table id='header'>\n"); |
632 | html("<tr>\n"); | 632 | html("<tr>\n"); |
633 | html("<td class='logo' rowspan='2'><a href='"); | 633 | |
634 | if (ctx->cfg.logo_link) | 634 | if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { |
635 | html_attr(ctx->cfg.logo_link); | 635 | html("<td class='logo' rowspan='2'><a href='"); |
636 | else | 636 | if (ctx->cfg.logo_link) |
637 | html_attr(cgit_rooturl()); | 637 | html_attr(ctx->cfg.logo_link); |
638 | html("'><img src='"); | 638 | else |
639 | html_attr(ctx->cfg.logo); | 639 | html_attr(cgit_rooturl()); |
640 | html("' alt='cgit logo'/></a></td>\n"); | 640 | html("'><img src='"); |
641 | html_attr(ctx->cfg.logo); | ||
642 | html("' alt='cgit logo'/></a></td>\n"); | ||
643 | } | ||
641 | 644 | ||
642 | html("<td class='main'>"); | 645 | html("<td class='main'>"); |
643 | if (ctx->repo) { | 646 | if (ctx->repo) { |
644 | cgit_index_link("index", NULL, NULL, NULL, 0); | 647 | cgit_index_link("index", NULL, NULL, NULL, 0); |
645 | html(" : "); | 648 | html(" : "); |
646 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 649 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
647 | html("</td><td class='form'>"); | 650 | html("</td><td class='form'>"); |
648 | html("<form method='get' action=''>\n"); | 651 | html("<form method='get' action=''>\n"); |
649 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); | 652 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
650 | html("<select name='h' onchange='this.form.submit();'>\n"); | 653 | html("<select name='h' onchange='this.form.submit();'>\n"); |
651 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 654 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
652 | html("</select> "); | 655 | html("</select> "); |
653 | html("<input type='submit' name='' value='switch'/>"); | 656 | html("<input type='submit' name='' value='switch'/>"); |
654 | html("</form>"); | 657 | html("</form>"); |
655 | } else | 658 | } else |
656 | html_txt(ctx->cfg.root_title); | 659 | html_txt(ctx->cfg.root_title); |
657 | html("</td></tr>\n"); | 660 | html("</td></tr>\n"); |
658 | 661 | ||
659 | html("<tr><td class='sub'>"); | 662 | html("<tr><td class='sub'>"); |
660 | if (ctx->repo) { | 663 | if (ctx->repo) { |
661 | html_txt(ctx->repo->desc); | 664 | html_txt(ctx->repo->desc); |
662 | html("</td><td class='sub right'>"); | 665 | html("</td><td class='sub right'>"); |
663 | html_txt(ctx->repo->owner); | 666 | html_txt(ctx->repo->owner); |
664 | } else { | 667 | } else { |
665 | if (ctx->cfg.root_desc) | 668 | if (ctx->cfg.root_desc) |
666 | html_txt(ctx->cfg.root_desc); | 669 | html_txt(ctx->cfg.root_desc); |
667 | else if (ctx->cfg.index_info) | 670 | else if (ctx->cfg.index_info) |
668 | html_include(ctx->cfg.index_info); | 671 | html_include(ctx->cfg.index_info); |
669 | } | 672 | } |
670 | html("</td></tr></table>\n"); | 673 | html("</td></tr></table>\n"); |
671 | } | 674 | } |
672 | 675 | ||
673 | void cgit_print_pageheader(struct cgit_context *ctx) | 676 | void cgit_print_pageheader(struct cgit_context *ctx) |
674 | { | 677 | { |
675 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 678 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
676 | 679 | ||
677 | if (!cmd && ctx->repo) | 680 | if (!cmd && ctx->repo) |
678 | fallback_cmd = "summary"; | 681 | fallback_cmd = "summary"; |
679 | 682 | ||
680 | html("<div id='cgit'>"); | 683 | html("<div id='cgit'>"); |
681 | if (!ctx->cfg.noheader) | 684 | if (!ctx->cfg.noheader) |
682 | print_header(ctx); | 685 | print_header(ctx); |
683 | 686 | ||
684 | html("<table class='tabs'><tr><td>\n"); | 687 | html("<table class='tabs'><tr><td>\n"); |
685 | if (ctx->repo) { | 688 | if (ctx->repo) { |
686 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 689 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
687 | ctx->qry.head); | 690 | ctx->qry.head); |
688 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 691 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
689 | ctx->qry.sha1, NULL); | 692 | ctx->qry.sha1, NULL); |
690 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 693 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
691 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 694 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
692 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 695 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
693 | ctx->qry.sha1, NULL); | 696 | ctx->qry.sha1, NULL); |
694 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 697 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
695 | ctx->qry.head, ctx->qry.sha1); | 698 | ctx->qry.head, ctx->qry.sha1); |
696 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 699 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
697 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 700 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
698 | if (ctx->repo->max_stats) | 701 | if (ctx->repo->max_stats) |
699 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | 702 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), |
700 | ctx->qry.head, NULL); | 703 | ctx->qry.head, NULL); |
701 | if (ctx->repo->readme) | 704 | if (ctx->repo->readme) |
702 | reporevlink("about", "about", NULL, | 705 | reporevlink("about", "about", NULL, |
703 | hc(cmd, "about"), ctx->qry.head, NULL, | 706 | hc(cmd, "about"), ctx->qry.head, NULL, |
704 | NULL); | 707 | NULL); |
705 | html("</td><td class='form'>"); | 708 | html("</td><td class='form'>"); |
706 | html("<form class='right' method='get' action='"); | 709 | html("<form class='right' method='get' action='"); |
707 | if (ctx->cfg.virtual_root) | 710 | if (ctx->cfg.virtual_root) |
708 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 711 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
709 | ctx->qry.path, NULL)); | 712 | ctx->qry.path, NULL)); |
710 | html("'>\n"); | 713 | html("'>\n"); |
711 | cgit_add_hidden_formfields(1, 0, "log"); | 714 | cgit_add_hidden_formfields(1, 0, "log"); |
712 | html("<select name='qt'>\n"); | 715 | html("<select name='qt'>\n"); |
713 | html_option("grep", "log msg", ctx->qry.grep); | 716 | html_option("grep", "log msg", ctx->qry.grep); |
714 | html_option("author", "author", ctx->qry.grep); | 717 | html_option("author", "author", ctx->qry.grep); |
715 | html_option("committer", "committer", ctx->qry.grep); | 718 | html_option("committer", "committer", ctx->qry.grep); |
716 | html("</select>\n"); | 719 | html("</select>\n"); |
717 | html("<input class='txt' type='text' size='10' name='q' value='"); | 720 | html("<input class='txt' type='text' size='10' name='q' value='"); |
718 | html_attr(ctx->qry.search); | 721 | html_attr(ctx->qry.search); |
719 | html("'/>\n"); | 722 | html("'/>\n"); |
720 | html("<input type='submit' value='search'/>\n"); | 723 | html("<input type='submit' value='search'/>\n"); |
721 | html("</form>\n"); | 724 | html("</form>\n"); |
722 | } else { | 725 | } else { |
723 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 726 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
724 | if (ctx->cfg.root_readme) | 727 | if (ctx->cfg.root_readme) |
725 | site_link("about", "about", NULL, hc(cmd, "about"), | 728 | site_link("about", "about", NULL, hc(cmd, "about"), |
726 | NULL, 0); | 729 | NULL, 0); |
727 | html("</td><td class='form'>"); | 730 | html("</td><td class='form'>"); |
728 | html("<form method='get' action='"); | 731 | html("<form method='get' action='"); |
729 | html_attr(cgit_rooturl()); | 732 | html_attr(cgit_rooturl()); |
730 | html("'>\n"); | 733 | html("'>\n"); |
731 | html("<input type='text' name='q' size='10' value='"); | 734 | html("<input type='text' name='q' size='10' value='"); |
732 | html_attr(ctx->qry.search); | 735 | html_attr(ctx->qry.search); |
733 | html("'/>\n"); | 736 | html("'/>\n"); |
734 | html("<input type='submit' value='search'/>\n"); | 737 | html("<input type='submit' value='search'/>\n"); |
735 | html("</form>"); | 738 | html("</form>"); |
736 | } | 739 | } |
737 | html("</td></tr></table>\n"); | 740 | html("</td></tr></table>\n"); |
738 | html("<div class='content'>"); | 741 | html("<div class='content'>"); |
739 | } | 742 | } |
740 | 743 | ||
741 | void cgit_print_filemode(unsigned short mode) | 744 | void cgit_print_filemode(unsigned short mode) |
742 | { | 745 | { |
743 | if (S_ISDIR(mode)) | 746 | if (S_ISDIR(mode)) |
744 | html("d"); | 747 | html("d"); |
745 | else if (S_ISLNK(mode)) | 748 | else if (S_ISLNK(mode)) |
746 | html("l"); | 749 | html("l"); |
747 | else if (S_ISGITLINK(mode)) | 750 | else if (S_ISGITLINK(mode)) |
748 | html("m"); | 751 | html("m"); |
749 | else | 752 | else |
750 | html("-"); | 753 | html("-"); |
751 | html_fileperm(mode >> 6); | 754 | html_fileperm(mode >> 6); |
752 | html_fileperm(mode >> 3); | 755 | html_fileperm(mode >> 3); |
753 | html_fileperm(mode); | 756 | html_fileperm(mode); |
754 | } | 757 | } |
755 | 758 | ||
756 | void cgit_print_snapshot_links(const char *repo, const char *head, | 759 | void cgit_print_snapshot_links(const char *repo, const char *head, |
757 | const char *hex, int snapshots) | 760 | const char *hex, int snapshots) |
758 | { | 761 | { |
759 | const struct cgit_snapshot_format* f; | 762 | const struct cgit_snapshot_format* f; |
760 | char *filename; | 763 | char *filename; |
761 | 764 | ||
762 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 765 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
763 | if (!(snapshots & f->bit)) | 766 | if (!(snapshots & f->bit)) |
764 | continue; | 767 | continue; |
765 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 768 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
766 | f->suffix); | 769 | f->suffix); |
767 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); | 770 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
768 | html("<br/>"); | 771 | html("<br/>"); |
769 | } | 772 | } |
770 | } | 773 | } |