Fossil SCM

Change the /info page Overview section to have "Wiki:" links for wiki display, instead of "Edit Wiki:" links. Users who want to edit, can do the additional "Edit" click from the wiki page. Also have /info honor the nowiki query parameter.

drh 2018-12-31 02:13 describe-objects-using-wiki

Commit f17a5198f55845b67ce0a965db1e6109021fa50d4c6de0d656b4d1473e66e5d1

Parent 57443202ae0ef23…

1 file changed +13 -11

~ src/info.c

M src/info.c

+13 -11

		--- src/info.c
		+++ src/info.c
		@@ -691,11 +691,11 @@
691	691	const char *zOrigUser;
692	692	const char *zComment;
693	693	const char *zDate;
694	694	const char *zOrigDate;
695	695	const char *zBrName;
696		- Blob wiki_edit_links = BLOB_INITIALIZER;
	696	+ Blob wiki_links = BLOB_INITIALIZER;
697	697
698	698	style_header("Check-in [%S]", zUuid);
699	699	login_anonymous_available();
700	700	zEUser = db_text(0,
701	701	"SELECT value FROM tagxref"
		@@ -761,16 +761,16 @@
761	761	" AND +tag.tagname GLOB 'sym-*'", rid);
762	762	while( db_step(&q2)==SQLITE_ROW ){
763	763	const char *zTagName = db_column_text(&q2, 0);
764	764	if( fossil_strcmp(zTagName,zBrName)==0 ){
765	765	@ \| %z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
766		- blob_appendf(&wiki_edit_links, " \| %z%h</a>",
767		- href("%R/wikiedit?name=branch/%h",zTagName), zTagName);
	766	+ blob_appendf(&wiki_links, " \| %z%h</a>",
	767	+ href("%R/wiki?name=branch/%h",zTagName), zTagName);
768	768	}else{
769	769	@ \| %z(href("%R/timeline?t=%T&unhide",zTagName))%h(zTagName)</a>
770		- blob_appendf(&wiki_edit_links, " \| %z%h</a>",
771		- href("%R/wikiedit?name=tag/%h",zTagName), zTagName);
	770	+ blob_appendf(&wiki_links, " \| %z%h</a>",
	771	+ href("%R/wiki?name=tag/%h",zTagName), zTagName);
772	772	}
773	773	}
774	774	db_finalize(&q2);
775	775	@ </td></tr>
776	776
		@@ -816,14 +816,14 @@
816	816	@ <tr><th>Received From:</th>
817	817	@ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
818	818	}
819	819	db_finalize(&q2);
820	820	}
821		- if( g.perm.WrWiki && db_get_boolean("wiki-about",1) ){
822		- @ <tr><th>Edit Wiki:</th>
823		- @ <td>%z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>
824		- @ %b(&wiki_edit_links)</td>
	821	+ if( g.perm.RdWiki && db_get_boolean("wiki-about",1) ){
	822	+ @ <tr><th>Wiki:</th>
	823	+ @ <td>%z(href("%R/wiki?name=checkin/%s",zUuid))this checkin</a>
	824	+ @ %b(&wiki_links)</td>
825	825	}
826	826	if( g.perm.Hyperlink ){
827	827	@ <tr><th>Other Links:</th>
828	828	@ <td>
829	829	@ %z(href("%R/artifact/%!S",zUuid))manifest</a>
		@@ -836,17 +836,19 @@
836	836	}
837	837	@ </td>
838	838	@ </tr>
839	839	}
840	840	@ </table>
841		- blob_reset(&wiki_edit_links);
	841	+ blob_reset(&wiki_links);
842	842	}else{
843	843	style_header("Check-in Information");
844	844	login_anonymous_available();
845	845	}
846	846	db_finalize(&q1);
847		- wiki_render_associated("checkin", zUuid, 0);
	847	+ if( !PB("nowiki") ){
	848	+ wiki_render_associated("checkin", zUuid, 0);
	849	+ }
848	850	render_backlink_graph(zUuid, "<div class=\"section\">References</div>\n");
849	851	@ <div class="section">Context</div>
850	852	render_checkin_context(rid, 0);
851	853	@ <div class="section">Changes</div>
852	854	@ <div class="sectionmenu">
853	855

	--- src/info.c
	+++ src/info.c
	@@ -691,11 +691,11 @@
