Fossil

Check-in [c0a3a90b]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Change the name of the "Detailed" mode on /timeline to "Verbose".
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | sticky-timeline-style
Files: files | file ages | folders
SHA3-256: c0a3a90b28e05da8a0e35dea3e2c383b0b98a3905d9d3c337c97ebc65c7f5cd4
User & Date: drh 2017-11-29 02:29:36.122
Context
2017-11-29
02:48
Fixes to default styling. ... (check-in: e814b1e5 user: drh tags: sticky-timeline-style)
02:29
Change the name of the "Detailed" mode on /timeline to "Verbose". ... (check-in: c0a3a90b user: drh tags: sticky-timeline-style)
02:20
Fixes to the cookie handler. Simpler class structure on timelines. ... (check-in: 92af2148 user: drh tags: sticky-timeline-style)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/timeline.c.
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
#define TIMELINE_BRCOLOR  0x0040  /* Background color by branch name */
#define TIMELINE_UCOLOR   0x0080  /* Background color by user */
#define TIMELINE_FRENAMES 0x0100  /* Detail only file name changes */
#define TIMELINE_UNHIDE   0x0200  /* Unhide check-ins with "hidden" tag */
#define TIMELINE_SHOWRID  0x0400  /* Show RID values in addition to UUIDs */
#define TIMELINE_BISECT   0x0800  /* Show supplimental bisect information */
#define TIMELINE_COMPACT  0x1000  /* Use the "compact" view style */
#define TIMELINE_DETAILED 0x2000  /* Use the "detailed" view style */
#define TIMELINE_NORMAL   0x4000  /* Use the "normal" view style */
#define TIMELINE_COLUMNAR 0x8000  /* Use the "columns view style */
#endif

/*
** Hash a string and use the hash to determine a background color.
*/







|







102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
#define TIMELINE_BRCOLOR  0x0040  /* Background color by branch name */
#define TIMELINE_UCOLOR   0x0080  /* Background color by user */
#define TIMELINE_FRENAMES 0x0100  /* Detail only file name changes */
#define TIMELINE_UNHIDE   0x0200  /* Unhide check-ins with "hidden" tag */
#define TIMELINE_SHOWRID  0x0400  /* Show RID values in addition to UUIDs */
#define TIMELINE_BISECT   0x0800  /* Show supplimental bisect information */
#define TIMELINE_COMPACT  0x1000  /* Use the "compact" view style */
#define TIMELINE_VERBOSE  0x2000  /* Use the "detailed" view style */
#define TIMELINE_NORMAL   0x4000  /* Use the "normal" view style */
#define TIMELINE_COLUMNAR 0x8000  /* Use the "columns view style */
#endif

