Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch differentiate-timeline Excluding Merge-Ins
This is equivalent to a diff from 196e0fd9 to f8832feb
2015-03-26
| ||
13:35 | Fix http_socket.c so that it builds on Solaris. ... (check-in: f9318412 user: drh tags: trunk) | |
13:23 | Merge updates from trunk ... (Closed-Leaf check-in: f8832feb user: jmoger tags: differentiate-timeline) | |
2015-03-25
| ||
23:02 | Merge in the latest Xekri changes. ... (check-in: 196e0fd9 user: drh tags: trunk) | |
22:13 |
Updates to the Xekri skin to match the changes in the other skins
| |
2015-03-24
| ||
18:22 | Update the built-in SQLite to 3.8.9 alpha. ... (check-in: a00cdb18 user: drh tags: trunk) | |
2015-03-19
| ||
23:57 | Expose timeline circles, arrowheads, and branch rail colors as settings ... (check-in: fb9b3707 user: jmoger tags: differentiate-timeline) | |
Changes to skins/xekri/css.txt.
︙ | |||
1025 1026 1027 1028 1029 1030 1031 | 1025 1026 1027 1028 1029 1030 1031 | - | tr.row0 { /* use default */ } /* odd table row color */ tr.row1 { /* Use default */ } |
Changes to src/configure.c.
︙ | |||
91 92 93 94 95 96 97 98 99 100 101 102 103 104 | 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 | + + + | { "logo-mimetype", CONFIGSET_SKIN }, { "logo-image", CONFIGSET_SKIN }, { "background-mimetype", CONFIGSET_SKIN }, { "background-image", CONFIGSET_SKIN }, { "timeline-block-markup", CONFIGSET_SKIN }, { "timeline-max-comment", CONFIGSET_SKIN }, { "timeline-plaintext", CONFIGSET_SKIN }, { "timeline-rail-arrows", CONFIGSET_SKIN }, { "timeline-rail-circles", CONFIGSET_SKIN }, { "timeline-rail-colors", CONFIGSET_SKIN }, { "adunit", CONFIGSET_SKIN }, { "adunit-omit-if-admin", CONFIGSET_SKIN }, { "adunit-omit-if-user", CONFIGSET_SKIN }, { "white-foreground", CONFIGSET_SKIN }, #ifdef FOSSIL_ENABLE_TH1_DOCS { "th1-docs", CONFIGSET_TH1 }, |
︙ |
Changes to src/finfo.c.
︙ | |||
305 306 307 308 309 310 311 312 313 314 315 316 317 318 | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 | + + + | Blob sql; HQuery url; GraphContext *pGraph; int brBg = P("brbg")!=0; int uBg = P("ubg")!=0; int fDebug = atoi(PD("debug","0")); int fShowId = P("showid")!=0; int showRailArrows = db_get_boolean("timeline-rail-arrows", 1); int showRailCircles = db_get_boolean("timeline-rail-circles", 0); int showRailColors = db_get_boolean("timeline-rail-colors", 0); login_check_credentials(); if( !g.perm.Read ){ login_needed(g.anon.Read); return; } style_header("File History"); login_anonymous_available(); url_initialize(&url, "finfo"); if( brBg ) url_add_parameter(&url, "brbg", 0); |
︙ | |||
540 541 542 543 544 545 546 | 543 544 545 546 547 548 549 550 551 552 553 | - + + | int w = pGraph->mxRail*pGraph->iRailPitch + 28; @ <tr><td></td><td> @ <div id="grbtm" style="width:%d(w)px;"></div> @ </td><td></td></tr> } } @ </table> |
Changes to src/json_config.c.
︙ | |||
61 62 63 64 65 66 67 68 69 70 71 72 73 74 | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | + + + | { "logo-mimetype", CONFIGSET_SKIN }, { "logo-image", CONFIGSET_SKIN }, { "background-mimetype", CONFIGSET_SKIN }, { "background-image", CONFIGSET_SKIN }, { "timeline-block-markup", CONFIGSET_SKIN }, { "timeline-max-comment", CONFIGSET_SKIN }, { "timeline-plaintext", CONFIGSET_SKIN }, { "timeline-rail-arrows", CONFIGSET_SKIN }, { "timeline-rail-circles", CONFIGSET_SKIN }, { "timeline-rail-colors", CONFIGSET_SKIN }, { "adunit", CONFIGSET_SKIN }, { "adunit-omit-if-admin", CONFIGSET_SKIN }, { "adunit-omit-if-user", CONFIGSET_SKIN }, { "white-foreground", CONFIGSET_SKIN }, { "project-name", CONFIGSET_PROJ }, { "short-project-name", CONFIGSET_PROJ }, |
︙ |
Changes to src/setup.c.
︙ | |||
1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 | 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 | + + + + + + + + + + + + + + + + + + + | @ <hr /> onoff_attribute("Plaintext comments on timelines", "timeline-plaintext", "tpt", 0, 0); @ <p>In timeline displays, check-in comments are displayed literally, @ without any wiki or HTML interpretation. (Note: Use CSS to change @ display formatting features such as fonts and line-wrapping behavior.)</p> @ <hr /> onoff_attribute("Show branch rail arrowheads", "timeline-rail-arrows", "tra", 1, 0); @ <p>The rail (line) that connects check-ins may optionally display an @ arrowhead indicating the linear progression of changes.</p> @ <hr /> onoff_attribute("Show check-in timeline nodes as circles", "timeline-rail-circles", "trc", 0, 0); @ <p>By default, Fossil will display check-nodes as squares. Alternatively you @ may prefer to display them as circles.</p> @ <hr /> onoff_attribute("Use branch background color for branch rails", "timeline-rail-colors", "trl", 0, 0); @ <p>Fossil will display your branch rails using the color defined for the @ branch background. (Note: Branch background colors may not have enough @ contrast to be easily distinguishable from the timeline background.</p> @ <hr /> onoff_attribute("Use Universal Coordinated Time (UTC)", "timeline-utc", "utc", 1, 0); @ <p>Show times as UTC (also sometimes called Greenwich Mean Time (GMT) or @ Zulu) instead of in local time. On this server, local time is currently tmDiff = db_double(0.0, "SELECT julianday('now')"); tmDiff = db_double(0.0, |
︙ |
Changes to src/style.c.
︙ | |||
1225 1226 1227 1228 1229 1230 1231 | 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 | - - + + + + | @ /* Use default */ }, { "#usetupEditCapability", "format for capabilities string, mentioned on the user edit page", @ font-weight: bold; }, { "#canvas", "timeline graph node colors", |
︙ |
Changes to src/timeline.c.
︙ | |||
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 | 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 | + + + + + + | Stmt *pQuery, /* Query to implement the timeline */ int tmFlags, /* Flags controlling display behavior */ const char *zThisUser, /* Suppress links to this user */ const char *zThisTag, /* Suppress links to this tag */ int selectedRid, /* Highlight the line with this RID value */ void (*xExtra)(int) /* Routine to call on each line of display */ ){ int showRailArrows; int showRailCircles; int showRailColors; int mxWikiLen; Blob comment; int prevTagid = 0; int suppressCnt = 0; char zPrevDate[20]; GraphContext *pGraph = 0; int prevWasDivider = 0; /* True if previous output row was <hr> */ int fchngQueryInit = 0; /* True if fchngQuery is initialized */ Stmt fchngQuery; /* Query for file changes on check-ins */ static Stmt qbranch; int pendingEndTr = 0; /* True if a </td></tr> is needed */ int vid = 0; /* Current checkout version */ int dateFormat = 0; /* 0: HH:MM (default) */ const char *zDateFmt; if( fossil_strcmp(g.zIpAddr, "127.0.0.1")==0 && db_open_local(0) ){ vid = db_lget_int("checkout", 0); } zPrevDate[0] = 0; showRailArrows = db_get_boolean("timeline-rail-arrows", 1); showRailCircles = db_get_boolean("timeline-rail-circles", 0); showRailColors = db_get_boolean("timeline-rail-colors", 0); mxWikiLen = db_get_int("timeline-max-comment", 0); dateFormat = db_get_int("timeline-date-format", 0); zDateFmt = P("datefmt"); if( zDateFmt ) dateFormat = atoi(zDateFmt); if( tmFlags & TIMELINE_GRAPH ){ pGraph = graph_init(); /* style is not moved to css, because this is |
︙ | |||
592 593 594 595 596 597 598 | 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 | - + + - + + + + | @ <tr><td></td><td> @ <div id="grbtm" style="width:%d(w)px;"></div> @ </td><td></td></tr> } } @ </table> if( fchngQueryInit ) db_finalize(&fchngQuery); |
︙ | |||
710 711 712 713 714 715 716 | 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 | - + + | cgi_printf("var nrail = %d\n", pGraph->mxRail+1); graph_free(pGraph); @ var cDiv = gebi("canvas"); @ var csty = window.getComputedStyle && window.getComputedStyle(cDiv,null); @ var lineClr = (csty && csty.getPropertyValue('color')) || 'black'; @ var bgClr = (csty && csty.getPropertyValue('background-color')) ||'white'; @ if( bgClr=='transparent' ) bgClr = 'white'; |
︙ | |||
749 750 751 752 753 754 755 | 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 | + + + + + + + + - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + | @ if( obj.offsetParent ){ @ do{ @ left += obj.offsetLeft; @ }while( obj = obj.offsetParent ); @ } @ return left; @ } @ function getRailColor(clr){ @ var railClr = lineClr; if( showRailColors ) { @ if ( bgClr == clr ) railClr = lineClr; @ railClr = clr||railClr; } @ return railClr; @ } |
︙ | |||
803 804 805 806 807 808 809 | 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 | + - + + + + + - - + + + + + - - + + + - + + + - - + + + | @ } @ cDiv.appendChild(n); @ } @ function drawThinLine(x0,y0,x1,y1){ @ drawBox(lineClr,x0,y0,x1,y1); @ } @ function drawNodeBox(color,x0,y0,x1,y1){ @ var n = drawBox(color,x0,y0,x1,y1); |
︙ | |||
859 860 861 862 863 864 865 866 867 868 869 870 871 872 | 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 | + | @ n.style.borderTopWidth = "3px"; @ n.style.borderBottomWidth = "3px"; @ n.style.borderLeftWidth = "7px"; @ n.style.borderLeftColor = "#600000"; @ cDiv.appendChild(n); @ } @ } @ /* MergeIn rails & arrows */ @ for(var j in p.mi){ @ var y0 = p.y+5; @ var mx = p.mi[j]; @ if( mx<0 ){ @ mx = left-mx; @ drawThinLine(mx,y0,mx,btm); @ }else{ |
︙ | |||
922 923 924 925 926 927 928 929 930 931 932 933 934 935 | 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 | + + + | @ break; @ } @ } @ } @ function clickOnRow(p){ @ if( selRow==null ){ @ selBox = drawBox("red",p.x-2,p.y-2,p.x+3,p.y+3); if( showRailCircles ){ @ selBox.style.borderRadius="6px"; } @ selRow = p; @ }else if( selRow==p ){ @ var canvasDiv = gebi("canvas"); @ canvasDiv.removeChild(selBox); @ selBox = null; @ selRow = null; @ }else{ |
︙ |