Fossil

Diff
Login

Diff

Annotate Patch Unified Diff

Differences From Artifact [b0baf564d7]:

To Artifact [cdffea8fdf]:

︙︙
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212

  int tagid = db_column_int(pQuery, 9);
  const char *zDispUser = zUser && zUser[0] ? zUser : "anonymous";

  if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){
    cgi_printf("(");
  }

/* Set to 1 for historical appearance.  Set to 0 for new experimental look */
#define OLD_STYLE 1
#if OLD_STYLE
  if( (tmFlags & TIMELINE_CLASSIC)==0 ){
    if( zType[0]=='c' ){
      int isLeaf = db_column_int(pQuery, 5);
      if( isLeaf ){
        if( has_closed_tag(rid) ){
          @ <span class='timelineLeaf'>Closed-Leaf</span>
        }else{








|
|
|








196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212

  int tagid = db_column_int(pQuery, 9);
  const char *zDispUser = zUser && zUser[0] ? zUser : "anonymous";

  if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){
    cgi_printf("(");
  }

/* Set to 0 for historical appearance.  Set to 1 or more for new looks */
#define EXTRA_FORMAT 2
#if EXTRA_FORMAT==0
  if( (tmFlags & TIMELINE_CLASSIC)==0 ){
    if( zType[0]=='c' ){
      int isLeaf = db_column_int(pQuery, 5);
      if( isLeaf ){
        if( has_closed_tag(rid) ){
          @ <span class='timelineLeaf'>Closed-Leaf</span>
        }else{
︙︙
222
223
224
225
226
227
228
229
























230
231
232
233
234
235
236

      cgi_printf("artifact:&nbsp;%z%S</a> ",
                 href("%R/info/%!S",zUuid),zUuid);
    }
  }else if( zType[0]=='g' || zType[0]=='w' || zType[0]=='t'
            || zType[0]=='n' || zType[0]=='f'){
    cgi_printf("artifact:&nbsp;%z%S</a> ",href("%R/info/%!S",zUuid),zUuid);
  }
#endif /* OLD_STYLE */

























  if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){
    char *zLink;
    if( zType[0]!='f' || (tmFlags & TIMELINE_FORUMTXT)==0 ){
      zLink = mprintf("%R/timeline?u=%h&c=%t&y=a", zDispUser, zDate);
    }else{
      zLink = mprintf("%R/timeline?u=%h&c=%t&y=a&vfx", zDispUser, zDate);








|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








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

      cgi_printf("artifact:&nbsp;%z%S</a> ",
                 href("%R/info/%!S",zUuid),zUuid);
    }
  }else if( zType[0]=='g' || zType[0]=='w' || zType[0]=='t'
            || zType[0]=='n' || zType[0]=='f'){
    cgi_printf("artifact:&nbsp;%z%S</a> ",href("%R/info/%!S",zUuid),zUuid);
  }
#endif /* EXTRA_FORMAT==0 */
#if EXTRA_FORMAT==2
  if( (tmFlags & TIMELINE_CLASSIC)==0 ){
    if( zType[0]=='c' ){
      int isLeaf = db_column_int(pQuery, 5);
      const char *zPrefix;
      if( isLeaf ){
        zPrefix = has_closed_tag(rid) ? "closed&nbsp;" : "leaf&nbsp;";
      }else{
        zPrefix = "";
      }
      cgi_printf("%scheck-in:&nbsp;%z<strong>%S</strong></a> ",
                  zPrefix, href("%R/info/%!S",zUuid),zUuid);
    }else if( zType[0]=='e' && tagid ){
      cgi_printf("technote:&nbsp;");
      hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
    }else{
      cgi_printf("artifact:&nbsp;%z%S</a> ",
                 href("%R/info/%!S",zUuid),zUuid);
    }
  }else if( zType[0]=='g' || zType[0]=='w' || zType[0]=='t'
            || zType[0]=='n' || zType[0]=='f'){
    cgi_printf("artifact:&nbsp;%z%S</a> ",href("%R/info/%!S",zUuid),zUuid);
  }
#endif /* EXTRA_FORMAT==0 */

  if( g.perm.Hyperlink && fossil_strcmp(zDispUser, zThisUser)!=0 ){
    char *zLink;
    if( zType[0]!='f' || (tmFlags & TIMELINE_FORUMTXT)==0 ){
      zLink = mprintf("%R/timeline?u=%h&c=%t&y=a", zDispUser, zDate);
    }else{
      zLink = mprintf("%R/timeline?u=%h&c=%t&y=a&vfx", zDispUser, zDate);
︙︙
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

    }else{
      cgi_printf(" id:&nbsp;%z%d</a>",
                 href("%R/deltachain/%d",rid), rid);
    }
  }
  tag_private_status(rid);

#if !OLD_STYLE
  if( (tmFlags & TIMELINE_CLASSIC)==0 ){
    if( zType[0]=='e' && tagid ){
      char *zId = db_text(0,
          "SELECT substr(tagname,7) FROM tag WHERE tagid=abs(%d)", tagid);
      cgi_printf(" technote:&nbsp;%z%S</a>",
                 href("%R/technote/%t",zId), zId);
    }else{
      cgi_printf(" hash:&nbsp;%z%S</a>", href("%R/info/%!S", zUuid), zUuid);
    }
  }
#endif /* !OLD_STYLE */

  /* End timelineDetail */
  if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){
    cgi_printf(")");
  }

  if( tmFlags & TIMELINE_COMPACT ){








|










|








302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327

    }else{
      cgi_printf(" id:&nbsp;%z%d</a>",
                 href("%R/deltachain/%d",rid), rid);
    }
  }
  tag_private_status(rid);

#if EXTRA_FORMAT==1
  if( (tmFlags & TIMELINE_CLASSIC)==0 ){
    if( zType[0]=='e' && tagid ){
      char *zId = db_text(0,
          "SELECT substr(tagname,7) FROM tag WHERE tagid=abs(%d)", tagid);
      cgi_printf(" technote:&nbsp;%z%S</a>",
                 href("%R/technote/%t",zId), zId);
    }else{
      cgi_printf(" hash:&nbsp;%z%S</a>", href("%R/info/%!S", zUuid), zUuid);
    }
  }
#endif /* EXTRA_FORMAT==1 */

  /* End timelineDetail */
  if( (tmFlags & (TIMELINE_CLASSIC|TIMELINE_VERBOSE|TIMELINE_COMPACT))!=0 ){
    cgi_printf(")");
  }

  if( tmFlags & TIMELINE_COMPACT ){
︙︙