Fossil SCM

Change the names of the "Basic" and "Advanced" buttons to "Declutter" and "Details". (These names are subject to further refinement.) Add a [checkins-using] link to the artifact view for content artifacts.

drh 2017-11-25 12:26 trunk

Commit e72444ea6afa3f70417fe90eb2dc95d2823c2d72099d4f864b7f73392bbb6ebb

Parent 227c8e57fadb4a2…

3 files changed +7 -4 +1 +2 -2

~ src/finfo.c ~ src/info.c ~ src/timeline.c

M src/finfo.c

+7 -4

		--- src/finfo.c
		+++ src/finfo.c
		@@ -346,11 +346,11 @@
346	346	if( fnid==0 ){
347	347	@ No such file: %h(zFilename)
348	348	style_footer();
349	349	return;
350	350	}
351		- if( g.perm.Admin ){
	351	+ if( g.perm.Admin && !bBasic ){
352	352	style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
353	353	}
354	354	if( baseCheckin ){
355	355	if( P("orig")!=0 ){
356	356	origCheckin = name_to_typed_rid(P("orig"),"ci");
		@@ -448,12 +448,15 @@
448	448	blob_appendf(&title, "History of ");
449	449	hyperlinked_path(zFilename, &title, 0, "tree", "");
450	450	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
451	451	}
452	452	if( bBasic ){
453		- style_submenu_element("Advanced", "%s",
	453	+ style_submenu_element("Details", "%s",
454	454	url_render(&url, "basic", 0, 0, 0));
	455	+ }else{
	456	+ style_submenu_element("Declutter", "%s",
	457	+ url_render(&url, "basic", "1", 0, 0));
455	458	}
456	459	@ <h2>%b(&title)</h2>
457	460	blob_reset(&title);
458	461	pGraph = graph_init();
459	462	@ <table id="timelineTable%d(iTableId)" class="timelineTable">
		@@ -586,18 +589,18 @@
586	589	}else{
587	590	@ <b>Deleted</b>
588	591	}
589	592	}
590	593	}
591		- if( g.perm.Hyperlink && zUuid ){
	594	+ if( g.perm.Hyperlink && zUuid && !bBasic ){
592	595	const char *z = zFilename;
593	596	@ <span class='timelineExtraLinks'>
594	597	@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
595	598	@ [annotate]</a>
596	599	@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
597	600	@ [blame]</a>
598		- @ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[check-ins using]</a>
	601	+ @ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins using]</a>
599	602	if( fpid>0 ){
600	603	@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
601	604	}
602	605	@ </span>
603	606	}
604	607

	--- src/finfo.c
	+++ src/finfo.c
	@@ -346,11 +346,11 @@
346	if( fnid==0 ){
347	@ No such file: %h(zFilename)
348	style_footer();
349	return;
350	}
351	if( g.perm.Admin ){
352	style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
353	}
354	if( baseCheckin ){
355	if( P("orig")!=0 ){
356	origCheckin = name_to_typed_rid(P("orig"),"ci");
	@@ -448,12 +448,15 @@
448	blob_appendf(&title, "History of ");
449	hyperlinked_path(zFilename, &title, 0, "tree", "");
450	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
451	}
452	if( bBasic ){
453	style_submenu_element("Advanced", "%s",
454	url_render(&url, "basic", 0, 0, 0));



455	}
456	@ <h2>%b(&title)</h2>
457	blob_reset(&title);
458	pGraph = graph_init();
459	@ <table id="timelineTable%d(iTableId)" class="timelineTable">
	@@ -586,18 +589,18 @@
586	}else{
587	@ <b>Deleted</b>
588	}
589	}
590	}
591	if( g.perm.Hyperlink && zUuid ){
592	const char *z = zFilename;
593	@ <span class='timelineExtraLinks'>
594	@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
595	@ [annotate]</a>
596	@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
597	@ [blame]</a>
598	@ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[check-ins using]</a>
599	if( fpid>0 ){
600	@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
601	}
602	@ </span>
603	}
604

	--- src/finfo.c
	+++ src/finfo.c
	@@ -346,11 +346,11 @@
