Fossil SCM
I fix the html related to the artifact description, about pairs of ul. I also disable the [view] link in the 'fdiff' ui page, because we already provide a link to the artifact in the h2 titles stating the artifacts compared.
Commit
e55105e58f0b664d63e9da949784a5597c779697
Parent
f8eff242feec06c…
1 file changed
+3
-7
+3
-7
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -800,15 +800,11 @@ | ||
| 800 | 800 | const char *zDate = db_column_text(&q, 1); |
| 801 | 801 | const char *zCom = db_column_text(&q, 2); |
| 802 | 802 | const char *zUser = db_column_text(&q, 3); |
| 803 | 803 | const char *zVers = db_column_text(&q, 4); |
| 804 | 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | - if( !prevName ) { | |
| 806 | - @ <ul> | |
| 807 | - prevName = fossil_strdup(zName); | |
| 808 | - } | |
| 809 | - else { | |
| 805 | + if( prevName ) { | |
| 810 | 806 | @ </ul> |
| 811 | 807 | } |
| 812 | 808 | @ <li>File |
| 813 | 809 | if( g.okHistory ){ |
| 814 | 810 | @ <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| @@ -1003,13 +999,13 @@ | ||
| 1003 | 999 | style_header("Diff"); |
| 1004 | 1000 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1005 | 1001 | g.zTop, P("v1"), P("v2")); |
| 1006 | 1002 | @ <h2>Differences From |
| 1007 | 1003 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1008 | - object_description(v1, 1, 0); | |
| 1004 | + object_description(v1, 0, 0); | |
| 1009 | 1005 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 1010 | - object_description(v2, 1, 0); | |
| 1006 | + object_description(v2, 0, 0); | |
| 1011 | 1007 | @ <hr /> |
| 1012 | 1008 | @ <blockquote><pre> |
| 1013 | 1009 | @ %h(blob_str(&diff)) |
| 1014 | 1010 | @ </pre></blockquote> |
| 1015 | 1011 | blob_reset(&diff); |
| 1016 | 1012 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -800,15 +800,11 @@ | |
| 800 | const char *zDate = db_column_text(&q, 1); |
| 801 | const char *zCom = db_column_text(&q, 2); |
| 802 | const char *zUser = db_column_text(&q, 3); |
| 803 | const char *zVers = db_column_text(&q, 4); |
| 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | if( !prevName ) { |
| 806 | @ <ul> |
| 807 | prevName = fossil_strdup(zName); |
| 808 | } |
| 809 | else { |
| 810 | @ </ul> |
| 811 | } |
| 812 | @ <li>File |
| 813 | if( g.okHistory ){ |
| 814 | @ <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| @@ -1003,13 +999,13 @@ | |
| 1003 | style_header("Diff"); |
| 1004 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1005 | g.zTop, P("v1"), P("v2")); |
| 1006 | @ <h2>Differences From |
| 1007 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1008 | object_description(v1, 1, 0); |
| 1009 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 1010 | object_description(v2, 1, 0); |
| 1011 | @ <hr /> |
| 1012 | @ <blockquote><pre> |
| 1013 | @ %h(blob_str(&diff)) |
| 1014 | @ </pre></blockquote> |
| 1015 | blob_reset(&diff); |
| 1016 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -800,15 +800,11 @@ | |
| 800 | const char *zDate = db_column_text(&q, 1); |
| 801 | const char *zCom = db_column_text(&q, 2); |
| 802 | const char *zUser = db_column_text(&q, 3); |
| 803 | const char *zVers = db_column_text(&q, 4); |
| 804 | if( !prevName || fossil_strcmp(zName, prevName) ) { |
| 805 | if( prevName ) { |
| 806 | @ </ul> |
| 807 | } |
| 808 | @ <li>File |
| 809 | if( g.okHistory ){ |
| 810 | @ <a href="%s(g.zTop)/finfo?name=%T(zName)">%h(zName)</a> |
| @@ -1003,13 +999,13 @@ | |
| 999 | style_header("Diff"); |
| 1000 | style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch", |
| 1001 | g.zTop, P("v1"), P("v2")); |
| 1002 | @ <h2>Differences From |
| 1003 | @ Artifact <a href="%s(g.zTop)/artifact/%S(zV1)">[%S(zV1)]</a>:</h2> |
| 1004 | object_description(v1, 0, 0); |
| 1005 | @ <h2>To Artifact <a href="%s(g.zTop)/artifact/%S(zV2)">[%S(zV2)]</a>:</h2> |
| 1006 | object_description(v2, 0, 0); |
| 1007 | @ <hr /> |
| 1008 | @ <blockquote><pre> |
| 1009 | @ %h(blob_str(&diff)) |
| 1010 | @ </pre></blockquote> |
| 1011 | blob_reset(&diff); |
| 1012 |