Fossil

Check-in [2a8598f9]
Login

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

Overview
Comment:Change the name of "Normal View" to "Modern View". Add the "View" modifier to all choices in the view mode selector, to help make it clear what the selector is for.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | sticky-timeline-style
Files: files | file ages | folders
SHA3-256:2a8598f9879d31476d89881345bd4bb5a8f8a769b4cfffc0d434dcca395b5fc6
User & Date: drh 2017-11-29 11:46:00
Context
2017-11-29
13:25
Add the "View" selector to the /finfo page. check-in: e36f693f user: drh tags: sticky-timeline-style
11:46
Change the name of "Normal View" to "Modern View". Add the "View" modifier to all choices in the view mode selector, to help make it clear what the selector is for. check-in: 2a8598f9 user: drh tags: sticky-timeline-style
03:41
In "Verbose" mode, put the hash up front, as was done with legacy. check-in: 59980b60 user: drh tags: sticky-timeline-style
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/style.c.

829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
    "The check-in comment text in Compact mode",
    @ cursor: pointer;
  },
  { "span.timelineEllipsis",
    "The ellipsis mark at the end of a compact comment in a timeline",
    @ cursor: pointer;
  },
  { ".timelineNormalCell, .timelineColumnarCell, .timelineDetailCell",
    "The entry details for a normal timeline",
    @ vertical-align: top;
    @ text-align: left;
    @ padding: 0.75em;
    @ border: 1px #ccc solid;
    @ border-radius: 1em;
  },
  { ".timelineNormalDetail",
    "Detail text for a normal timeline display",
    @ font-size: 80%;
    @ text-align: right;
    @ float: right;
    @ opacity: 0.75;
    @ margin-top: 0.5em;
  },







|







|







829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
    "The check-in comment text in Compact mode",
    @ cursor: pointer;
  },
  { "span.timelineEllipsis",
    "The ellipsis mark at the end of a compact comment in a timeline",
    @ cursor: pointer;
  },
  { ".timelineModernCell, .timelineColumnarCell, .timelineDetailCell",
    "The entry details for a normal timeline",
    @ vertical-align: top;
    @ text-align: left;
    @ padding: 0.75em;
    @ border: 1px #ccc solid;
    @ border-radius: 1em;
  },
  { ".timelineModernDetail",
    "Detail text for a normal timeline display",
    @ font-size: 80%;
    @ text-align: right;
    @ float: right;
    @ opacity: 0.75;
    @ margin-top: 0.5em;
  },

Changes to src/timeline.c.

103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
...
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
....
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
....
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
....
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
#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.
*/
char *hash_color(const char *z){
................................................................................
  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();
  }
  db_static_prepare(&qbranch,
................................................................................
**    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
................................................................................
  const char *z;
  char *zOlderButton = 0;             /* URL for Older button at the bottom */
  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");
  if( z==0 ) z = db_get("timeline-default-length",0);
................................................................................
    nEntry = -1;
    zCirca = 0;
  }
  switch( cViewStyle ){
    case 'c':  tmFlags |= TIMELINE_COMPACT;  break;
    case 'v':  tmFlags |= TIMELINE_VERBOSE;  break;
    case 'j':  tmFlags |= TIMELINE_COLUMNAR; break;
    default:   tmFlags |= TIMELINE_NORMAL;   break;
  }    
  if( zType[0]=='a' ){
    tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
  }else{
    tmFlags |= TIMELINE_GRAPH;
  }
  if( PB("ng") || zSearch!=0 ){







|







 







|







 







|







 







|
|
|
|







 







|







103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
...
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
....
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
....
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
....
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
#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_MODERN   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.
*/
char *hash_color(const char *z){
................................................................................
  if( tmFlags & TIMELINE_COLUMNAR ){
    zStyle = "Columnar";
  }else if( tmFlags & TIMELINE_COMPACT ){
    zStyle = "Compact";
  }else if( tmFlags & TIMELINE_VERBOSE ){
    zStyle = "Verbose";
  }else{
    zStyle = "Modern";
  }
  zDateFmt = P("datefmt");
  if( zDateFmt ) dateFormat = atoi(zDateFmt);
  if( tmFlags & TIMELINE_GRAPH ){
    pGraph = graph_init();
  }
  db_static_prepare(&qbranch,
................................................................................
**    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"   m: "Modern"  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
................................................................................
  const char *z;
  char *zOlderButton = 0;             /* URL for Older button at the bottom */
  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[] = {
     "m", "Modern View",
     "c", "Compact View",
     "v", "Verbose View",
     "j", "Columnar View",
  };

  /* Set number of rows to display */
  cookie_parse(DISPLAY_SETTINGS_COOKIE);
  cookie_read_parameter("n","n");
  z = P("n");
  if( z==0 ) z = db_get("timeline-default-length",0);
................................................................................
    nEntry = -1;
    zCirca = 0;
  }
  switch( cViewStyle ){
    case 'c':  tmFlags |= TIMELINE_COMPACT;  break;
    case 'v':  tmFlags |= TIMELINE_VERBOSE;  break;
    case 'j':  tmFlags |= TIMELINE_COLUMNAR; break;
    default:   tmFlags |= TIMELINE_MODERN;   break;
  }    
  if( zType[0]=='a' ){
    tmFlags |= TIMELINE_BRIEF | TIMELINE_GRAPH;
  }else{
    tmFlags |= TIMELINE_GRAPH;
  }
  if( PB("ng") || zSearch!=0 ){