Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add <label> markup around all checkbox form entries. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
e78c49d30add60d19e51882583436268 |
| User & Date: | drh 2012-07-25 10:58:58 |
Context
|
2012-07-25
| ||
| 11:18 | In the user edit screen, display capabilities in three columns. (check-in: 60cf260b user: drh tags: trunk) | |
| 10:58 | Add <label> markup around all checkbox form entries. (check-in: e78c49d3 user: drh tags: trunk) | |
|
2012-07-22
| ||
| 17:40 | Pulled in minor memleak fix [bee0036681]. (check-in: 11abffbb user: stephan tags: trunk) | |
Changes
Changes to src/info.c.
1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 .... 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 .... 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 |
};
int nColor = sizeof(aColor)/sizeof(aColor[0])-1;
int stdClrFound = 0;
int i;
@ <table border="0" cellpadding="0" cellspacing="1">
if( zIdPropagate ){
@ <tr><td colspan="6" align="left">
if( fPropagate ){
@ <input type="checkbox" name="%s(zIdPropagate)" checked="checked" />
}else{
@ <input type="checkbox" name="%s(zIdPropagate)" />
}
@ Propagate color to descendants</td></tr>
}
@ <tr>
for(i=0; i<nColor; i++){
const char *zClr = aColor[i].zColor;
if( zClr==0 ) zClr = aColor[i].zCName;
if( zClr[0] ){
@ <td style="background-color: %h(zClr);">
................................................................................
@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
@ <td valign="top">
render_color_chooser(fNewPropagateColor, zNewColor, "pclr", "clr", "clrcust");
@ </td></tr>
@ <tr><td align="right" valign="top"><b>Tags:</b></td>
@ <td valign="top">
@ <input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) />
@ Add the following new tag name to this check-in:
@ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)"
@ onkeyup="gebi('newtag').checked=!!this.value" />
db_prepare(&q,
"SELECT tag.tagid, tagname FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
" ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
" ELSE tagname END /*sort*/",
................................................................................
rid
);
while( db_step(&q)==SQLITE_ROW ){
int tagid = db_column_int(&q, 0);
const char *zTagName = db_column_text(&q, 1);
char zLabel[30];
sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
if( P(zLabel) ){
@ <br /><input type="checkbox" name="c%d(tagid)" checked="checked" />
}else{
@ <br /><input type="checkbox" name="c%d(tagid)" />
}
if( strncmp(zTagName, "sym-", 4)==0 ){
@ Cancel tag <b>%h(&zTagName[4])</b>
}else{
@ Cancel special tag <b>%h(zTagName)</b>
}
}
db_finalize(&q);
@ </td></tr>
@ <tr><td align="right" valign="top"><b>Branching:</b></td>
@ <td valign="top">
@ <input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) />
@ Make this check-in the start of a new branch named:
@ <input type="text" style="width:15;" name="brname" value="%h(zNewBranch)"
@ onkeyup="gebi('newbr').checked=!!this.value" />
@ </td></tr>
if( is_a_leaf(rid)
&& !db_exists("SELECT 1 FROM tagxref "
" WHERE tagid=%d AND rid=%d AND tagtype>0",
TAG_CLOSED, rid)
){
@ <tr><td align="right" valign="top"><b>Leaf Closure:</b></td>
@ <td valign="top">
@ <input type="checkbox" name="close"%s(zCloseFlag) />
@ 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>".
@ </td></tr>
}
@ <tr><td colspan="2">
@ <input type="submit" name="preview" value="Preview" />
@ <input type="submit" name="apply" value="Apply Changes" />
@ <input type="submit" name="cancel" value="Cancel" />
@ </td></tr>
@ </table>
@ </div></form>
style_footer();
}
|
| | | | > | | | | | | | | |
1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 .... 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 .... 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 |
};
int nColor = sizeof(aColor)/sizeof(aColor[0])-1;
int stdClrFound = 0;
int i;
@ <table border="0" cellpadding="0" cellspacing="1">
if( zIdPropagate ){
@ <tr><td colspan="6" align="left"><label>
if( fPropagate ){
@ <input type="checkbox" name="%s(zIdPropagate)" checked="checked" />
}else{
@ <input type="checkbox" name="%s(zIdPropagate)" />
}
@ Propagate color to descendants</label></td></tr>
}
@ <tr>
for(i=0; i<nColor; i++){
const char *zClr = aColor[i].zColor;
if( zClr==0 ) zClr = aColor[i].zCName;
if( zClr[0] ){
@ <td style="background-color: %h(zClr);">
................................................................................
@ <tr><td align="right" valign="top"><b>Background Color:</b></td>
@ <td valign="top">
render_color_chooser(fNewPropagateColor, zNewColor, "pclr", "clr", "clrcust");
@ </td></tr>
@ <tr><td align="right" valign="top"><b>Tags:</b></td>
@ <td valign="top">
@ <label><input type="checkbox" id="newtag" name="newtag"%s(zNewTagFlag) />
@ Add the following new tag name to this check-in:</label>
@ <input type="text" style="width:15;" name="tagname" value="%h(zNewTag)"
@ onkeyup="gebi('newtag').checked=!!this.value" />
db_prepare(&q,
"SELECT tag.tagid, tagname FROM tagxref, tag"
" WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid"
" ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)"
" ELSE tagname END /*sort*/",
................................................................................
rid
);
while( db_step(&q)==SQLITE_ROW ){
int tagid = db_column_int(&q, 0);
const char *zTagName = db_column_text(&q, 1);
char zLabel[30];
sqlite3_snprintf(sizeof(zLabel), zLabel, "c%d", tagid);
@ <br /><label>
if( P(zLabel) ){
@ <input type="checkbox" name="c%d(tagid)" checked="checked" />
}else{
@ <input type="checkbox" name="c%d(tagid)" />
}
if( strncmp(zTagName, "sym-", 4)==0 ){
@ Cancel tag <b>%h(&zTagName[4])</b></label>
}else{
@ Cancel special tag <b>%h(zTagName)</b></label>
}
}
db_finalize(&q);
@ </td></tr>
@ <tr><td align="right" valign="top"><b>Branching:</b></td>
@ <td valign="top">
@ <label><input id="newbr" type="checkbox" name="newbr"%s(zNewBrFlag) />
@ Make this check-in the start of a new branch named:</label>
@ <input type="text" style="width:15;" name="brname" value="%h(zNewBranch)"
@ onkeyup="gebi('newbr').checked=!!this.value" />
@ </td></tr>
if( is_a_leaf(rid)
&& !db_exists("SELECT 1 FROM tagxref "
" WHERE tagid=%d AND rid=%d AND tagtype>0",
TAG_CLOSED, rid)
){
@ <tr><td align="right" valign="top"><b>Leaf Closure:</b></td>
@ <td valign="top">
@ <label><input type="checkbox" name="close"%s(zCloseFlag) />
@ 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>
}
@ <tr><td colspan="2">
@ <input type="submit" name="preview" value="Preview" />
@ <input type="submit" name="apply" value="Apply Changes" />
@ <input type="submit" name="cancel" value="Cancel" />
@ </td></tr>
@ </table>
@ </div></form>
style_footer();
}
|
Changes to src/setup.c.
550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 |
@ <td><input type="text" name="info" size="40" value="%h(zInfo)" /></td>
@ </tr>
@ <tr>
@ <td class="usetupEditLabel">Capabilities:</td>
@ <td>
#define B(x) inherit[x]
if( g.perm.Setup ){
@ <input type="checkbox" name="as"%s(oas) />%s(B('s'))Setup<br />
}
@ <input type="checkbox" name="aa"%s(oaa) />%s(B('a'))Admin<br />
@ <input type="checkbox" name="ad"%s(oad) />%s(B('d'))Delete<br />
@ <input type="checkbox" name="ae"%s(oae) />%s(B('e'))Email<br />
@ <input type="checkbox" name="ap"%s(oap) />%s(B('p'))Password<br />
@ <input type="checkbox" name="ai"%s(oai) />%s(B('i'))Check-In<br />
@ <input type="checkbox" name="ao"%s(oao) />%s(B('o'))Check-Out<br />
@ <input type="checkbox" name="ah"%s(oah) />%s(B('h'))Hyperlinks<br />
@ <input type="checkbox" name="au"%s(oau) />%s(B('u'))Reader<br />
@ <input type="checkbox" name="av"%s(oav) />%s(B('v'))Developer<br />
@ <input type="checkbox" name="ag"%s(oag) />%s(B('g'))Clone<br />
@ <input type="checkbox" name="aj"%s(oaj) />%s(B('j'))Read Wiki<br />
@ <input type="checkbox" name="af"%s(oaf) />%s(B('f'))New Wiki<br />
@ <input type="checkbox" name="am"%s(oam) />%s(B('m'))Append Wiki<br />
@ <input type="checkbox" name="ak"%s(oak) />%s(B('k'))Write Wiki<br />
@ <input type="checkbox" name="ab"%s(oab) />%s(B('b'))Attachments<br />
@ <input type="checkbox" name="ar"%s(oar) />%s(B('r'))Read Ticket<br />
@ <input type="checkbox" name="an"%s(oan) />%s(B('n'))New Ticket<br />
@ <input type="checkbox" name="ac"%s(oac) />%s(B('c'))Append Ticket<br />
@ <input type="checkbox" name="aw"%s(oaw) />%s(B('w'))Write Ticket<br />
@ <input type="checkbox" name="at"%s(oat) />%s(B('t'))Ticket Report<br />
@ <input type="checkbox" name="ax"%s(oax) />%s(B('x'))Private<br />
@ <input type="checkbox" name="az"%s(oaz) />%s(B('z'))Download Zip
@ </td>
@ </tr>
@ <tr>
@ <td align="right">Password:</td>
if( zPw[0] ){
/* Obscure the password for all users */
@ <td><input type="password" name="pw" value="**********" /></td>
|
| > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > | > |
550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 |
@ <td><input type="text" name="info" size="40" value="%h(zInfo)" /></td>
@ </tr>
@ <tr>
@ <td class="usetupEditLabel">Capabilities:</td>
@ <td>
#define B(x) inherit[x]
if( g.perm.Setup ){
@ <label><input type="checkbox" name="as"%s(oas) />%s(B('s'))Setup
@ </label><br />
}
@ <label><input type="checkbox" name="aa"%s(oaa) />%s(B('a'))Admin
@ </label><br />
@ <label><input type="checkbox" name="ad"%s(oad) />%s(B('d'))Delete
@ </label><br />
@ <label><input type="checkbox" name="ae"%s(oae) />%s(B('e'))Email
@ </label><br />
@ <label><input type="checkbox" name="ap"%s(oap) />%s(B('p'))Password
@ </label><br />
@ <label><input type="checkbox" name="ai"%s(oai) />%s(B('i'))Check-In
@ </label><br />
@ <label><input type="checkbox" name="ao"%s(oao) />%s(B('o'))Check-Out
@ </label><br />
@ <label><input type="checkbox" name="ah"%s(oah) />%s(B('h'))Hyperlinks
@ </label><br />
@ <label><input type="checkbox" name="au"%s(oau) />%s(B('u'))Reader
@ </label><br />
@ <label><input type="checkbox" name="av"%s(oav) />%s(B('v'))Developer
@ </label><br />
@ <label><input type="checkbox" name="ag"%s(oag) />%s(B('g'))Clone
@ </label><br />
@ <label><input type="checkbox" name="aj"%s(oaj) />%s(B('j'))Read Wiki
@ </label><br />
@ <label><input type="checkbox" name="af"%s(oaf) />%s(B('f'))New Wiki
@ </label><br />
@ <label><input type="checkbox" name="am"%s(oam) />%s(B('m'))Append Wiki
@ </label><br />
@ <label><input type="checkbox" name="ak"%s(oak) />%s(B('k'))Write Wiki
@ </label><br />
@ <label><input type="checkbox" name="ab"%s(oab) />%s(B('b'))Attachments
@ </label><br />
@ <label><input type="checkbox" name="ar"%s(oar) />%s(B('r'))Read Ticket
@ </label><br />
@ <label><input type="checkbox" name="an"%s(oan) />%s(B('n'))New Ticket
@ </label><br />
@ <label><input type="checkbox" name="ac"%s(oac) />%s(B('c'))Append Ticket
@ </label><br />
@ <label><input type="checkbox" name="aw"%s(oaw) />%s(B('w'))Write Ticket
@ </label><br />
@ <label><input type="checkbox" name="at"%s(oat) />%s(B('t'))Ticket Report
@ </label><br />
@ <label><input type="checkbox" name="ax"%s(oax) />%s(B('x'))Private
@ </label><br />
@ <label><input type="checkbox" name="az"%s(oaz) />%s(B('z'))Download Zip
@ </label>
@ </td>
@ </tr>
@ <tr>
@ <td align="right">Password:</td>
if( zPw[0] ){
/* Obscure the password for all users */
@ <td><input type="password" name="pw" value="**********" /></td>
|
Changes to src/user.c.
463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 |
style_submenu_element("All", "All entries",
"%s/access_log?n=10000000", g.zTop);
}
@ </table></center>
db_finalize(&q);
@ <hr>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <input type="checkbox" name="delold">
@ Delete all but the most recent 200 entries</input>
@ <input type="submit" name="deloldbtn" value="Delete"></input>
@ </form>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <input type="checkbox" name="delanon">
@ Delete all entries for user "anonymous"</input>
@ <input type="submit" name="delanonbtn" value="Delete"></input>
@ </form>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <input type="checkbox" name="delfail">
@ Delete all failed login attempts</input>
@ <input type="submit" name="delfailbtn" value="Delete"></input>
@ </form>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <input type="checkbox" name="delall">
@ Delete all entries</input>
@ <input type="submit" name="delallbtn" value="Delete"></input>
@ </form>
style_footer();
}
|
| | | | | | | | |
463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 |
style_submenu_element("All", "All entries",
"%s/access_log?n=10000000", g.zTop);
}
@ </table></center>
db_finalize(&q);
@ <hr>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <label><input type="checkbox" name="delold">
@ Delete all but the most recent 200 entries</input></label>
@ <input type="submit" name="deloldbtn" value="Delete"></input>
@ </form>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <label><input type="checkbox" name="delanon">
@ Delete all entries for user "anonymous"</input></label>
@ <input type="submit" name="delanonbtn" value="Delete"></input>
@ </form>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <label><input type="checkbox" name="delfail">
@ Delete all failed login attempts</input></label>
@ <input type="submit" name="delfailbtn" value="Delete"></input>
@ </form>
@ <form method="post" action="%s(g.zTop)/access_log">
@ <label><input type="checkbox" name="delall">
@ Delete all entries</input></label>
@ <input type="submit" name="delallbtn" value="Delete"></input>
@ </form>
style_footer();
}
|