Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | 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. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
e72444ea6afa3f70417fe90eb2dc95d2 |
| User & Date: | drh 2017-11-25 12:26:06.538 |
Context
|
2017-11-26
| ||
| 01:37 | The javascript Advanced/Basic toggles on the timelines is working well enough now to merge to trunk. ... (check-in: e91d267205 user: drh tags: trunk) | |
|
2017-11-25
| ||
| 20:43 | On the /timeline page, begin with the "basic" view. Provide an "Advanced" button to fill in details using JS. The "basic" query parameter no longer functions. ... (check-in: 3ede2d874f user: drh tags: declutter-via-js) | |
| 12:26 | 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. ... (check-in: e72444ea6a user: drh tags: trunk) | |
| 02:15 | Add a "Basic" button to the submenu for /timeline pages that do not already have the "basic" query parameter. ... (check-in: 227c8e57fa user: drh tags: trunk) | |
Changes
Changes to src/finfo.c.
| ︙ | ︙ | |||
344 345 346 347 348 349 350 |
}
fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename);
if( fnid==0 ){
@ No such file: %h(zFilename)
style_footer();
return;
}
| | | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 |
}
fnid = db_int(0, "SELECT fnid FROM filename WHERE name=%Q", zFilename);
if( fnid==0 ){
@ No such file: %h(zFilename)
style_footer();
return;
}
if( g.perm.Admin && !bBasic ){
style_submenu_element("MLink Table", "%R/mlink?name=%t", zFilename);
}
if( baseCheckin ){
if( P("orig")!=0 ){
origCheckin = name_to_typed_rid(P("orig"),"ci");
path_shortest_stored_in_ancestor_table(origCheckin, baseCheckin);
}else{
|
| ︙ | ︙ | |||
446 447 448 449 450 451 452 |
}
}else{
blob_appendf(&title, "History of ");
hyperlinked_path(zFilename, &title, 0, "tree", "");
if( fShowId ) blob_appendf(&title, " (%d)", fnid);
}
if( bBasic ){
| | > > > | 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 |
}
}else{
blob_appendf(&title, "History of ");
hyperlinked_path(zFilename, &title, 0, "tree", "");
if( fShowId ) blob_appendf(&title, " (%d)", fnid);
}
if( bBasic ){
style_submenu_element("Details", "%s",
url_render(&url, "basic", 0, 0, 0));
}else{
style_submenu_element("Declutter", "%s",
url_render(&url, "basic", "1", 0, 0));
}
@ <h2>%b(&title)</h2>
blob_reset(&title);
pGraph = graph_init();
@ <table id="timelineTable%d(iTableId)" class="timelineTable">
if( baseCheckin ){
db_prepare(&qparent,
|
| ︙ | ︙ | |||
584 585 586 587 588 589 590 |
@ %z(href("%R/finfo?name=%t",zNewName))%h(zNewName)</a>
fossil_free(zNewName);
}else{
@ <b>Deleted</b>
}
}
}
| | | | 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 |
@ %z(href("%R/finfo?name=%t",zNewName))%h(zNewName)</a>
fossil_free(zNewName);
}else{
@ <b>Deleted</b>
}
}
}
if( g.perm.Hyperlink && zUuid && !bBasic ){
const char *z = zFilename;
@ <span class='timelineExtraLinks'>
@ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
@ [annotate]</a>
@ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
@ [blame]</a>
@ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins using]</a>
if( fpid>0 ){
@ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
}
@ </span>
}
if( fDebug & FINFO_DEBUG_MLINK ){
int ii;
|
| ︙ | ︙ |
Changes to src/info.c.
| ︙ | ︙ | |||
1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 |
@ size: %d(szFile))
if( g.perm.Hyperlink ){
@ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
@ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
@ [annotate]</a>
@ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
@ [blame]</a>
}
cnt++;
if( pDownloadName && blob_size(pDownloadName)==0 ){
blob_append(pDownloadName, zName, -1);
}
}
if( prevName && showDetail ){
| > | 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 |
@ size: %d(szFile))
if( g.perm.Hyperlink ){
@ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
@ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
@ [annotate]</a>
@ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
@ [blame]</a>
@ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins using]</a>
}
cnt++;
if( pDownloadName && blob_size(pDownloadName)==0 ){
blob_append(pDownloadName, zName, -1);
}
}
if( prevName && showDetail ){
|
| ︙ | ︙ |
Changes to src/timeline.c.
| ︙ | ︙ | |||
2237 2238 2239 2240 2241 2242 2243 |
style_submenu_entry("t", "Tag Filter:", -8, 0);
style_submenu_multichoice("ms", count(azMatchStyles)/2, azMatchStyles, 0);
}
}
blob_zero(&cond);
}
if( bBasic ){
| | | | 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 |
style_submenu_entry("t", "Tag Filter:", -8, 0);
style_submenu_multichoice("ms", count(azMatchStyles)/2, azMatchStyles, 0);
}
}
blob_zero(&cond);
}
if( bBasic ){
timeline_submenu(&url, "Details", "basic", 0, 0);
}else{
timeline_submenu(&url, "Declutter", "basic", "1", 0);
}
if( PB("showsql") ){
@ <pre>%h(blob_sql_text(&sql))</pre>
}
if( search_restrict(SRCH_CKIN)!=0 ){
style_submenu_element("Search", "%R/search?y=c");
}
|
| ︙ | ︙ |