Fossil SCM

Improved header text for the tree-view. Make the tree-view the default for the "Files" menu on all default styles.

drh 2014-01-07 10:46 trunk

Commit 78a5dbea6c0b0a8880dbf3ac5e35c1344fad09cf

Parent de86ef41b2ce1ca…

3 files changed +6 -4 +5 -5 +1 -1

~ src/browse.c ~ src/skins.c ~ src/style.c

M src/browse.c

+6 -4

		--- src/browse.c
		+++ src/browse.c
		@@ -536,13 +536,15 @@
536	536	}
537	537	db_finalize(&q);
538	538	}
539	539
540	540	if( zCI ){
541		- @ <h2>%d(nFile) files of
542		- @ check-in [%z(href("vinfo?name=%T",zUuid))%S(zUuid)</a>]
543		- @ %s(blob_str(&dirname))</h2>
	541	+ @ <h2>%d(nFile) files of check-in
	542	+ if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){
	543	+ @ "%h(zCI)"
	544	+ }
	545	+ @ [%z(href("vinfo?name=%T",zUuid))%S(zUuid)</a>] %s(blob_str(&dirname))</h2>
544	546	}else{
545	547	int n = db_int(0, "SELECT count(*) FROM plink");
546	548	@ <h2>%d(nFile) files from all %d(n) check-ins
547	549	@ %s(blob_str(&dirname))</h2>
548	550	}
		@@ -585,11 +587,11 @@
585	587	@ <ul style='display:none;'>
586	588	}
587	589	}else{
588	590	char *zLink;
589	591	if( zCI ){
590		- zLink = href("%R/artifact/%s",p->zUuid);
	592	+ zLink = href("%R/artifact/%S",p->zUuid);
591	593	}else{
592	594	zLink = href("%R/finfo?name=%T",p->zFullName);
593	595	}
594	596	@ <li class="%z(fileext_class(p->zName))">%z(zLink)%h(p->zName)</a>
595	597	}
596	598

	--- src/browse.c
	+++ src/browse.c
	@@ -536,13 +536,15 @@
536	}
537	db_finalize(&q);
538	}
539
540	if( zCI ){
541	@ <h2>%d(nFile) files of
542	@ check-in [%z(href("vinfo?name=%T",zUuid))%S(zUuid)</a>]
543	@ %s(blob_str(&dirname))</h2>


544	}else{
545	int n = db_int(0, "SELECT count(*) FROM plink");
546	@ <h2>%d(nFile) files from all %d(n) check-ins
547	@ %s(blob_str(&dirname))</h2>
548	}
	@@ -585,11 +587,11 @@
585	@ <ul style='display:none;'>
586	}
587	}else{
588	char *zLink;
589	if( zCI ){
590	zLink = href("%R/artifact/%s",p->zUuid);
591	}else{
592	zLink = href("%R/finfo?name=%T",p->zFullName);
593	}
594	@ <li class="%z(fileext_class(p->zName))">%z(zLink)%h(p->zName)</a>
595	}
596

	--- src/browse.c
	+++ src/browse.c
	@@ -536,13 +536,15 @@
536	}
537	db_finalize(&q);
538	}
539
540	if( zCI ){
541	@ <h2>%d(nFile) files of check-in
542	if( sqlite3_strnicmp(zCI, zUuid, (int)strlen(zCI))!=0 ){
543	@ "%h(zCI)"
544	}
545	@ [%z(href("vinfo?name=%T",zUuid))%S(zUuid)</a>] %s(blob_str(&dirname))</h2>
546	}else{
547	int n = db_int(0, "SELECT count(*) FROM plink");
548	@ <h2>%d(nFile) files from all %d(n) check-ins
549	@ %s(blob_str(&dirname))</h2>
550	}
	@@ -585,11 +587,11 @@
587	@ <ul style='display:none;'>
588	}
589	}else{
590	char *zLink;
591	if( zCI ){
592	zLink = href("%R/artifact/%S",p->zUuid);
593	}else{
594	zLink = href("%R/finfo?name=%T",p->zFullName);
595	}
596	@ <li class="%z(fileext_class(p->zName))">%z(zLink)%h(p->zName)</a>
597	}
598

M src/skins.c

+5 -5

		--- src/skins.c
		+++ src/skins.c
		@@ -192,11 +192,11 @@
192	192	@ html "<a href=''$home$index_page''>Home</a>\n"
193	193	@ if {[anycap jor]} {
194	194	@ html "<a href=''$home/timeline''>Timeline</a>\n"
195	195	@ }
196	196	@ if {[hascap oh]} {
197		-@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
	197	+@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
198	198	@ }
199	199	@ if {[hascap o]} {
200	200	@ html "<a href=''$home/brlist''>Branches</a>\n"
201	201	@ html "<a href=''$home/taglist''>Tags</a>\n"
202	202	@ }
		@@ -402,11 +402,11 @@
