Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Correct use of plural, remove some spaces/tabs at the end of lines. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
3e18dbefd0d6d2beedf3f2dc14d78f12 |
| User & Date: | jan.nijtmans 2013-12-05 08:56:39.498 |
Context
|
2013-12-05
| ||
| 09:27 | Fix format specifier in previous commit (again) ... (check-in: 4a43e31549 user: jan.nijtmans tags: trunk) | |
| 09:19 | Merge trunk. Disable new checkbox in stead of hiding it when not in use. ... (check-in: 56836278da user: jan.nijtmans tags: hidden-tag) | |
| 08:56 | Correct use of plural, remove some spaces/tabs at the end of lines. ... (check-in: 3e18dbefd0 user: jan.nijtmans tags: trunk) | |
| 08:44 | correct format specifier, in case the branch name contains HTML-conflicting characters ... (check-in: 2eda90a5de user: jan.nijtmans tags: trunk) | |
Changes
Changes to src/info.c.
| ︙ | ︙ | |||
1315 1316 1317 1318 1319 1320 1321 |
content_get(v1, &c1);
content_get(v2, &c2);
text_diff(&c1, &c2, pOut, pRe, diffFlags);
blob_reset(&c1);
blob_reset(&c2);
return;
}
| | | 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 |
content_get(v1, &c1);
content_get(v2, &c2);
text_diff(&c1, &c2, pOut, pRe, diffFlags);
blob_reset(&c1);
blob_reset(&c2);
return;
}
sideBySide = !is_false(PD("sbs","1"));
zV1 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v1);
zV2 = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", v2);
diffFlags = construct_diff_flags(1, sideBySide) | DIFF_HTML;
style_header("Diff");
style_submenu_element("Patch", "Patch", "%s/fdiff?v1=%T&v2=%T&patch",
|
| ︙ | ︙ | |||
1665 1666 1667 1668 1669 1670 1671 |
}
@ <hr />
content_get(rid, &content);
if( renderAsWiki ){
wiki_convert(&content, 0, 0);
}else if( renderAsHtml ){
@ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
| | | | 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 |
}
@ <hr />
content_get(rid, &content);
if( renderAsWiki ){
wiki_convert(&content, 0, 0);
}else if( renderAsHtml ){
@ <iframe src="%R/raw/%T(blob_str(&downloadName))?name=%s(zUuid)"
@ width="100%%" frameborder="0" marginwidth="0" marginheight="0"
@ sandbox="allow-same-origin"
@ onload="this.height = this.contentDocument.documentElement.scrollHeight;">
@ </iframe>
}else{
style_submenu_element("Hex","Hex", "%s/hexdump?name=%s", g.zTop, zUuid);
zMime = mimetype_from_content(&content);
@ <blockquote>
if( zMime==0 ){
|
| ︙ | ︙ | |||
2335 2336 2337 2338 2339 2340 2341 |
@ Mark this leaf as "closed" so that it no longer appears on the
@ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
@ </td></tr>
}else if( zBranchName ){
@ <tr><th align="right" valign="top">Branch Closure:</th>
@ <td valign="top">
@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
| | | | | 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 |
@ Mark this leaf as "closed" so that it no longer appears on the
@ "leaves" page and is no longer labeled as a "<b>Leaf</b>"</label>
@ </td></tr>
}else if( zBranchName ){
@ <tr><th align="right" valign="top">Branch Closure:</th>
@ <td valign="top">
@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
@ Mark branch <b>%s(zBranchName)</b> as "closed" so that its leafs
@ no longer appear on the "leaves" page and are no longer labeled
@ as a leaf "<b>Leaf</b>"</label>
@ </td></tr>
}
}
if(zBranchName) fossil_free(zBranchName);
@ <tr><td colspan="2">
|
| ︙ | ︙ |