Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Change the names of config parameters for adunits to use "-" instead of "_". Allow configuration sync of adunits as part of the skin. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4bf5cdc873df8983ccee520cf170e7e2 |
| User & Date: | drh 2012-06-20 14:40:57.250 |
Context
|
2012-06-20
| ||
| 16:47 | comment-after-#ifdef patch from Alexander Orefkov. ... (check-in: c5d56e4974 user: stephan tags: trunk) | |
| 14:40 | Change the names of config parameters for adunits to use "-" instead of "_". Allow configuration sync of adunits as part of the skin. ... (check-in: 4bf5cdc873 user: drh tags: trunk) | |
| 14:14 | Allow ad units to be added after the menu bar. Optionally disable ads for logged in users and/or administrators. ... (check-in: e33fc88630 user: drh tags: trunk) | |
Changes
Changes to src/configure.c.
| ︙ | ︙ | |||
81 82 83 84 85 86 87 88 89 90 91 92 93 94 |
{ "logo-mimetype", CONFIGSET_SKIN },
{ "logo-image", CONFIGSET_SKIN },
{ "background-mimetype", CONFIGSET_SKIN },
{ "background-image", CONFIGSET_SKIN },
{ "index-page", CONFIGSET_SKIN },
{ "timeline-block-markup", CONFIGSET_SKIN },
{ "timeline-max-comment", CONFIGSET_SKIN },
#ifdef FOSSIL_ENABLE_TCL
{ "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
#endif
{ "project-name", CONFIGSET_PROJ },
{ "project-description", CONFIGSET_PROJ },
{ "manifest", CONFIGSET_PROJ },
| > > > | 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 |
{ "logo-mimetype", CONFIGSET_SKIN },
{ "logo-image", CONFIGSET_SKIN },
{ "background-mimetype", CONFIGSET_SKIN },
{ "background-image", CONFIGSET_SKIN },
{ "index-page", CONFIGSET_SKIN },
{ "timeline-block-markup", CONFIGSET_SKIN },
{ "timeline-max-comment", CONFIGSET_SKIN },
{ "adunit", CONFIGSET_SKIN },
{ "adunit-omit-if-admin", CONFIGSET_SKIN },
{ "adunit-omit-if-user", CONFIGSET_SKIN },
#ifdef FOSSIL_ENABLE_TCL
{ "tcl", CONFIGSET_SKIN|CONFIGSET_TKT|CONFIGSET_XFER },
#endif
{ "project-name", CONFIGSET_PROJ },
{ "project-description", CONFIGSET_PROJ },
{ "manifest", CONFIGSET_PROJ },
|
| ︙ | ︙ |
Changes to src/setup.c.
| ︙ | ︙ | |||
1393 1394 1395 1396 1397 1398 1399 |
@ <form action="%s(g.zTop)/setup_adunit" method="post"><div>
login_insert_csrf_secret();
@ <p>Edit HTML text for an ad unit that will be inserted after the
@ menu bar and above the content of every page.</p>
textarea_attribute("", 20, 80, "adunit", "adunit", "");
@ <br />
onoff_attribute("Omit ads to administrator",
| | | | 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 |
@ <form action="%s(g.zTop)/setup_adunit" method="post"><div>
login_insert_csrf_secret();
@ <p>Edit HTML text for an ad unit that will be inserted after the
@ menu bar and above the content of every page.</p>
textarea_attribute("", 20, 80, "adunit", "adunit", "");
@ <br />
onoff_attribute("Omit ads to administrator",
"adunit-omit-if-admin", "oia", 0);
@ <br />
onoff_attribute("Omit ads to logged-in users",
"adunit-omit-if-user", "oiu", 0);
@ <br />
@ <input type="submit" name="submit" value="Apply Changes" />
@ <input type="submit" name="clear" value="Delete Ad-Unit" />
@ </div></form>
style_footer();
db_end_transaction(0);
}
|
| ︙ | ︙ |
Changes to src/style.c.
| ︙ | ︙ | |||
205 206 207 208 209 210 211 |
}
/*
** Append ad unit text if appropriate.
*/
static void style_ad_unit(void){
const char *zAd;
| | | | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 |
}
/*
** Append ad unit text if appropriate.
*/
static void style_ad_unit(void){
const char *zAd;
if( g.perm.Admin && db_get_boolean("adunit-omit-if-admin",0) ){
return;
}
if( g.zLogin && strcmp(g.zLogin,"anonymous")!=0
&& db_get_boolean("adunit-omit-if-user",0) ){
return;
}
zAd = db_get("adunit", 0);
if( zAd ) cgi_append_content(zAd, -1);
}
/*
|
| ︙ | ︙ |