402	402	@ html "<a href=''$home$index_page''>Home</a>\n"
403	403	@ if {[anycap jor]} {
404	404	@ html "<a href=''$home/timeline''>Timeline</a>\n"
405	405	@ }
406	406	@ if {[hascap oh]} {
407		-@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
	407	+@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
408	408	@ }
409	409	@ if {[hascap o]} {
410	410	@ html "<a href=''$home/brlist''>Branches</a>\n"
411	411	@ html "<a href=''$home/taglist''>Tags</a>\n"
412	412	@ }
		@@ -645,11 +645,11 @@
645	645	@ html "<a href=''$home$index_page''>Home</a>\n"
646	646	@ if {[anycap jor]} {
647	647	@ html "<a href=''$home/timeline''>Timeline</a>\n"
648	648	@ }
649	649	@ if {[hascap oh]} {
650		-@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
	650	+@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
651	651	@ }
652	652	@ if {[hascap o]} {
653	653	@ html "<a href=''$home/brlist''>Branches</a>\n"
654	654	@ html "<a href=''$home/taglist''>Tags</a>\n"
655	655	@ }
		@@ -906,11 +906,11 @@
906	906	@ html "<a href=''$home$index_page''>Home</a>\n"
907	907	@ if {[anycap jor]} {
908	908	@ html "<a href=''$home/timeline''>Timeline</a>\n"
909	909	@ }
910	910	@ if {[hascap oh]} {
911		-@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
	911	+@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
912	912	@ }
913	913	@ if {[hascap o]} {
914	914	@ html "<a href=''$home/brlist''>Branches</a>\n"
915	915	@ html "<a href=''$home/taglist''>Tags</a>\n"
916	916	@ }
		@@ -1195,11 +1195,11 @@
1195	1195	@ html "<a href=''$home$index_page''>Home</a>\n"
1196	1196	@ if {[anycap jor]} {
1197	1197	@ html "<a href=''$home/timeline''>Timeline</a>\n"
1198	1198	@ }
1199	1199	@ if {[hascap oh]} {
1200		-@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
	1200	+@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
1201	1201	@ }
1202	1202	@ if {[hascap o]} {
1203	1203	@ html "<a href=''$home/brlist''>Branches</a>\n"
1204	1204	@ html "<a href=''$home/taglist''>Tags</a>\n"
1205	1205	@ }
1206	1206

	--- src/skins.c
	+++ src/skins.c
	@@ -192,11 +192,11 @@
192	@ html "<a href=''$home$index_page''>Home</a>\n"
193	@ if {[anycap jor]} {
194	@ html "<a href=''$home/timeline''>Timeline</a>\n"
195	@ }
196	@ if {[hascap oh]} {
197	@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
198	@ }
199	@ if {[hascap o]} {
200	@ html "<a href=''$home/brlist''>Branches</a>\n"
201	@ html "<a href=''$home/taglist''>Tags</a>\n"
202	@ }
	@@ -402,11 +402,11 @@
402	@ html "<a href=''$home$index_page''>Home</a>\n"
403	@ if {[anycap jor]} {
404	@ html "<a href=''$home/timeline''>Timeline</a>\n"
405	@ }
406	@ if {[hascap oh]} {
407	@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
408	@ }
409	@ if {[hascap o]} {
410	@ html "<a href=''$home/brlist''>Branches</a>\n"
411	@ html "<a href=''$home/taglist''>Tags</a>\n"
412	@ }
	@@ -645,11 +645,11 @@
645	@ html "<a href=''$home$index_page''>Home</a>\n"
646	@ if {[anycap jor]} {
647	@ html "<a href=''$home/timeline''>Timeline</a>\n"
648	@ }
649	@ if {[hascap oh]} {
650	@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
651	@ }
652	@ if {[hascap o]} {
653	@ html "<a href=''$home/brlist''>Branches</a>\n"
654	@ html "<a href=''$home/taglist''>Tags</a>\n"
655	@ }
	@@ -906,11 +906,11 @@
906	@ html "<a href=''$home$index_page''>Home</a>\n"
907	@ if {[anycap jor]} {
908	@ html "<a href=''$home/timeline''>Timeline</a>\n"
909	@ }
910	@ if {[hascap oh]} {
911	@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
912	@ }
913	@ if {[hascap o]} {
914	@ html "<a href=''$home/brlist''>Branches</a>\n"
915	@ html "<a href=''$home/taglist''>Tags</a>\n"
916	@ }
	@@ -1195,11 +1195,11 @@
1195	@ html "<a href=''$home$index_page''>Home</a>\n"
1196	@ if {[anycap jor]} {
1197	@ html "<a href=''$home/timeline''>Timeline</a>\n"
1198	@ }
1199	@ if {[hascap oh]} {
1200	@ html "<a href=''$home/dir?ci=tip''>Files</a>\n"
1201	@ }
1202	@ if {[hascap o]} {
1203	@ html "<a href=''$home/brlist''>Branches</a>\n"
1204	@ html "<a href=''$home/taglist''>Tags</a>\n"
1205	@ }
1206

	--- src/skins.c
	+++ src/skins.c
	@@ -192,11 +192,11 @@
