Fossil SCM

Fix a hyperlink on the /mlink page. Add a link from /info for a check-in to the /mlink page under "Other Links".

drh 2017-10-05 10:02 UTC trunk
Commit 180128f523b161c7eb1e2b39aab4ea3bca05885eaeedd29d9b9d0cc9d11bb8dc
Parent 36f0e47b3275937…
2 files changed +6 -6 +1
~ src/finfo.c ~ src/info.c
M src/finfo.c
+6 -6
--- src/finfo.c
+++ src/finfo.c
@@ -638,16 +638,16 @@
638638
 @ <div class='brlist'>
639639
 @ <table id='mlinktable'>
640640
 @ <thead><tr>
641641
 @ <th>Date</th>
642642
 @ <th>Check-in</th>
643
- @ <th>Parent Check-in</th>
643
+ @ <th>Parent<br>Check-in</th>
644644
 @ <th>Merge?</th>
645645
 @ <th>New</th>
646646
 @ <th>Old</th>
647
- @ <th>Exe Bit?</th>
648
- @ <th>Prior Name</th>
647
+ @ <th>Exe<br>Bit?</th>
648
+ @ <th>Prior<br>Name</th>
649649
 @ </tr></thead>
650650
 @ <tbody>
651651
 while( db_step(&q)==SQLITE_ROW ){
652652
 const char *zDate = db_column_text(&q,0);
653653
 const char *zCkin = db_column_text(&q,1);
@@ -659,11 +659,11 @@
659659
 const char *zPrior = db_column_text(&q,8);
660660
 @ <tr>
661661
 @ <td><a href='%R/timeline?c=%!S(zCkin)'>%s(zDate)</a></td>
662662
 @ <td><a href='%R/info/%!S(zCkin)'>%S(zCkin)</a></td>
663663
 if( zParent ){
664
- @ <td><a href='%R/info/%!S(zPid)'>%S(zParent)</a></td>
664
+ @ <td><a href='%R/info/%!S(zParent)'>%S(zParent)</a></td>
665665
 }else{
666666
 @ <td><i>(New)</i></td>
667667
 }
668668
 @ <td align='center'>%s(isMerge?"&#x2713;":"")</td>
669669
 if( zFid ){
@@ -715,12 +715,12 @@
715715
 @ <th>File</th>
716716
 @ <th>From</th>
717717
 @ <th>Merge?</th>
718718
 @ <th>New</th>
719719
 @ <th>Old</th>
720
- @ <th>Exe Bit?</th>
721
- @ <th>Prior Name</th>
720
+ @ <th>Exe<br>Bit?</th>
721
+ @ <th>Prior<br>Name</th>
722722
 @ </tr></thead>
723723
 @ <tbody>
724724
 while( db_step(&q)==SQLITE_ROW ){
725725
 const char *zName = db_column_text(&q,0);
726726
 const char *zFid = db_column_text(&q,1);
727727
--- src/finfo.c
+++ src/finfo.c
@@ -638,16 +638,16 @@
638 @ <div class='brlist'>
639 @ <table id='mlinktable'>
640 @ <thead><tr>
641 @ <th>Date</th>
642 @ <th>Check-in</th>
643 @ <th>Parent Check-in</th>
644 @ <th>Merge?</th>
645 @ <th>New</th>
646 @ <th>Old</th>
647 @ <th>Exe Bit?</th>
648 @ <th>Prior Name</th>
649 @ </tr></thead>
650 @ <tbody>
651 while( db_step(&q)==SQLITE_ROW ){
652 const char *zDate = db_column_text(&q,0);
653 const char *zCkin = db_column_text(&q,1);
@@ -659,11 +659,11 @@
659 const char *zPrior = db_column_text(&q,8);
660 @ <tr>
661 @ <td><a href='%R/timeline?c=%!S(zCkin)'>%s(zDate)</a></td>
662 @ <td><a href='%R/info/%!S(zCkin)'>%S(zCkin)</a></td>
663 if( zParent ){
664 @ <td><a href='%R/info/%!S(zPid)'>%S(zParent)</a></td>
665 }else{
666 @ <td><i>(New)</i></td>
667 }
668 @ <td align='center'>%s(isMerge?"&#x2713;":"")</td>
669 if( zFid ){
@@ -715,12 +715,12 @@
715 @ <th>File</th>
716 @ <th>From</th>
717 @ <th>Merge?</th>
718 @ <th>New</th>
719 @ <th>Old</th>
720 @ <th>Exe Bit?</th>
721 @ <th>Prior Name</th>
722 @ </tr></thead>
723 @ <tbody>
724 while( db_step(&q)==SQLITE_ROW ){
725 const char *zName = db_column_text(&q,0);
726 const char *zFid = db_column_text(&q,1);
727
--- src/finfo.c
+++ src/finfo.c
@@ -638,16 +638,16 @@
638 @ <div class='brlist'>
639 @ <table id='mlinktable'>
640 @ <thead><tr>
641 @ <th>Date</th>
642 @ <th>Check-in</th>
643 @ <th>Parent<br>Check-in</th>
644 @ <th>Merge?</th>
645 @ <th>New</th>
646 @ <th>Old</th>
647 @ <th>Exe<br>Bit?</th>
648 @ <th>Prior<br>Name</th>
649 @ </tr></thead>
650 @ <tbody>
651 while( db_step(&q)==SQLITE_ROW ){
652 const char *zDate = db_column_text(&q,0);
653 const char *zCkin = db_column_text(&q,1);
@@ -659,11 +659,11 @@
659 const char *zPrior = db_column_text(&q,8);
660 @ <tr>
661 @ <td><a href='%R/timeline?c=%!S(zCkin)'>%s(zDate)</a></td>
662 @ <td><a href='%R/info/%!S(zCkin)'>%S(zCkin)</a></td>
663 if( zParent ){
664 @ <td><a href='%R/info/%!S(zParent)'>%S(zParent)</a></td>
665 }else{
666 @ <td><i>(New)</i></td>
667 }
668 @ <td align='center'>%s(isMerge?"&#x2713;":"")</td>
669 if( zFid ){
@@ -715,12 +715,12 @@
715 @ <th>File</th>
716 @ <th>From</th>
717 @ <th>Merge?</th>
718 @ <th>New</th>
719 @ <th>Old</th>
720 @ <th>Exe<br>Bit?</th>
721 @ <th>Prior<br>Name</th>
722 @ </tr></thead>
723 @ <tbody>
724 while( db_step(&q)==SQLITE_ROW ){
725 const char *zName = db_column_text(&q,0);
726 const char *zFid = db_column_text(&q,1);
727
M src/info.c
+1
--- src/info.c
+++ src/info.c
@@ -764,10 +764,11 @@
764764
 @ <td>
765765
 @ %z(href("%R/tree?ci=%!S",zUuid))files</a>
766766
 @ | %z(href("%R/fileage?name=%!S",zUuid))file ages</a>
767767
 @ | %z(href("%R/tree?nofiles&type=tree&ci=%!S",zUuid))folders</a>
768768
 @ | %z(href("%R/artifact/%!S",zUuid))manifest</a>
769
+ @ | %z(href("%R/mlink?ci=%!S",zUuid))mlink table</a>
769770
 if( g.anon.Write ){
770771
 @ | %z(href("%R/ci_edit?r=%!S",zUuid))edit</a>
771772
 }
772773
 @ </td>
773774
 @ </tr>
774775
--- src/info.c
+++ src/info.c
@@ -764,10 +764,11 @@
764 @ <td>
765 @ %z(href("%R/tree?ci=%!S",zUuid))files</a>
766 @ | %z(href("%R/fileage?name=%!S",zUuid))file ages</a>
767 @ | %z(href("%R/tree?nofiles&type=tree&ci=%!S",zUuid))folders</a>
768 @ | %z(href("%R/artifact/%!S",zUuid))manifest</a>
 
769 if( g.anon.Write ){
770 @ | %z(href("%R/ci_edit?r=%!S",zUuid))edit</a>
771 }
772 @ </td>
773 @ </tr>
774
--- src/info.c
+++ src/info.c
@@ -764,10 +764,11 @@
764 @ <td>
765 @ %z(href("%R/tree?ci=%!S",zUuid))files</a>
766 @ | %z(href("%R/fileage?name=%!S",zUuid))file ages</a>
767 @ | %z(href("%R/tree?nofiles&type=tree&ci=%!S",zUuid))folders</a>
768 @ | %z(href("%R/artifact/%!S",zUuid))manifest</a>
769 @ | %z(href("%R/mlink?ci=%!S",zUuid))mlink table</a>
770 if( g.anon.Write ){
771 @ | %z(href("%R/ci_edit?r=%!S",zUuid))edit</a>
772 }
773 @ </td>
774 @ </tr>
775

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button