691	const char *zOrigUser;
692	const char *zComment;
693	const char *zDate;
694	const char *zOrigDate;
695	const char *zBrName;
696	Blob wiki_edit_links = BLOB_INITIALIZER;
697
698	style_header("Check-in [%S]", zUuid);
699	login_anonymous_available();
700	zEUser = db_text(0,
701	"SELECT value FROM tagxref"
	@@ -761,16 +761,16 @@
761	" AND +tag.tagname GLOB 'sym-*'", rid);
762	while( db_step(&q2)==SQLITE_ROW ){
763	const char *zTagName = db_column_text(&q2, 0);
764	if( fossil_strcmp(zTagName,zBrName)==0 ){
765	@ \| %z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
766	blob_appendf(&wiki_edit_links, " \| %z%h</a>",
767	href("%R/wikiedit?name=branch/%h",zTagName), zTagName);
768	}else{
769	@ \| %z(href("%R/timeline?t=%T&unhide",zTagName))%h(zTagName)</a>
770	blob_appendf(&wiki_edit_links, " \| %z%h</a>",
771	href("%R/wikiedit?name=tag/%h",zTagName), zTagName);
772	}
773	}
774	db_finalize(&q2);
775	@ </td></tr>
776
	@@ -816,14 +816,14 @@
816	@ <tr><th>Received From:</th>
817	@ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
818	}
819	db_finalize(&q2);
820	}
821	if( g.perm.WrWiki && db_get_boolean("wiki-about",1) ){
822	@ <tr><th>Edit Wiki:</th>
823	@ <td>%z(href("%R/wikiedit?name=checkin/%s",zUuid))this checkin</a>
824	@ %b(&wiki_edit_links)</td>
825	}
826	if( g.perm.Hyperlink ){
827	@ <tr><th>Other Links:</th>
828	@ <td>
829	@ %z(href("%R/artifact/%!S",zUuid))manifest</a>
	@@ -836,17 +836,19 @@
836	}
837	@ </td>
838	@ </tr>
839	}
840	@ </table>
841	blob_reset(&wiki_edit_links);
842	}else{
843	style_header("Check-in Information");
844	login_anonymous_available();
845	}
846	db_finalize(&q1);
847	wiki_render_associated("checkin", zUuid, 0);


848	render_backlink_graph(zUuid, "<div class=\"section\">References</div>\n");
849	@ <div class="section">Context</div>
850	render_checkin_context(rid, 0);
851	@ <div class="section">Changes</div>
852	@ <div class="sectionmenu">
853

	--- src/info.c
	+++ src/info.c
	@@ -691,11 +691,11 @@
691	const char *zOrigUser;
692	const char *zComment;
693	const char *zDate;
694	const char *zOrigDate;
695	const char *zBrName;
696	Blob wiki_links = BLOB_INITIALIZER;
697
698	style_header("Check-in [%S]", zUuid);
699	login_anonymous_available();
700	zEUser = db_text(0,
701	"SELECT value FROM tagxref"
	@@ -761,16 +761,16 @@
761	" AND +tag.tagname GLOB 'sym-*'", rid);
762	while( db_step(&q2)==SQLITE_ROW ){
763	const char *zTagName = db_column_text(&q2, 0);
764	if( fossil_strcmp(zTagName,zBrName)==0 ){
765	@ \| %z(href("%R/timeline?r=%T&unhide",zTagName))%h(zTagName)</a>
766	blob_appendf(&wiki_links, " \| %z%h</a>",
767	href("%R/wiki?name=branch/%h",zTagName), zTagName);
768	}else{
769	@ \| %z(href("%R/timeline?t=%T&unhide",zTagName))%h(zTagName)</a>
770	blob_appendf(&wiki_links, " \| %z%h</a>",
771	href("%R/wiki?name=tag/%h",zTagName), zTagName);
772	}
773	}
774	db_finalize(&q2);
775	@ </td></tr>
776
	@@ -816,14 +816,14 @@
816	@ <tr><th>Received From:</th>
817	@ <td>%h(zUser) @ %h(zIpAddr) on %s(zDate)</td></tr>
818	}
819	db_finalize(&q2);
820	}
821	if( g.perm.RdWiki && db_get_boolean("wiki-about",1) ){
822	@ <tr><th>Wiki:</th>
823	@ <td>%z(href("%R/wiki?name=checkin/%s",zUuid))this checkin</a>
824	@ %b(&wiki_links)</td>
825	}
826	if( g.perm.Hyperlink ){
827	@ <tr><th>Other Links:</th>
828	@ <td>
829	@ %z(href("%R/artifact/%!S",zUuid))manifest</a>
	@@ -836,17 +836,19 @@
836	}
837	@ </td>
838	@ </tr>
839	}
840	@ </table>
841	blob_reset(&wiki_links);
842	}else{
843	style_header("Check-in Information");
844	login_anonymous_available();
845	}
846	db_finalize(&q1);
847	if( !PB("nowiki") ){
848	wiki_render_associated("checkin", zUuid, 0);
849	}
850	render_backlink_graph(zUuid, "<div class=\"section\">References</div>\n");
851	@ <div class="section">Context</div>
852	render_checkin_context(rid, 0);
853	@ <div class="section">Changes</div>
854	@ <div class="sectionmenu">
855

Fossil SCM

Keyboard Shortcuts