Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch stv-skinning Excluding Merge-Ins
This is equivalent to a diff from 370d5be389 to 036d76815b
|
2010-09-08
| ||
| 12:36 | Documentation updates. check-in: 546d48ff45 user: drh tags: trunk | |
|
2010-09-07
| ||
| 23:57 | Create new branch named "wolfgangFormat2CSS" check-in: e2ab51b011 user: wolfgang tags: wolfgangFormat2CSS | |
| 17:29 | merged-make-corrections Closed-Leaf check-in: 036d76815b user: Ratte tags: stv-skinning | |
|
2010-09-06
| ||
| 20:31 | Solves ticket [64d9461fa4b399b15827876bcf6b8ccc95720d16] check-in: 370d5be389 user: renez tags: trunk | |
| 19:10 | hyperlinks disabled skinned check-in: 8f6e98aa3d user: Ratte tags: stv-skinning | |
|
2010-09-05
| ||
| 11:44 | Do not put hyperlinks to attachments in tickets and wiki if attachment download is prohibited. Ticket [a7eff56a933249258f0d902]. check-in: f7e2d74a85 user: drh tags: trunk | |
Changes to src/branch.c.
227 227 if( showClosed ){ 228 228 style_submenu_element("Open","Open","brlist"); 229 229 }else{ 230 230 style_submenu_element("Closed","Closed","brlist?closed"); 231 231 } 232 232 login_anonymous_available(); 233 233 compute_leaves(0, 1); 234 - style_sidebox_begin("Nomenclature:", "33%"); 234 + @ <div class="nomenclatureSidebox"> 235 + @ Nomenclature: 235 236 @ <ol> 236 237 @ <li> An <a href="brlist">open branch</a> is a branch that has one or 237 238 @ more <a href="leaves">open leaves.</a> 238 239 @ The presence of open leaves presumably means 239 240 @ that the branch is still being extended with new check-ins.</li> 240 241 @ <li> A <a href="brlist?closed">closed branch</a> is a branch with only 241 242 @ <a href="leaves?closed">closed leaves</a>. 242 243 @ Closed branches are fixed and do not change (unless they are first 243 244 @ reopened)</li> 244 245 @ </ol> 245 - style_sidebox_end(); 246 + @ </div> 246 247 247 248 cnt = 0; 248 249 if( !showClosed ){ 249 250 db_prepare(&q, 250 251 "SELECT DISTINCT value FROM tagxref" 251 252 " WHERE tagid=%d AND value NOT NULL" 252 253 " AND rid IN leaves"
Changes to src/descendants.c.
314 314 } 315 315 if( showClosed || showAll ){ 316 316 style_submenu_element("Open", "Open", "leaves"); 317 317 } 318 318 style_header("Leaves"); 319 319 login_anonymous_available(); 320 320 compute_leaves(0, showAll ? 0 : showClosed ? 2 : 1); 321 - style_sidebox_begin("Nomenclature:", "33%"); 321 + @ <div class="nomenclatureSidebox"> 322 + @ Nomenclature: 322 323 @ <ol> 323 324 @ <li> A <b>leaf</b> is a check-in with no descendants.</li> 324 325 @ <li> An <b>open leaf</b> is a leaf that does not have a "closed" tag 325 326 @ and is thus assumed to still be in use.</li> 326 327 @ <li> A <b>closed leaf</b> has a "closed" tag and is thus assumed to 327 328 @ be historical and no longer in active use.</li> 328 329 @ </ol> 329 - style_sidebox_end(); 330 + @ </div> 330 331 331 332 if( showAll ){ 332 333 @ <h1>All leaves, both open and closed:</h1> 333 334 }else if( showClosed ){ 334 335 @ <h1>Closed leaves:</h1> 335 336 }else{ 336 337 @ <h1>Open leaves:</h1>
Changes to src/login.c.
594 594 */ 595 595 void login_anonymous_available(void){ 596 596 if( !g.okHistory && 597 597 db_exists("SELECT 1 FROM user" 598 598 " WHERE login='anonymous'" 599 599 " AND cap LIKE '%%h%%'") ){ 600 600 const char *zUrl = PD("REQUEST_URI", "index"); 601 - @ <p>Many <font color="red">hyperlinks are disabled.</font><br /> 601 + @ <p>Many <span class="disabledLinks">hyperlinks are disabled.</span><br /> 602 602 @ Use <a href="%s(g.zTop)/login?anon=1&g=%T(zUrl)">anonymous login</a> 603 603 @ to enable hyperlinks.</p> 604 604 } 605 605 } 606 606 607 607 /* 608 608 ** While rendering a form, call this routine to add the Anti-CSRF token
Changes to src/setup.c.
907 907 @ <hr> 908 908 @ The default CSS is shown below for reference. Other examples 909 909 @ of CSS files can be seen on the <a href="setup_skin">skins page</a>. 910 910 @ See also the <a href="setup_header">header</a> and 911 911 @ <a href="setup_footer">footer</a> editing screens. 912 912 @ <blockquote><pre> 913 913 @ %h(zDefaultCSS) 914 + @ /* internal page layout */ 915 + @ %h(zTdTimelineTable) 916 + @ %h(zTdTimelineTimeStampCell) 917 + @ %h(zTdTimelineOmitted) 918 + @ %h(zTdTimelineComment) 919 + @ %h(zDivTimelineLeafDsp) 920 + @ %h(zDivNomenclatureSidebox) 921 + @ %h(zSpanDisabledLinks) 914 922 @ </pre></blockquote> 915 923 style_footer(); 916 924 db_end_transaction(0); 917 925 } 918 926 919 927 /* 920 928 ** WEBPAGE: setup_header
Changes to src/style.c.
335 335 @ margin-bottom: 0px; 336 336 @ margin-top: 1em; 337 337 @ padding: 1px 1px 1px 1px; 338 338 @ font-size: 1.2em; 339 339 @ font-weight: bold; 340 340 @ background-color: #558195; 341 341 @ color: white; 342 +@ white-space: nowrap; 342 343 @ } 343 344 @ 344 345 @ /* The "Date" that occurs on the left hand side of timelines */ 345 346 @ div.divider { 346 347 @ background: #a1c4d4; 347 348 @ border: 2px #558195 solid; 348 349 @ font-size: 1em; font-weight: normal; ................................................................................ 377 378 @ /* The label/value pairs on (for example) the ci page */ 378 379 @ table.label-value th { 379 380 @ vertical-align: top; 380 381 @ text-align: right; 381 382 @ padding: 0.2ex 2ex; 382 383 @ } 383 384 ; 385 +const char zTdTimelineTable[] = 386 +@ /* The time column in timeline tables */ 387 +@ table.timelineTable { 388 +@ cellspacing: 0; 389 +@ border: 0; 390 +@ cellpadding: 0; 391 +@} 392 +; 393 +const char zTdTimelineTimeStampCell[] = 394 +@ /* The time column in timeline tables */ 395 +@ td.timelineTimeStampCell { 396 +@ valign: top; 397 +@ text-align: right; 398 +@} 399 +; 400 +const char zTdTimelineOmitted[] = 401 +@ /* The omitted line in timeline tables */ 402 +@ td.timelineOmitted { 403 +@ font-size: small; 404 +@ font-style: italic; 405 +@ } 406 +; 407 +const char zTdTimelineComment[] = 408 +@ /* The comment cell in timeline tables */ 409 +@ td.timelineComment { 410 +@ valign: top; 411 +@ text-align: left; 412 +@ } 413 +; 414 +const char zDivTimelineLeafDsp[] = 415 +@ /* The leaf description in timeline tables */ 416 +@ div.timelineLeafDsp { 417 +@ font-weight: bold; 418 +@ display: inline; 419 +@ } 420 +; 421 +const char zDivNomenclatureSidebox[] = 422 +@ /* The nomenclature sidebox for branches,.. */ 423 +@ div.nomenclatureSidebox { 424 +@ float: right; 425 +@ width: 33%; 426 +@ border-width: medium; 427 +@ border-style: double; 428 +@ margin: 10; 429 +@ } 430 +; 431 +const char zSpanDisabledLinks[] = 432 +@ /* hyperlinks disabled text */ 433 +@ span.disabledLinks { 434 +@ color: red; 435 +@ } 436 +; 384 437 385 438 /* 386 439 ** WEBPAGE: style.css 387 440 */ 388 441 void page_style_css(void){ 389 442 char *zCSS = 0; 390 443 391 444 cgi_set_content_type("text/css"); 392 445 zCSS = db_get("css",(char*)zDefaultCSS); 393 446 cgi_append_content(zCSS, -1); 447 + cgi_append_content("\n", -1); 448 + /* append internal classes, if not already in style sheet */ 449 + if (!strstr(zCSS,"timelineTable")) 450 + cgi_append_content(zTdTimelineTable,-1); 451 + if (!strstr(zCSS,"timelineTimeStampCell")) 452 + cgi_append_content(zTdTimelineTimeStampCell,-1); 453 + if (!strstr(zCSS,"timelineOmitted")) 454 + cgi_append_content(zTdTimelineOmitted,-1); 455 + if (!strstr(zCSS,"timelineComment")) 456 + cgi_append_content(zTdTimelineComment,-1); 457 + if (!strstr(zCSS,"timelineLeafDsp")) 458 + cgi_append_content(zDivTimelineLeafDsp,-1); 459 + if (!strstr(zCSS,"nomenclatureSidebox")) 460 + cgi_append_content(zDivNomenclatureSidebox,-1); 461 + if (!strstr(zCSS,"disabledLinks")) 462 + cgi_append_content(zSpanDisabledLinks,-1); 394 463 g.isConst = 1; 395 464 } 396 465 397 466 /* 398 467 ** WEBPAGE: test_env 399 468 */ 400 469 void page_test_env(void){
Changes to src/timeline.c.
190 190 wikiFlags = WIKI_INLINE | WIKI_NOBLOCK; 191 191 } 192 192 if( tmFlags & TIMELINE_GRAPH ){ 193 193 pGraph = graph_init(); 194 194 @ <div id="canvas" style="position:relative;width:1px;height:1px;"></div> 195 195 } 196 196 197 - @ <table cellspacing=0 border=0 cellpadding=0> 197 + @ <table class="timelineTable"> 198 198 blob_zero(&comment); 199 199 while( db_step(pQuery)==SQLITE_ROW ){ 200 200 int rid = db_column_int(pQuery, 0); 201 201 const char *zUuid = db_column_text(pQuery, 1); 202 202 int isLeaf = db_column_int(pQuery, 5); 203 203 const char *zBgClr = db_column_text(pQuery, 6); 204 204 const char *zDate = db_column_text(pQuery, 2); ................................................................................ 216 216 }else{ 217 217 commentColumn = 10; 218 218 } 219 219 } 220 220 } 221 221 prevTagid = tagid; 222 222 if( suppressCnt ){ 223 - @ <tr><td><td><td> 224 - @ <small><i>... %d(suppressCnt) similar 225 - @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr> 223 + @ <tr><td><td><td class="timelineOmitted"> 224 + @ ... %d(suppressCnt) similar event%s(suppressCnt>1?"s":"") omitted. 225 + @ </tr> 226 226 suppressCnt = 0; 227 227 } 228 228 if( strcmp(zType,"div")==0 ){ 229 229 @ <tr><td colspan=3><hr></td></tr> 230 230 continue; 231 231 } 232 232 if( memcmp(zDate, zPrevDate, 10) ){ 233 233 sprintf(zPrevDate, "%.10s", zDate); 234 234 @ <tr><td> 235 - @ <div class="divider"><nobr>%s(zPrevDate)</nobr></div> 235 + @ <div class="divider">%s(zPrevDate)</div> 236 236 @ </td></tr> 237 237 } 238 238 memcpy(zTime, &zDate[11], 5); 239 239 zTime[5] = 0; 240 240 @ <tr> 241 - @ <td valign="top" align="right">%s(zTime)</td> 241 + @ <td class="timelineTimeStampCell">%s(zTime)</td> 242 242 @ <td width="20" align="left" valign="top"> 243 243 if( pGraph && zType[0]=='c' ){ 244 244 int nParent = 0; 245 245 int aParent[32]; 246 246 const char *zBr; 247 247 int gidx; 248 248 static Stmt qparent; ................................................................................ 266 266 zBr = "trunk"; 267 267 } 268 268 gidx = graph_add_row(pGraph, rid, nParent, aParent, zBr, zBgClr); 269 269 db_reset(&qbranch); 270 270 @ <div id="m%d(gidx)"></div> 271 271 } 272 272 if( zBgClr && zBgClr[0] ){ 273 - @ <td valign="top" align="left" bgcolor="%h(zBgClr)"> 273 + @ <td class="timelineComment" bgcolor="%h(zBgClr)"> 274 274 }else{ 275 - @ <td valign="top" align="left"> 275 + @ <td class="timelineComment"> 276 276 } 277 277 if( zType[0]=='c' ){ 278 278 hyperlink_to_uuid(zUuid); 279 279 if( isLeaf ){ 280 280 if( db_exists("SELECT 1 FROM tagxref" 281 281 " WHERE rid=%d AND tagid=%d AND tagtype>0", 282 282 rid, TAG_CLOSED) ){ 283 - @ <b>Closed-Leaf:</b> 283 + @ <div class="timelineLeafDsp">Closed-Leaf:</div> 284 284 }else{ 285 - @ <b>Leaf:</b> 285 + @ <div class="timelineLeafDsp">Leaf:</div> 286 286 } 287 287 } 288 288 }else if( (tmFlags & TIMELINE_ARTID)!=0 ){ 289 289 hyperlink_to_uuid(zUuid); 290 290 } 291 291 db_column_blob(pQuery, commentColumn, &comment); 292 292 if( mxWikiLen>0 && blob_size(&comment)>mxWikiLen ){ ................................................................................ 308 308 if( xExtra ){ 309 309 xExtra(rid); 310 310 } 311 311 @ </td></tr> 312 312 } 313 313 if( suppressCnt ){ 314 314 @ <tr><td><td><td> 315 - @ <small><i>... %d(suppressCnt) similar 316 - @ event%s(suppressCnt>1?"s":"") omitted.</i></small></tr> 315 + @ <tr><td><td><td class="timelineOmitted"> 316 + @ ... %d(suppressCnt) similar event%s(suppressCnt>1?"s":"") omitted. 317 + @ </tr> 317 318 suppressCnt = 0; 318 319 } 319 320 if( pGraph ){ 320 321 graph_finish(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0); 321 322 if( pGraph->nErr ){ 322 323 graph_free(pGraph); 323 324 pGraph = 0;