/*
** Hash a string and use the hash to determine a background color.
*/
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
  mxWikiLen = db_get_int("timeline-max-comment", 0);
  dateFormat = db_get_int("timeline-date-format", 0);
  bCommentGitStyle = db_get_int("timeline-truncate-at-blank", 0);
  if( tmFlags & TIMELINE_COLUMNAR ){
    zStyle = "Columnar";
  }else if( tmFlags & TIMELINE_COMPACT ){
    zStyle = "Compact";
  }else if( tmFlags & TIMELINE_DETAILED ){
    zStyle = "Detailed";
  }else{
    zStyle = "Normal";
  }
  zDateFmt = P("datefmt");
  if( zDateFmt ) dateFormat = atoi(zDateFmt);
  if( tmFlags & TIMELINE_GRAPH ){
    pGraph = graph_init();







|
|







265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
  mxWikiLen = db_get_int("timeline-max-comment", 0);
  dateFormat = db_get_int("timeline-date-format", 0);
  bCommentGitStyle = db_get_int("timeline-truncate-at-blank", 0);
  if( tmFlags & TIMELINE_COLUMNAR ){
    zStyle = "Columnar";
  }else if( tmFlags & TIMELINE_COMPACT ){
    zStyle = "Compact";
  }else if( tmFlags & TIMELINE_VERBOSE ){
    zStyle = "Verbose";
  }else{
    zStyle = "Normal";
  }
  zDateFmt = P("datefmt");
  if( zDateFmt ) dateFormat = atoi(zDateFmt);
  if( tmFlags & TIMELINE_GRAPH ){
    pGraph = graph_init();
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
**    t=TAG           Show only check-ins with the given TAG
**    r=TAG           Show check-ins related to TAG, equivalent to t=TAG&rel
**    rel             Show related check-ins as well as those matching t=TAG
**    mionly          Limit rel to show ancestors but not descendants
**    ms=MATCHSTYLE   Set tag match style to EXACT, GLOB, LIKE, REGEXP
**    u=USER          Only show items associated with USER
**    y=TYPE          'ci', 'w', 't', 'e', or 'all'.
**    ss=VIEWSTYLE    c: "compact"  d: "detail"   n: "normal"  j: "columnar"
**    ng              No Graph.
**    nd              Do not highlight the focus check-in
**    v               Show details of files changed
**    f=CHECKIN       Show family (immediate parents and children) of CHECKIN
**    from=CHECKIN    Path from...
**    to=CHECKIN        ... to this
**    shortest          ... show only the shortest path







|







1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
**    t=TAG           Show only check-ins with the given TAG
**    r=TAG           Show check-ins related to TAG, equivalent to t=TAG&rel
**    rel             Show related check-ins as well as those matching t=TAG
**    mionly          Limit rel to show ancestors but not descendants
**    ms=MATCHSTYLE   Set tag match style to EXACT, GLOB, LIKE, REGEXP
**    u=USER          Only show items associated with USER
**    y=TYPE          'ci', 'w', 't', 'e', or 'all'.
**    ss=VIEWSTYLE    c: "compact"  v: "verbose"   n: "normal"  j: "columnar"
**    ng              No Graph.
**    nd              Do not highlight the focus check-in
**    v               Show details of files changed
**    f=CHECKIN       Show family (immediate parents and children) of CHECKIN
**    from=CHECKIN    Path from...
**    to=CHECKIN        ... to this
**    shortest          ... show only the shortest path
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
  char *zNewerButton = 0;             /* URL for Newer button at the top */
  int selectedRid = -9999999;         /* Show a highlight on this RID */
  int disableY = 0;                   /* Disable type selector on submenu */
  char cViewStyle;                    /* Overall style of the page */
  static const char *azViewStyles[] = {
     "n", "Normal",
     "c", "Compact",
     "d", "Detailed",
     "j", "Columnar",
  };

  /* Set number of rows to display */
  cookie_parse(DISPLAY_SETTINGS_COOKIE);
  cookie_read_parameter("n","n");
  z = P("n");







|







1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
  char *zNewerButton = 0;             /* URL for Newer button at the top */
  int selectedRid = -9999999;         /* Show a highlight on this RID */
  int disableY = 0;                   /* Disable type selector on submenu */
  char cViewStyle;                    /* Overall style of the page */
  static const char *azViewStyles[] = {
     "n", "Normal",
     "c", "Compact",
     "v", "Verbose",
     "j", "Columnar",
  };

  /* Set number of rows to display */
  cookie_parse(DISPLAY_SETTINGS_COOKIE);
  cookie_read_parameter("n","n");
  z = P("n");
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
  ){
    nEntry = -1;
    zCirca = 0;
  }
  switch( cViewStyle ){
    case 'n':  tmFlags |= TIMELINE_NORMAL;   break;
    case 'c':  tmFlags |= TIMELINE_COMPACT;  break;
    case 'd':  tmFlags |= TIMELINE_DETAILED; break;
    case 'j':  tmFlags |= TIMELINE_COLUMNAR; break;
  }    
  if( zType[0]=='a' ){
    tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
  }else{
    tmFlags |= TIMELINE_GRAPH;
  }







|







1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
  ){
    nEntry = -1;
    zCirca = 0;
  }
  switch( cViewStyle ){
    case 'n':  tmFlags |= TIMELINE_NORMAL;   break;
    case 'c':  tmFlags |= TIMELINE_COMPACT;  break;
    case 'v':  tmFlags |= TIMELINE_VERBOSE;  break;
    case 'j':  tmFlags |= TIMELINE_COLUMNAR; break;
  }    
  if( zType[0]=='a' ){
    tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
  }else{
    tmFlags |= TIMELINE_GRAPH;
  }