Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Reenable the "Tags" menu item, but make it go to the new "taglist" page. Also add separate "tagtimeline" page and separate "brlist" into "brlist" and "brtimeline". |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
a12cb216b74d859beb0e1e1b4de10e87 |
| User & Date: | drh 2009-01-22 13:08:42.000 |
References
|
2009-01-23
| ||
| 06:13 | • New ticket [1567066c67] Tags menu points into tagview page shows urelated content. ... (artifact: 9d9897fb88 user: anonymous) | |
Context
|
2009-01-22
| ||
| 13:52 | Add the ability to cancel existing tags from the web interface, on the "vedit" page. Disable the display of "Leaf" on the timeline for closed leaves. ... (check-in: 73c23a4279 user: drh tags: trunk) | |
| 13:08 | Reenable the "Tags" menu item, but make it go to the new "taglist" page. Also add separate "tagtimeline" page and separate "brlist" into "brlist" and "brtimeline". ... (check-in: a12cb216b7 user: drh tags: trunk) | |
| 12:03 | Change the way branches are tagged: The value of the "branch" property is used to identify the branch name. Repository rebuild required. Also, branches must be retagged. ... (check-in: 42c2a18e73 user: drh tags: trunk) | |
Changes
Changes to src/branch.c.
| ︙ | ︙ | |||
210 211 212 213 214 215 216 217 218 219 220 221 222 |
print_timeline(&q, 2000);
db_finalize(&q);
}else{
fossil_panic("branch subcommand should be one of: "
"new list");
}
}
/*
** This routine is called while for each check-in that is rendered by
** the timeline of a "brlist" page. Add some additional hyperlinks
** to the end of the line.
*/
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 |
print_timeline(&q, 2000);
db_finalize(&q);
}else{
fossil_panic("branch subcommand should be one of: "
"new list");
}
}
/*
** WEBPAGE: brlist
**
** Show a timeline of all branches
*/
void brlist_page(void){
Stmt q;
login_check_credentials();
if( !g.okRead ){ login_needed(); return; }
style_header("Branches");
style_submenu_element("Timeline", "Timeline", "brtimeline");
login_anonymous_available();
@ <h2>Branches:</h2>
@ <ul>
db_prepare(&q,
"SELECT DISTINCT value FROM tagxref"
" WHERE tagid=%d AND srcid!=0 AND value NOT NULL"
" ORDER BY value",
TAG_BRANCH
);
while( db_step(&q)==SQLITE_ROW ){
const char *zBr = db_column_text(&q, 0);
if( g.okHistory ){
@ <li><a href="%s(g.zBaseURL)/timeline?t=%T(zBr)">%h(zBr)</a></li>
}else{
@ <li><b>%h(zBr)</b></li>
}
}
db_finalize(&q);
@ </ul>
@ <br clear="both">
@ <script>
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
/*
** This routine is called while for each check-in that is rendered by
** the timeline of a "brlist" page. Add some additional hyperlinks
** to the end of the line.
*/
static void brtimeline_extra(int rid){
Stmt q;
if( !g.okHistory ) return;
db_prepare(&q,
"SELECT substr(tagname,5) FROM tagxref, tag"
" WHERE tagxref.rid=%d"
" AND tagxref.tagid=tag.tagid"
" AND tagxref.tagtype>0"
" AND tag.tagname GLOB 'sym-*'",
rid
);
while( db_step(&q)==SQLITE_ROW ){
const char *zTagName = db_column_text(&q, 0);
@ <a href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">[timeline]</a>
}
db_finalize(&q);
}
/*
** WEBPAGE: brtimeline
**
** Show a timeline of all branches
*/
void brtimeline_page(void){
Stmt q;
login_check_credentials();
if( !g.okRead ){ login_needed(); return; }
style_header("Branches");
style_submenu_element("List", "List", "brlist");
login_anonymous_available();
@ <h2>The initial check-in for each branch:</h2>
db_prepare(&q,
"%s AND blob.rid IN (SELECT rid FROM tagxref"
" WHERE tagtype>0 AND tagid=%d AND srcid!=0)"
" ORDER BY event.mtime DESC",
timeline_query_for_www(), TAG_BRANCH
);
www_print_timeline(&q, 0, brtimeline_extra);
db_finalize(&q);
@ <br clear="both">
@ <script>
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
|
Changes to src/info.c.
| ︙ | ︙ | |||
1103 1104 1105 1106 1107 1108 1109 |
case 1: {
/* got one UUID, use it */
zName = blob_str(&uuid);
break;
}
case 2: {
/* go somewhere to show the multiple UUIDs */
| < | 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 |
case 1: {
/* got one UUID, use it */
zName = blob_str(&uuid);
break;
}
case 2: {
/* go somewhere to show the multiple UUIDs */
return;
break;
}
default: {
fossil_redirect_home();
break;
}
|
| ︙ | ︙ |
Changes to src/style.c.
| ︙ | ︙ | |||
192 193 194 195 196 197 198 199 200 201 202 203 204 205 |
@ if {[hascap h]} {
@ html "<a href='$baseurl/dir'>Files</a>"
@ }
@ if {[hascap o]} {
@ html "<a href='$baseurl/leaves'>Leaves</a>"
@ html "<a href='$baseurl/timeline'>Timeline</a>"
@ html "<a href='$baseurl/brlist'>Branches</a>"
@ }
@ if {[hascap r]} {
@ html "<a href='$baseurl/reportlist'>Bugs</a>"
@ }
@ if {[hascap j]} {
@ html "<a href='$baseurl/wiki'>Wiki</a>"
@ }
| > | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 |
@ if {[hascap h]} {
@ html "<a href='$baseurl/dir'>Files</a>"
@ }
@ if {[hascap o]} {
@ html "<a href='$baseurl/leaves'>Leaves</a>"
@ html "<a href='$baseurl/timeline'>Timeline</a>"
@ html "<a href='$baseurl/brlist'>Branches</a>"
@ html "<a href='$baseurl/taglist'>Tags</a>"
@ }
@ if {[hascap r]} {
@ html "<a href='$baseurl/reportlist'>Bugs</a>"
@ }
@ if {[hascap j]} {
@ html "<a href='$baseurl/wiki'>Wiki</a>"
@ }
|
| ︙ | ︙ |
Changes to src/tag.c.
| ︙ | ︙ | |||
478 479 480 481 482 483 484 |
/* Cleanup */
return;
tag_cmd_usage:
usage("add|cancel|find|list ...");
}
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 |
/* Cleanup */
return;
tag_cmd_usage:
usage("add|cancel|find|list ...");
}
/*
** WEBPAGE: /taglist
*/
void taglist_page(void){
Stmt q;
login_check_credentials();
if( !g.okRead ){
login_needed();
}
style_header("Tags");
style_submenu_element("Timeline", "Timeline", "tagtimeline");
@ <h2>Tags used by one or more check-ins:</h2>
db_prepare(&q,
"SELECT substr(tagname,5)"
" FROM tag"
" WHERE EXISTS(SELECT 1 FROM tagxref"
" WHERE tagid=tag.tagid"
" AND tagtype>0)"
" AND tagname GLOB 'sym-*'"
" ORDER BY tagname"
);
@ <ul>
while( db_step(&q)==SQLITE_ROW ){
const char *zName = db_column_text(&q, 0);
if( g.okHistory ){
@ <li><a href=%s(g.zBaseURL)/timeline?t=%T(zName)>%h(zName)</a></li>
}else{
@ <li><strong>%h(zName)</strong></li>
}
}
@ </ul>
db_finalize(&q);
style_footer();
}
/*
** Draw the names of all tags added to check-in rid. Only tags
** that are directly applied to rid are named. Propagated tags
** are omitted.
*/
static void tagtimeline_extra(int rid){
Stmt q;
db_prepare(&q,
"SELECT substr(tagname,5) FROM tagxref, tag"
" WHERE tagxref.rid=%d"
" AND tagxref.tagid=tag.tagid"
" AND tagxref.tagtype>0 AND tagxref.srcid>0"
" AND tag.tagname GLOB 'sym-*'",
rid
);
while( db_step(&q)==SQLITE_ROW ){
const char *zTagName = db_column_text(&q, 0);
if( g.okHistory ){
@ <a href="%s(g.zBaseURL)/timeline?t=%T(zTagName)">[%h(zTagName)]</a>
}else{
@ <b>[%h(zTagName)]</b>
}
}
db_finalize(&q);
}
/*
** WEBPAGE: /tagtimeline
*/
void tagtimeline_page(void){
Stmt q;
login_check_credentials();
if( !g.okRead ){ login_needed(); return; }
style_header("Tagged Check-ins");
style_submenu_element("List", "List", "taglist");
login_anonymous_available();
@ <h2>Initial check-ins for each tag:</t2>
db_prepare(&q,
"%s AND blob.rid IN (SELECT rid FROM tagxref"
" WHERE tagtype>0 AND srcid>0"
" AND tagid IN (SELECT tagid FROM tag "
" WHERE tagname GLOB 'sym-*'))"
" ORDER BY event.mtime DESC",
timeline_query_for_www()
);
www_print_timeline(&q, 0, tagtimeline_extra);
db_finalize(&q);
@ <br clear="both">
@ <script>
@ function xin(id){
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
|
Changes to src/tagview.c.
| ︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 | ** ** Implementation of the Tag View page */ #include <assert.h> #include "config.h" #include "tagview.h" #if 0 # define TAGVIEW_DEFAULT_FILTER "AND t.tagname NOT GLOB 'wiki-*' " #else # define TAGVIEW_DEFAULT_FILTER #endif | > | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | ** ** Implementation of the Tag View page */ #include <assert.h> #include "config.h" #include "tagview.h" #if 0 /* DISABLED */ #if 0 # define TAGVIEW_DEFAULT_FILTER "AND t.tagname NOT GLOB 'wiki-*' " #else # define TAGVIEW_DEFAULT_FILTER #endif |
| ︙ | ︙ | |||
186 187 188 189 190 191 192 | db_prepare(&q, zSql); free(zSql); www_print_timeline(&q, 0, 0); db_finalize(&q); } /* | | | 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 |
db_prepare(&q, zSql);
free(zSql);
www_print_timeline(&q, 0, 0);
db_finalize(&q);
}
/*
** WEB PAGE: /tagview
*/
void tagview_page(void){
char const *zName = 0;
char const *zTitle = 0;
int nTag = 0;
login_check_credentials();
if( !g.okRead ){
|
| ︙ | ︙ | |||
283 284 285 286 287 288 289 |
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
| > > | 284 285 286 287 288 289 290 291 292 |
@ }
@ function xout(id){
@ }
@ </script>
style_footer();
}
#endif /* DISABLED */
|