Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Render the header of every page using subscript. Add a setup page that for editing that subscript. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
555911dff52103c7831b172659b1963e |
| User & Date: | drh 2007-11-21 03:01:40.000 |
Context
|
2007-11-21
| ||
| 03:17 | Get the name of the Login/Logout menu option right. ... (check-in: bd667b1940 user: drh tags: trunk) | |
| 03:01 | Render the header of every page using subscript. Add a setup page that for editing that subscript. ... (check-in: 555911dff5 user: drh tags: trunk) | |
|
2007-11-20
| ||
| 23:54 | Add the SbS_Render() interface for rendering HTML with embedded subscript. ... (check-in: e29abeff80 user: drh tags: trunk) | |
Changes
Changes to src/cgi.c.
| ︙ | ︙ | |||
357 358 359 360 361 362 363 364 365 366 367 368 369 370 |
** is its fully decoded value.
**
** Copies are made of both the zName and zValue parameters.
*/
void cgi_set_parameter(const char *zName, const char *zValue){
cgi_set_parameter_nocopy(mprintf("%s",zName), mprintf("%s",zValue));
}
/*
** Add a query parameter. The zName portion is fixed but a copy
** must be made of zValue.
*/
void cgi_setenv(const char *zName, const char *zValue){
cgi_set_parameter_nocopy(zName, mprintf("%s",zValue));
| > > > > > > > > > > > > | 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 |
** is its fully decoded value.
**
** Copies are made of both the zName and zValue parameters.
*/
void cgi_set_parameter(const char *zName, const char *zValue){
cgi_set_parameter_nocopy(mprintf("%s",zName), mprintf("%s",zValue));
}
/*
** Replace a parameter with a new value.
*/
void cgi_replace_parameter(const char *zName, const char *zValue){
int i;
for(i=0; i<nUsedQP; i++){
if( strcmp(aParamQP[i].zName,zName)==0 ){
aParamQP[i].zValue = zValue;
}
}
}
/*
** Add a query parameter. The zName portion is fixed but a copy
** must be made of zValue.
*/
void cgi_setenv(const char *zName, const char *zValue){
cgi_set_parameter_nocopy(zName, mprintf("%s",zValue));
|
| ︙ | ︙ |
Changes to src/setup.c.
| ︙ | ︙ | |||
65 66 67 68 69 70 71 |
"Grant privileges to individual users.");
setup_menu_entry("Access", "setup_access",
"Control access settings.");
setup_menu_entry("Configuration", "setup_config",
"Configure the WWW components of the repository");
setup_menu_entry("Tickets", "tktsetup",
"Configure the trouble-ticketing system for this repository");
| | > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 |
"Grant privileges to individual users.");
setup_menu_entry("Access", "setup_access",
"Control access settings.");
setup_menu_entry("Configuration", "setup_config",
"Configure the WWW components of the repository");
setup_menu_entry("Tickets", "tktsetup",
"Configure the trouble-ticketing system for this repository");
setup_menu_entry("CSS", "setup_editcss",
"Edit the Cascading Style Sheet used by all pages of this repository");
setup_menu_entry("Header", "setup_header",
"Edit HTML text inserted at the top of every page");
@ </dl>
style_footer();
}
/*
** WEBPAGE: setup_ulist
|
| ︙ | ︙ | |||
477 478 479 480 481 482 483 | ** Generate a text box for an attribute. */ static void textarea_attribute( const char *zLabel, /* The text label on the textarea */ int rows, /* Rows in the textarea */ int cols, /* Columns in the textarea */ const char *zVar, /* The corresponding row in the VAR table */ | | | | | | > | | > | 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 |
** Generate a text box for an attribute.
*/
static void textarea_attribute(
const char *zLabel, /* The text label on the textarea */
int rows, /* Rows in the textarea */
int cols, /* Columns in the textarea */
const char *zVar, /* The corresponding row in the VAR table */
const char *zQP, /* The query parameter */
char *zDflt /* Default value if VAR table entry does not exist */
){
const char *z = db_get(zVar, zDflt);
const char *zQ = P(zQP);
if( zQ && strcmp(zQ,z)!=0 ){
db_set(zVar, zQ, 0);
z = zQ;
}
if( rows>0 && cols>0 ){
@ <textarea name="%s(zQP)" rows="%d(rows)" cols="%d(cols)">%h(z)</textarea>
@ %s(zLabel)
}
}
/*
** WEBPAGE: setup_access
*/
void setup_access(void){
|
| ︙ | ︙ | |||
548 549 550 551 552 553 554 |
db_begin_transaction();
@ <form action="%s(g.zBaseURL)/setup_config" method="POST">
@ <hr />
entry_attribute("Project Name", 60, "project-name", "pn", "");
@ <p>Give your project a name so visitors know what this site is about.
@ The project name will also be used as the RSS feed title.</p>
@ <hr />
| | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 611 612 613 614 615 616 617 618 619 620 621 622 623 624 |
db_begin_transaction();
@ <form action="%s(g.zBaseURL)/setup_config" method="POST">
@ <hr />
entry_attribute("Project Name", 60, "project-name", "pn", "");
@ <p>Give your project a name so visitors know what this site is about.
@ The project name will also be used as the RSS feed title.</p>
@ <hr />
textarea_attribute("Project Description", 5, 60,
"project-description", "pd", "");
@ <p>Describe your project. This will be used in page headers for search
@ engines as well as a short RSS description.</p>
@ <hr />
@ <p><input type="submit" name="submit" value="Apply Changes"></p>
@ </form>
db_end_transaction(0);
style_footer();
}
/*
** WEBPAGE: setup_editcss
*/
void setup_editcss(void){
login_check_credentials();
if( !g.okSetup ){
login_needed();
}
style_header("Edit CSS");
@ <form action="%s(g.zBaseURL)/setup_editcss" method="POST">
@ Edit the CSS:<br />
textarea_attribute("", 40, 80, "css", "css", zDefaultCSS);
@ <br />
@ <input type="submit" name="submit" value="Apply Changes">
@ </form>
@ <hr>
@ Here is the default CSS:
@ <blockquote><pre>
@ %h(zDefaultCSS)
@ </pre></blockquote>
style_footer();
}
/*
** WEBPAGE: setup_header
*/
void setup_header(void){
login_check_credentials();
if( !g.okSetup ){
login_needed();
}
db_begin_transaction();
if( P("clear")!=0 ){
db_multi_exec("DELETE FROM config WHERE name='header'");
cgi_replace_parameter("header", zDefaultHeader);
}else{
textarea_attribute(0, 0, 0, "header", "header", zDefaultHeader);
}
style_header("Edit Page Header");
@ <form action="%s(g.zBaseURL)/setup_header" method="POST">
@ <p>Edit HTML text with embedded subscript that will be used to
@ generate the beginning of every page through start of the main
@ menu.</p>
textarea_attribute("", 40, 80, "header", "header", zDefaultHeader);
@ <br />
@ <input type="submit" name="submit" value="Apply Changes">
@ <input type="submit" name="clear" value="Revert To Default">
@ </form>
@ <hr>
@ Here is the default page header:
@ <blockquote><pre>
@ %h(zDefaultHeader)
@ </pre></blockquote>
db_end_transaction(0);
}
|
Changes to src/style.c.
| ︙ | ︙ | |||
67 68 69 70 71 72 73 |
}
/*
** Draw the header.
*/
void style_header(const char *zTitle){
const char *zLogInOut = "Logout";
| | > < < < < < < < | > | < | < > | < < < | > > | > | | | | | | | | < < < > > > > > > > > > > > > > > > > > > > > > > > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 |
}
/*
** Draw the header.
*/
void style_header(const char *zTitle){
const char *zLogInOut = "Logout";
const char *zHeader = db_get("header", zDefaultHeader);
struct Subscript *p;
login_check_credentials();
/* Generate the header up through the main menu */
p = SbS_Create();
SbS_Store(p, "title", zTitle, 0);
SbS_Store(p, "baseurl", g.zBaseURL, 0);
if( g.zLogin ){
SbS_Store(p, "login", g.zLogin, 0);
}
SbS_Render(p, zHeader);
SbS_Destroy(p);
/* Generate the main menu and the submenu (if any) */
@ <div id="main-menu">
@ <a href="%s(g.zBaseURL)/home">Home</a>
if( g.okRead ){
@ <a href="%s(g.zBaseURL)/leaves">Leaves</a>
@ <a href="%s(g.zBaseURL)/timeline">Timeline</a>
}
if( g.okRdWiki ){
@ <a href="%s(g.zBaseURL)/wiki">Wiki</a>
}
#if 0
@ <font color="#888888">Search</font>
@ <font color="#888888">Ticket</font>
@ <font color="#888888">Reports</font>
#endif
if( g.okSetup ){
@ <a href="%s(g.zBaseURL)/setup">Setup</a>
}
if( !g.noPswd ){
@ <a href="%s(g.zBaseURL)/login">%s(zLogInOut)</a>
}
@ </div>
if( nSubmenu>0 ){
int i;
@ <div id="sub-menu">
qsort(aSubmenu, nSubmenu, sizeof(aSubmenu[0]), submenuCompare);
for(i=0; i<nSubmenu; i++){
struct Submenu *p = &aSubmenu[i];
if( p->zLink==0 ){
@ <span class="label">%h(p->zLabel)</span>
}else{
@ <a class="label" href="%s(p->zLink)">%h(p->zLabel)</a>
}
}
@ </div>
}
@ <div id="page">
g.cgiPanic = 1;
}
/*
** Draw the footer at the bottom of the page.
*/
void style_footer(void){
/* end the <div id="page"> from style_header() */
@ </div>
@ <div id="style-footer">
@ Fossil version %s(MANIFEST_VERSION) %s(MANIFEST_DATE)
@ </div>
}
/*
** The default page header.
*/
const char zDefaultHeader[] =
@ <html>
@ <head>
@ <title>Edit CSS</title>
@ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
@ href="[baseurl puts]/timeline.rss">
@ <link rel="stylesheet" href="[baseurl puts]/style.css" type="text/css"
@ media="screen">
@ </head>
@ <body>
@ <div id="page-title">[title html]</div>
@ <div id="login-status">
@ [/login exists enable_output]
@ logged in as [0 /login get html]
@ [/login exists not enable_output]
@ not logged in
@ [1 enable_output]
@ </div>
;
/*
** The default Cascading Style Sheet.
**
** Selector order: tags, ids, classes, other
** Content order: margin, borders, padding, fonts, colors, other
** Note: Once things are finialize a bit we can collapse this and
|
| ︙ | ︙ |
Changes to src/subscript.c.
| ︙ | ︙ | |||
373 374 375 376 377 378 379 380 381 382 383 384 385 386 |
){
SbSValue v;
v.flags = SBSVAL_VERB;
v.u.verb.xVerb = xVerb;
v.u.verb.pArg = pArg;
return sbs_store(&p->symTab, zVerb, -1, &v);
}
/*
** Push a string value onto the stack.
**
** If the 4th parameter is 0, then the string is static.
** If the 4th parameter is non-zero then the string was obtained
** from malloc and Subscript will take responsibility for freeing
| > > > > > > > > > > > > > > > > > > > > > | 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 |
){
SbSValue v;
v.flags = SBSVAL_VERB;
v.u.verb.xVerb = xVerb;
v.u.verb.pArg = pArg;
return sbs_store(&p->symTab, zVerb, -1, &v);
}
/*
** Store a value in an interpreter variable.
*/
int SbS_Store(
struct Subscript *p, /* Store into this interpreter */
const char *zName, /* Name of the variable */
const char *zValue, /* Value of the variable */
int makeCopy /* If true, interpreter makes its own copy */
){
SbSValue v;
v.flags = SBSVAL_STR;
v.u.str.size = strlen(zValue);
if( makeCopy ){
v.u.str.z = mprintf("%s", zValue);
v.flags |= SBSVAL_DYN;
}else{
v.u.str.z = zValue;
}
return sbs_store(&p->symTab, zName, -1, &v);
}
/*
** Push a string value onto the stack.
**
** If the 4th parameter is 0, then the string is static.
** If the 4th parameter is non-zero then the string was obtained
** from malloc and Subscript will take responsibility for freeing
|
| ︙ | ︙ | |||
776 777 778 779 780 781 782 |
int ttype;
n = sbs_next_token(zScript, nScript, &ttype);
#if 0
{
int i, nElem;
const char *zElem;
| < > | 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 |
int ttype;
n = sbs_next_token(zScript, nScript, &ttype);
#if 0
{
int i, nElem;
const char *zElem;
if( p->nStack>0 ){
printf("STACK:");
for(i=0; i<p->nStack; i++){
zElem = SbS_StackValue(p, i, &nElem);
printf(" [%.*s]", nElem, zElem);
}
printf("\n");
}
printf("TOKEN(%d): [%.*s]\n", ttype, n, zScript);
}
#endif
switch( ttype ){
case SBSTT_WHITESPACE: {
break;
}
|
| ︙ | ︙ | |||
862 863 864 865 866 867 868 |
** stdout or into CGI.
*/
int SbS_Render(struct Subscript *p, const char *z){
int i = 0;
int rc = SBS_OK;
while( z[i] ){
if( z[i]=='[' ){
| > | | | | > | | 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 |
** stdout or into CGI.
*/
int SbS_Render(struct Subscript *p, const char *z){
int i = 0;
int rc = SBS_OK;
while( z[i] ){
if( z[i]=='[' ){
if( enableOutput ){
if( g.cgiPanic ){
cgi_append_content(z, i);
}else{
fwrite(z, 1, i, stdout);
}
}
z += i+1;
for(i=0; z[i] && z[i]!=']'; i++){}
rc = SbS_Eval(p, z, i);
if( rc!=SBS_OK ) break;
if( z[i] ) i++;
z += i;
i = 0;
}else{
i++;
}
}
if( i>0 && enableOutput ){
if( g.cgiPanic ){
cgi_append_content(z, i);
}else{
fwrite(z, 1, i, stdout);
}
}
return rc;
|
| ︙ | ︙ |