Index: themes/pushbutton/block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/pushbutton/block.tpl.php,v retrieving revision 1.2 diff -u -r1.2 block.tpl.php --- themes/pushbutton/block.tpl.php 7 Aug 2007 08:39:36 -0000 1.2 +++ themes/pushbutton/block.tpl.php 11 Jan 2008 08:22:37 -0000 @@ -1,7 +1,9 @@ -
module" ?>" id="module-$block->delta"; ?>"> -

subject ?>

+
module" ?>" id="block-module .'-'. $block->delta; ?>"> + subject)): ?> +

subject ?>

+
content ?>
-
\ No newline at end of file +
Index: themes/pushbutton/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/pushbutton/page.tpl.php,v retrieving revision 1.24 diff -u -r1.24 page.tpl.php --- themes/pushbutton/page.tpl.php 7 Jan 2008 13:49:38 -0000 1.24 +++ themes/pushbutton/page.tpl.php 11 Jan 2008 08:22:38 -0000 @@ -2,119 +2,100 @@ // $Id: page.tpl.php,v 1.24 2008/01/07 13:49:38 goba Exp $ ?> - - <?php print $head_title ?> - - - - - - - - -
.
- - - - - - - - -
- - <?php print t('Home') ?> - - - -
- - -
- - 		- 'links', 'id' => 'navlist')) ?> -
- - - - - - - - - -
- 'links', 'id' => 'subnavlist')) ?> - - -
- - - - - - - - - -
- -
- - -
- - -

- - -
+ + <?php print $head_title ?> + + + + + + + + +
.
+ + + + + + + + +
+ + <?php print t('Home') ?> - + + +
+ + +
+ + 		+ 'links', 'id' => 'navlist')) ?> +
+ + + + + + + + + +
+ 'links', 'id' => 'subnavlist')) ?> + + +
+ + + + '. $left .''; endif; ?> + + + '. $right .''; endif; ?> + +
+ '. $mission .''; endif; ?> + +
+ + + '. $title .'' ?> + '. $tabs .'
'; endif; ?> + + + + '. $help .''; endif; ?> + + + + + + + +
+ + + + - - - - - - - - - + + + + + - - 'links secondary-links')) ?> - -
- - - - - - + + Index: themes/pushbutton/box.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/pushbutton/box.tpl.php,v retrieving revision 1.3 diff -u -r1.3 box.tpl.php --- themes/pushbutton/box.tpl.php 7 Aug 2007 08:39:36 -0000 1.3 +++ themes/pushbutton/box.tpl.php 11 Jan 2008 08:22:37 -0000 @@ -2,8 +2,8 @@ // $Id: box.tpl.php,v 1.3 2007/08/07 08:39:36 goba Exp $ ?>
- -

- -
+ '. $title .''; endif; ?> +
+ +
\ No newline at end of file Index: themes/pushbutton/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/pushbutton/node.tpl.php,v retrieving revision 1.4 diff -u -r1.4 node.tpl.php --- themes/pushbutton/node.tpl.php 7 Aug 2007 08:39:36 -0000 1.4 +++ themes/pushbutton/node.tpl.php 11 Jan 2008 08:22:38 -0000 @@ -1,15 +1,30 @@ -
"> +
+ -

+

