Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Eliminated an unnecessary allocation. Code style conformance tweaks. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | style-css-revamp |
| Files: | files | file ages | folders |
| SHA3-256: |
e2a9fe4bc87824ea2e793898c25847a2 |
| User & Date: | stephan 2020-05-17 19:49:29.744 |
Context
|
2020-05-17
| ||
| 19:55 | Removed accidental dual-emit of skin-level CSS. Copy/paste bug. ... (check-in: eddb5ac552 user: stephan tags: style-css-revamp) | |
| 19:49 | Eliminated an unnecessary allocation. Code style conformance tweaks. ... (check-in: e2a9fe4bc8 user: stephan tags: style-css-revamp) | |
| 18:56 | Cherrypick [100c67fa] for bootstrap skin fix. ... (check-in: 06c7d57d18 user: stephan tags: style-css-revamp) | |
Changes
Changes to src/style.c.
| ︙ | ︙ | |||
338 339 340 341 342 343 344 |
*/
static int submenuCompare(const void *a, const void *b){
const struct Submenu *A = (const struct Submenu*)a;
const struct Submenu *B = (const struct Submenu*)b;
return fossil_strcmp(A->zLabel, B->zLabel);
}
| | | | | > < | > > | < < | | < | 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 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 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 |
*/
static int submenuCompare(const void *a, const void *b){
const struct Submenu *A = (const struct Submenu*)a;
const struct Submenu *B = (const struct Submenu*)b;
return fossil_strcmp(A->zLabel, B->zLabel);
}
/* Use this for the $current_page variable if it is not NULL. If it
** is NULL then use g.zPath.
*/
static char *local_zCurrentPage = 0;
/*
** Set the desired $current_page to something other than g.zPath
*/
void style_set_current_page(const char *zFormat, ...){
fossil_free(local_zCurrentPage);
if( zFormat==0 ){
local_zCurrentPage = 0;
}else{
va_list ap;
va_start(ap, zFormat);
local_zCurrentPage = vmprintf(zFormat, ap);
va_end(ap);
}
}
/*
** Create a TH1 variable containing the URL for the specified config
** resource. The resulting variable name will be of the form
** $[zVarPrefix]_url.
*/
static void url_var(
const char *zVarPrefix,
const char *zConfigName,
const char *zPageName
){
char *zVarName = mprintf("%s_url", zVarPrefix);
char *zUrl = 0; /* stylesheet URL */
int hasBuiltin = 0; /* true for built-in page-specific CSS */
if(0==strcmp("css",zConfigName)){
/* Account for page-specific CSS, appending a /{{g.zPath}} to the
** url only if we have a corresponding built-in page-specific CSS
** file. Do not append it to all pages because we would
** effectively cache-bust all pages which do not have
** page-specific CSS. */
char * zBuiltin = mprintf("style.%s.css", g.zPath);
hasBuiltin = builtin_file(zBuiltin,0)!=0;
fossil_free(zBuiltin);
}
zUrl = mprintf("%R/%s%s%s?id=%x", zPageName,
hasBuiltin ? "/" : "", hasBuiltin ? g.zPath : "",
skin_id(zConfigName));
Th_Store(zVarName, zUrl);
fossil_free(zUrl);
fossil_free(zVarName);
}
/*
** Create a TH1 variable containing the URL for the specified config image.
** The resulting variable name will be of the form $[zImageName]_image_url.
|
| ︙ | ︙ |