Index: trunk/phase3/skins/Vector.php |
— | — | @@ -539,33 +539,33 @@ |
540 | 540 | <?php $this->renderPortals( $this->data['sidebar'] ); ?> |
541 | 541 | </div> |
542 | 542 | <!-- /panel --> |
543 | | - <!-- foot --> |
544 | | - <div id="foot"> |
| 543 | + <!-- logo --> |
| 544 | + <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div> |
| 545 | + <!-- /logo --> |
| 546 | + <!-- footer --> |
| 547 | + <div id="footer"> |
545 | 548 | <?php foreach( $validFooterLinks as $category => $links ): ?> |
546 | 549 | <?php if ( count( $links ) > 0 ): ?> |
547 | | - <ul id="foot-<?php echo $category ?>"> |
| 550 | + <ul id="footer-<?php echo $category ?>"> |
548 | 551 | <?php foreach( $links as $link ): ?> |
549 | 552 | <?php if( isset( $this->data[$link] ) && $this->data[$link] ): ?> |
550 | | - <li id="foot-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li> |
| 553 | + <li id="footer-<?php echo $category ?>-<?php echo $link ?>"><?php $this->html( $link ) ?></li> |
551 | 554 | <?php endif; ?> |
552 | 555 | <?php endforeach; ?> |
553 | 556 | </ul> |
554 | 557 | <?php endif; ?> |
555 | 558 | <?php endforeach; ?> |
556 | | - <ul id="foot-icons" class="noprint"> |
| 559 | + <ul id="footer-icons" class="noprint"> |
557 | 560 | <?php if ( $this->data['poweredbyico'] ): ?> |
558 | | - <li id="foot-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li> |
| 561 | + <li id="footer-icon-poweredby"><?php $this->html( 'poweredbyico' ) ?></li> |
559 | 562 | <?php endif; ?> |
560 | 563 | <?php if ( $this->data['copyrightico'] ): ?> |
561 | | - <li id="foot-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li> |
| 564 | + <li id="footer-icon-copyright"><?php $this->html( 'copyrightico' ) ?></li> |
562 | 565 | <?php endif; ?> |
563 | 566 | </ul> |
564 | 567 | <div style="clear:both"></div> |
565 | 568 | </div> |
566 | | - <!-- /foot --> |
567 | | - <!-- logo --> |
568 | | - <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div> |
569 | | - <!-- /logo --> |
| 569 | + <!-- /footer --> |
570 | 570 | <!-- fixalpha --> |
571 | 571 | <script type="<?php $this->text('jsmimetype') ?>"> if ( window.isMSIE55 ) fixalpha(); </script> |
572 | 572 | <!-- /fixalpha --> |
Index: trunk/phase3/skins/vector/main-ltr.css |
— | — | @@ -379,8 +379,8 @@ |
380 | 380 | #panel div.portal div.body ul li a:visited { |
381 | 381 | color: #0b0080; |
382 | 382 | } |
383 | | -/* Foot */ |
384 | | -#foot { |
| 383 | +/* Footer */ |
| 384 | +#footer { |
385 | 385 | margin-left: 12em; |
386 | 386 | margin-top: 0; |
387 | 387 | padding: 0.75em; |
— | — | @@ -388,12 +388,14 @@ |
389 | 389 | background-position: top left; |
390 | 390 | background-repeat: repeat-x; |
391 | 391 | } |
392 | | -#foot ul { |
| 392 | +#footer ul { |
393 | 393 | list-style: none; |
| 394 | + list-style-image: none; |
| 395 | + list-style-type: none; |
394 | 396 | margin: 0; |
395 | 397 | padding: 0; |
396 | 398 | } |
397 | | -#foot ul li { |
| 399 | +#footer ul li { |
398 | 400 | margin: 0; |
399 | 401 | padding: 0; |
400 | 402 | padding-top: 0.5em; |
— | — | @@ -401,21 +403,21 @@ |
402 | 404 | color: #333333; |
403 | 405 | font-size: 0.9em; |
404 | 406 | } |
405 | | -#foot #foot-icons { |
| 407 | +#footer #footer-icons { |
406 | 408 | float: right; |
407 | 409 | } |
408 | | -#foot #foot-places { |
| 410 | +#footer #footer-places { |
409 | 411 | float: left; |
410 | 412 | } |
411 | | -#foot #foot-info li { |
| 413 | +#footer #footer-info li { |
412 | 414 | line-height: 1.4em; |
413 | 415 | } |
414 | | -#foot #foot-icons li { |
| 416 | +#footer #footer-icons li { |
415 | 417 | float: left; |
416 | 418 | margin-left: 0.5em; |
417 | 419 | line-height: 2em; |
418 | 420 | } |
419 | | -#foot #foot-places li { |
| 421 | +#footer #footer-places li { |
420 | 422 | float: left; |
421 | 423 | margin-right: 1em; |
422 | 424 | line-height: 2em; |
Index: trunk/phase3/skins/vector/main-rtl.css |
— | — | @@ -379,8 +379,8 @@ |
380 | 380 | #panel div.portal div.body ul li a:visited { |
381 | 381 | color: #0b0080; |
382 | 382 | } |
383 | | -/* Foot */ |
384 | | -#foot { |
| 383 | +/* Footer */ |
| 384 | +#footer { |
385 | 385 | margin-right: 12em; |
386 | 386 | margin-top: 0; |
387 | 387 | padding: 0.75em; |
— | — | @@ -388,12 +388,14 @@ |
389 | 389 | background-position: top right; |
390 | 390 | background-repeat: repeat-x; |
391 | 391 | } |
392 | | -#foot ul { |
| 392 | +#footer ul { |
393 | 393 | list-style: none; |
| 394 | + list-style-image: none; |
| 395 | + list-style-type: none; |
394 | 396 | margin: 0; |
395 | 397 | padding: 0; |
396 | 398 | } |
397 | | -#foot ul li { |
| 399 | +#footer ul li { |
398 | 400 | margin: 0; |
399 | 401 | padding: 0; |
400 | 402 | padding-top: 0.5em; |
— | — | @@ -401,21 +403,21 @@ |
402 | 404 | color: #333333; |
403 | 405 | font-size: 0.9em; |
404 | 406 | } |
405 | | -#foot #foot-icons { |
| 407 | +#footer #footer-icons { |
406 | 408 | float: left; |
407 | 409 | } |
408 | | -#foot #foot-places { |
| 410 | +#footer #footer-places { |
409 | 411 | float: right; |
410 | 412 | } |
411 | | -#foot #foot-info li { |
| 413 | +#footer #footer-info li { |
412 | 414 | line-height: 1.4em; |
413 | 415 | } |
414 | | -#foot #foot-icons li { |
| 416 | +#footer #footer-icons li { |
415 | 417 | float: right; |
416 | 418 | margin-right: 0.5em; |
417 | 419 | line-height: 2em; |
418 | 420 | } |
419 | | -#foot #foot-places li { |
| 421 | +#footer #footer-places li { |
420 | 422 | float: right; |
421 | 423 | margin-left: 1em; |
422 | 424 | line-height: 2em; |