+ + + + + + +
+ +
+ + +
+
+
+ + + +
+ » +
- -
-
- -
»
-
Index: themes/pushbutton/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/pushbutton/style.css,v retrieving revision 1.24 diff -u -r1.24 style.css --- themes/pushbutton/style.css 22 Dec 2007 23:24:26 -0000 1.24 +++ themes/pushbutton/style.css 11 Jan 2008 08:22:39 -0000 @@ -81,18 +81,18 @@ border-bottom: 3px solid #69c; } #primary-menu tr { - background: transparent url(header-a.jpg) left bottom repeat; /* LTR */ + background: transparent url(images/header-a.jpg) left bottom repeat; /* LTR */ } td#home { - background: transparent url(logo-background.jpg) left top repeat; /* LTR */ + background: transparent url(images/logo-background.jpg) left top repeat; /* LTR */ } td#home a:link img, td#home a:visited img { - background: transparent url(logo-active.jpg) repeat; /* LTR */ + background: transparent url(images/logo-active.jpg) repeat; /* LTR */ width: 144px; height: 63px; } td#home a:hover img { - background: transparent url(logo-hover.jpg) repeat; /* LTR */ + background: transparent url(images/logo-hover.jpg) repeat; /* LTR */ width: 144px; height: 63px; } @@ -103,7 +103,7 @@ color: #000; } #primary-menu .primary-links { - background: transparent url(header-b.jpg) left top no-repeat; /* LTR */ + background: transparent url(images/header-b.jpg) left top no-repeat; /* LTR */ font-size: 0.79em; } #primary-menu .primary-links h1, #primary-menu .primary-links h2, #primary-menu .primary-links h3 { @@ -155,7 +155,7 @@ } .tabs ul.primary li a { padding: 3px 10px; - background: #fff url(tabs-off.png) left top no-repeat; /* LTR */ + background: #fff url(images/tabs-off.png) left top no-repeat; /* LTR */ border-color: #69C; border-width: 2px; border-style: none solid none none; /* LTR */ @@ -165,7 +165,7 @@ text-transform: lowercase; } .tabs ul.primary li.active a { - background: #369 url(tabs-on.png) left top no-repeat; /* LTR */ + background: #369 url(images/tabs-on.png) left top no-repeat; /* LTR */ border-right: 2px solid #369; /* LTR */ color: #fff; } @@ -192,17 +192,17 @@ border-right: none; /* LTR */ } .tabs ul.secondary li a { - background: #fff url(tabs-option-off.png) left center no-repeat; /* LTR */ + background: #fff url(images/tabs-option-off.png) left center no-repeat; /* LTR */ padding: 10px 0 10px 25px; /* LTR */ margin: 0; } .tabs ul.secondary li a.active { - background: #fff url(tabs-option-on.png) left center no-repeat; /* LTR */ + background: #fff url(images/tabs-option-on.png) left center no-repeat; /* LTR */ color: #369; border-bottom: none; } .tabs ul.secondary li a:hover { - background: #fff url(tabs-option-hover.png) left center no-repeat; /* LTR */ + background: #fff url(images/tabs-option-hover.png) left center no-repeat; /* LTR */ color: #FF4500; } #content { @@ -240,7 +240,7 @@ } #site-info { background-color: #bdd3ea; - background-image: url(header-c.png); + background-image: url(images/header-c.png); font-family: "Trebuchet MS", Geneva, Arial, Helvetica, SunSans-Regular, Verdana, sans-serif; } .site-name { @@ -260,7 +260,7 @@ #main { /* padding in px not ex because IE messes up 100% width tables otherwise */ padding: 30px 35px 50px 35px; - background: transparent url(background.png) center center no-repeat; + background: transparent url(images/background.png) center center no-repeat; /* fix background overlapping text in IE (aka Peekaboo Bug) */ position: relative; } @@ -397,7 +397,7 @@ font-weight: bold; padding: 10px 5px 10px 30px; /* LTR */ margin-bottom: .25em; - background: transparent url(icon-block.png) left center no-repeat; /* LTR */ + background: transparent url(images/icon-block.png) left center no-repeat; /* LTR */ } .block .content { padding: 5px; @@ -432,7 +432,7 @@ .comment .title { font-size: 1em; padding: 10px 0 12px 19px; /* LTR */ - background: transparent url(icon-comment.png) left center no-repeat; /* LTR */ + background: transparent url(images/icon-comment.png) left center no-repeat; /* LTR */ } .comment .new { font-weight: bold; @@ -461,39 +461,39 @@ } .nav .links .next a:link { padding: 17px 17px 17px 0; /* LTR */ - background: transparent url(arrow-next.png) right center no-repeat; /* LTR */ + background: transparent url(images/arrow-next.png) right center no-repeat; /* LTR */ } .nav .links .next a:visited { padding: 17px 17px 17px 0; /* LTR */ - background: transparent url(arrow-next-visited.png) right center no-repeat; /* LTR */ + background: transparent url(images/arrow-next-visited.png) right center no-repeat; /* LTR */ } .nav .links .next a:hover { padding: 17px 17px 17px 0; /* LTR */ - background: transparent url(arrow-next-hover.png) right center no-repeat; /* LTR */ + background: transparent url(images/arrow-next-hover.png) right center no-repeat; /* LTR */ } .nav .links .prev a:link { padding: 17px 0 17px 17px; /* LTR */ - background: transparent url(arrow-prev.png) left center no-repeat; /* LTR */ + background: transparent url(images/arrow-prev.png) left center no-repeat; /* LTR */ } .nav .links .prev a:visited { padding: 17px 0 17px 17px; /* LTR */ - background: transparent url(arrow-prev-visited.png) left center no-repeat; /* LTR */ + background: transparent url(images/arrow-prev-visited.png) left center no-repeat; /* LTR */ } .nav .links .prev a:hover { padding: 17px 0 17px 17px; /* LTR */ - background: transparent url(arrow-prev-hover.png) left center no-repeat; /* LTR */ + background: transparent url(images/arrow-prev-hover.png) left center no-repeat; /* LTR */ } .nav .links .up a:link { padding: 11px 0 17px 0; - background: transparent url(arrow-up.png) center top no-repeat; + background: transparent url(images/arrow-up.png) center top no-repeat; } .nav .links .up a:visited { padding: 11px 0 17px 0; - background: transparent url(arrow-up-visited.png) center top no-repeat; + background: transparent url(images/arrow-up-visited.png) center top no-repeat; } .nav .links .up a:hover { padding: 11px 0 17px 0; - background: transparent url(arrow-up-hover.png) center top no-repeat; + background: transparent url(images/arrow-up-hover.png) center top no-repeat; } /* @@ -586,13 +586,13 @@ } #forum td.container { color: #000; - background: #369 url(forum-container.jpg) right top no-repeat; /* LTR */ + background: #369 url(images/forum-container.jpg) right top no-repeat; /* LTR */ border: 2px solid #69c; } #forum td.container a { color: #e4e9eb; padding: 20px 0 20px 35px; /* LTR */ - background: transparent url(forum-link.png) left center no-repeat; /* LTR */ + background: transparent url(images/forum-link.png) left center no-repeat; /* LTR */ } #forum td.container a:visited { color: #e4e9eb; Index: themes/pushbutton/style-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/pushbutton/style-rtl.css,v retrieving revision 1.3 diff -u -r1.3 style-rtl.css --- themes/pushbutton/style-rtl.css 22 Dec 2007 23:24:26 -0000 1.3 +++ themes/pushbutton/style-rtl.css 11 Jan 2008 08:22:38 -0000 @@ -12,23 +12,23 @@ } #primary-menu tr { - background: transparent url(header-a.jpg) right bottom repeat; + background: transparent url(images/header-a.jpg) right bottom repeat; } td#home { - background: transparent url(logo-background-rtl.jpg) right top repeat; + background: transparent url(images/logo-background-rtl.jpg) right top repeat; } td#home a:link img, td#home a:visited img { - background: transparent url(logo-active-rtl.jpg) repeat; + background: transparent url(images/logo-active-rtl.jpg) repeat; } td#home a:hover img { - background: transparent url(logo-hover-rtl.jpg) repeat; + background: transparent url(images/logo-hover-rtl.jpg) repeat; } #primary-menu .primary-links { - background: transparent url(header-b-rtl.jpg) right top no-repeat; + background: transparent url(images/header-b-rtl.jpg) right top no-repeat; } ul.links li { @@ -57,13 +57,13 @@ /* @end FF hacks */ .tabs ul.primary li a { - background: #fff url(tabs-off-rtl.png) right top no-repeat; + background: #fff url(images/tabs-off-rtl.png) right top no-repeat; border-style: none none none solid; margin-left: 10px; margin-right: 0; } .tabs ul.primary li.active a { - background: #369 url(tabs-on-rtl.png) right top no-repeat; + background: #369 url(images/tabs-on-rtl.png) right top no-repeat; border-right: none; border-left: 2px solid #369; } @@ -84,16 +84,16 @@ } .tabs ul.secondary li a { - background: #fff url(tabs-option-off-rtl.png) right center no-repeat; + background: #fff url(images/tabs-option-off-rtl.png) right center no-repeat; padding: 10px 25px 10px 0; } .tabs ul.secondary li a.active { - background: #fff url(tabs-option-on.png) right center no-repeat; + background: #fff url(images/tabs-option-on.png) right center no-repeat; } .tabs ul.secondary li a:hover { - background: #fff url(tabs-option-hover-rtl.png) right center no-repeat; + background: #fff url(images/tabs-option-hover-rtl.png) right center no-repeat; } #menu { @@ -110,7 +110,7 @@ .block .title h3 { padding: 10px 30px 10px 5px; - background: transparent url(icon-block-rtl.png) right center no-repeat; + background: transparent url(images/icon-block-rtl.png) right center no-repeat; } .node .picture { @@ -119,7 +119,7 @@ .comment .title { padding: 10px 19px 12px 0; - background: transparent url(icon-comment-rtl.png) right center no-repeat; + background: transparent url(images/icon-comment-rtl.png) right center no-repeat; } .comment .new { @@ -133,27 +133,27 @@ .nav .links .next a:link { padding: 17px 0 17px 17px; - background: transparent url(arrow-next-rtl.png) left center no-repeat; + background: transparent url(images/arrow-next-rtl.png) left center no-repeat; } .nav .links .next a:visited { padding: 17px 0 17px 17px; - background: transparent url(arrow-next-visited-rtl.png) left center no-repeat; + background: transparent url(images/arrow-next-visited-rtl.png) left center no-repeat; } .nav .links .next a:hover { padding: 17px 0 17px 17px; - background: transparent url(arrow-next-hover-rtl.png) left center no-repeat; + background: transparent url(images/arrow-next-hover-rtl.png) left center no-repeat; } .nav .links .prev a:link { padding: 17px 17px 17px 0; - background: transparent url(arrow-prev-rtl.png) right center no-repeat; + background: transparent url(images/arrow-prev-rtl.png) right center no-repeat; } .nav .links .prev a:visited { padding: 17px 17px 17px 0; - background: transparent url(arrow-prev-visited-rtl.png) right center no-repeat; + background: transparent url(images/arrow-prev-visited-rtl.png) right center no-repeat; } .nav .links .prev a:hover { padding: 17px 17px 17px 0; - background: transparent url(arrow-prev-hover-rtl.png) right center no-repeat; + background: transparent url(images/arrow-prev-hover-rtl.png) right center no-repeat; } #tracker th { @@ -170,12 +170,12 @@ } #forum td.container { - background: #369 url(forum-container-rtl.jpg) left top no-repeat; + background: #369 url(images/forum-container-rtl.jpg) left top no-repeat; } #forum td.container a { padding: 20px 35px 20px 0; - background: transparent url(forum-link-rtl.png) right center no-repeat; + background: transparent url(images/forum-link-rtl.png) right center no-repeat; } /* IE hack */