346	if( fnid==0 ){
347	@ No such file: %h(zFilename)
348	style_footer();
349	return;
350	}
351	if( g.perm.Admin && !bBasic ){
352	style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
353	}
354	if( baseCheckin ){
355	if( P("orig")!=0 ){
356	origCheckin = name_to_typed_rid(P("orig"),"ci");
	@@ -448,12 +448,15 @@
448	blob_appendf(&title, "History of ");
449	hyperlinked_path(zFilename, &title, 0, "tree", "");
450	if( fShowId ) blob_appendf(&title, " (%d)", fnid);
451	}
452	if( bBasic ){
453	style_submenu_element("Details", "%s",
454	url_render(&url, "basic", 0, 0, 0));
455	}else{
456	style_submenu_element("Declutter", "%s",
457	url_render(&url, "basic", "1", 0, 0));
458	}
459	@ <h2>%b(&title)</h2>
460	blob_reset(&title);
461	pGraph = graph_init();
462	@ <table id="timelineTable%d(iTableId)" class="timelineTable">
	@@ -586,18 +589,18 @@
589	}else{
590	@ <b>Deleted</b>
591	}
592	}
593	}
594	if( g.perm.Hyperlink && zUuid && !bBasic ){
595	const char *z = zFilename;
596	@ <span class='timelineExtraLinks'>
597	@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
598	@ [annotate]</a>
599	@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
600	@ [blame]</a>
601	@ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins using]</a>
602	if( fpid>0 ){
603	@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
604	}
605	@ </span>
606	}
607

M src/info.c

		--- src/info.c
		+++ src/info.c
		@@ -1351,10 +1351,11 @@
1351	1351	@ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1352	1352	@ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1353	1353	@ [annotate]</a>
1354	1354	@ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1355	1355	@ [blame]</a>
	1356	+ @ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins using]</a>
1356	1357	}
1357	1358	cnt++;
1358	1359	if( pDownloadName && blob_size(pDownloadName)==0 ){
1359	1360	blob_append(pDownloadName, zName, -1);
1360	1361	}
1361	1362

	--- src/info.c
	+++ src/info.c
	@@ -1351,10 +1351,11 @@
1351	@ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1352	@ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1353	@ [annotate]</a>
1354	@ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1355	@ [blame]</a>

1356	}
1357	cnt++;
1358	if( pDownloadName && blob_size(pDownloadName)==0 ){
1359	blob_append(pDownloadName, zName, -1);
1360	}
1361

	--- src/info.c
	+++ src/info.c
	@@ -1351,10 +1351,11 @@
1351	@ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1352	@ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1353	@ [annotate]</a>
1354	@ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1355	@ [blame]</a>
1356	@ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins using]</a>
1357	}
1358	cnt++;
1359	if( pDownloadName && blob_size(pDownloadName)==0 ){
1360	blob_append(pDownloadName, zName, -1);
1361	}
1362

M src/timeline.c

+2 -2

		--- src/timeline.c
		+++ src/timeline.c
		@@ -2239,13 +2239,13 @@
2239	2239	}
2240	2240	}
2241	2241	blob_zero(&cond);
2242	2242	}
2243	2243	if( bBasic ){
2244		- timeline_submenu(&url, "Advanced", "basic", 0, 0);
	2244	+ timeline_submenu(&url, "Details", "basic", 0, 0);
2245	2245	}else{
2246		- timeline_submenu(&url, "Basic", "basic", "1", 0);
	2246	+ timeline_submenu(&url, "Declutter", "basic", "1", 0);
2247	2247	}
2248	2248	if( PB("showsql") ){
2249	2249	@ <pre>%h(blob_sql_text(&sql))</pre>
2250	2250	}
2251	2251	if( search_restrict(SRCH_CKIN)!=0 ){
2252	2252

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2239,13 +2239,13 @@
2239	}
2240	}
2241	blob_zero(&cond);
2242	}
2243	if( bBasic ){
2244	timeline_submenu(&url, "Advanced", "basic", 0, 0);
2245	}else{
2246	timeline_submenu(&url, "Basic", "basic", "1", 0);
2247	}
2248	if( PB("showsql") ){
2249	@ <pre>%h(blob_sql_text(&sql))</pre>
2250	}
2251	if( search_restrict(SRCH_CKIN)!=0 ){
2252

	--- src/timeline.c
	+++ src/timeline.c
	@@ -2239,13 +2239,13 @@
2239	}
2240	}
2241	blob_zero(&cond);
2242	}
2243	if( bBasic ){
2244	timeline_submenu(&url, "Details", "basic", 0, 0);
2245	}else{
2246	timeline_submenu(&url, "Declutter", "basic", "1", 0);
2247	}
2248	if( PB("showsql") ){
2249	@ <pre>%h(blob_sql_text(&sql))</pre>
2250	}
2251	if( search_restrict(SRCH_CKIN)!=0 ){
2252

Fossil SCM

Keyboard Shortcuts