192	@ html "<a href=''$home$index_page''>Home</a>\n"
193	@ if {[anycap jor]} {
194	@ html "<a href=''$home/timeline''>Timeline</a>\n"
195	@ }
196	@ if {[hascap oh]} {
197	@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
198	@ }
199	@ if {[hascap o]} {
200	@ html "<a href=''$home/brlist''>Branches</a>\n"
201	@ html "<a href=''$home/taglist''>Tags</a>\n"
202	@ }
	@@ -402,11 +402,11 @@
402	@ html "<a href=''$home$index_page''>Home</a>\n"
403	@ if {[anycap jor]} {
404	@ html "<a href=''$home/timeline''>Timeline</a>\n"
405	@ }
406	@ if {[hascap oh]} {
407	@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
408	@ }
409	@ if {[hascap o]} {
410	@ html "<a href=''$home/brlist''>Branches</a>\n"
411	@ html "<a href=''$home/taglist''>Tags</a>\n"
412	@ }
	@@ -645,11 +645,11 @@
645	@ html "<a href=''$home$index_page''>Home</a>\n"
646	@ if {[anycap jor]} {
647	@ html "<a href=''$home/timeline''>Timeline</a>\n"
648	@ }
649	@ if {[hascap oh]} {
650	@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
651	@ }
652	@ if {[hascap o]} {
653	@ html "<a href=''$home/brlist''>Branches</a>\n"
654	@ html "<a href=''$home/taglist''>Tags</a>\n"
655	@ }
	@@ -906,11 +906,11 @@
906	@ html "<a href=''$home$index_page''>Home</a>\n"
907	@ if {[anycap jor]} {
908	@ html "<a href=''$home/timeline''>Timeline</a>\n"
909	@ }
910	@ if {[hascap oh]} {
911	@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
912	@ }
913	@ if {[hascap o]} {
914	@ html "<a href=''$home/brlist''>Branches</a>\n"
915	@ html "<a href=''$home/taglist''>Tags</a>\n"
916	@ }
	@@ -1195,11 +1195,11 @@
1195	@ html "<a href=''$home$index_page''>Home</a>\n"
1196	@ if {[anycap jor]} {
1197	@ html "<a href=''$home/timeline''>Timeline</a>\n"
1198	@ }
1199	@ if {[hascap oh]} {
1200	@ html "<a href=''$home/tree?ci=tip''>Files</a>\n"
1201	@ }
1202	@ if {[hascap o]} {
1203	@ html "<a href=''$home/brlist''>Branches</a>\n"
1204	@ html "<a href=''$home/taglist''>Tags</a>\n"
1205	@ }
1206

M src/style.c

+1 -1

		--- src/style.c
		+++ src/style.c
		@@ -464,11 +464,11 @@
464	464	@ html "<a href='$home$index_page'>Home</a>\n"
465	465	@ if {[anycap jor]} {
466	466	@ html "<a href='$home/timeline'>Timeline</a>\n"
467	467	@ }
468	468	@ if {[hascap oh]} {
469		-@ html "<a href='$home/dir?ci=tip'>Files</a>\n"
	469	+@ html "<a href='$home/tree?ci=tip'>Files</a>\n"
470	470	@ }
471	471	@ if {[hascap o]} {
472	472	@ html "<a href='$home/brlist'>Branches</a>\n"
473	473	@ html "<a href='$home/taglist'>Tags</a>\n"
474	474	@ }
475	475

	--- src/style.c
	+++ src/style.c
	@@ -464,11 +464,11 @@
464	@ html "<a href='$home$index_page'>Home</a>\n"
465	@ if {[anycap jor]} {
466	@ html "<a href='$home/timeline'>Timeline</a>\n"
467	@ }
468	@ if {[hascap oh]} {
469	@ html "<a href='$home/dir?ci=tip'>Files</a>\n"
470	@ }
471	@ if {[hascap o]} {
472	@ html "<a href='$home/brlist'>Branches</a>\n"
473	@ html "<a href='$home/taglist'>Tags</a>\n"
474	@ }
475

	--- src/style.c
	+++ src/style.c
	@@ -464,11 +464,11 @@
464	@ html "<a href='$home$index_page'>Home</a>\n"
465	@ if {[anycap jor]} {
466	@ html "<a href='$home/timeline'>Timeline</a>\n"
467	@ }
468	@ if {[hascap oh]} {
469	@ html "<a href='$home/tree?ci=tip'>Files</a>\n"
470	@ }
471	@ if {[hascap o]} {
472	@ html "<a href='$home/brlist'>Branches</a>\n"
473	@ html "<a href='$home/taglist'>Tags</a>\n"
474	@ }
475

Fossil SCM

Keyboard Shortcuts