Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/refresco/template.php,v
retrieving revision 1.1
diff -u -r1.1 template.php
--- template.php	29 May 2008 02:40:09 -0000	1.1
+++ template.php	29 May 2008 15:41:51 -0000
@@ -1,17 +1,13 @@
 <?php
 // $Id: template.php,v 1.1 2008/05/29 02:40:09 crashtest Exp $
 
-$theme_path = path_to_theme();
-
-// Add javascript and stylesheets here.
-drupal_add_css($theme_path .'/styles.css', 'theme', 'all');
-
 /**
  * Return a themed breadcrumb trail.
  *
  * @param $breadcrumb
  *   An array containing the breadcrumb links.
- * @return a string containing the breadcrumb output.
+ * @return
+ *   A string containing the breadcrumb output.
  */
 function phptemplate_breadcrumb($breadcrumb) {
   if (!empty($breadcrumb)) {
@@ -36,16 +32,27 @@
  */
 function phptemplate_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
-	$vars['theme_path'] = path_to_theme();	
-  if ($is_front == '0') { $vars['mission'] = NULL; }
+  
+  if ($vars['is_front'] == '0') {
+    $vars['mission'] = FALSE;
+  }
 
-  // Hook into color.module
+  // Hook into color.module.
   if (module_exists('color')) {
     _color_page_alter($vars);
   }
 }
 
 /**
+ * Override or insert PHPTemplate variables into the templates.
+ */
+function phptemplate_preprocess_block(&$vars) {
+  if ($vars['block']->module == 'block' && user_access('administer blocks')) {
+    $vars['edit_url'] = url('admin/build/block/configure/'. $vars['block']->delta);
+  }
+}
+
+/**
  * Returns the rendered local tasks. The default implementation renders
  * them as tabs. Overridden to split the secondary tasks.
  *
@@ -87,4 +94,4 @@
 
 function trescoweb_menu_tree_cid($menu_name, $data) {
   return 'links:'. $menu_name .':tree-data:'. md5(serialize($data));
-}
\ No newline at end of file
+}
Index: block.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/refresco/block.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 block.tpl.php
--- block.tpl.php	29 May 2008 02:40:09 -0000	1.1
+++ block.tpl.php	29 May 2008 15:41:51 -0000
@@ -1,22 +1,17 @@
 <?php
 // $Id: block.tpl.php,v 1.1 2008/05/29 02:40:09 crashtest Exp $
 ?>
-<div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="clear-block block block-<?php print $block->module ?>">
+<div id="block-<?php print $block->module .'-'. $block->delta ?>" class="clear-block block block-<?php print $block->module ?>">
 
-<?php
-  if ($block->module == 'block'):
-    if (user_access('administer blocks')) :?>
-    <div id="tabs-wrapper">
-      <ul class="tabs primary">
-        <li class="active">
-          <a class="active" href='<?php print check_url(base_path()) ?>index.php?q=admin/build/block/configure/<?php print $block->module;?>/<?php print $block->delta;?>'>Edit</a>
-        </li>
-      </ul>
-    </div>
-    <?php 
-    endif; 
-  endif; 
-?>
+<?php if (isset($edit_url)): ?>
+  <div id="tabs-wrapper">
+    <ul class="tabs primary">
+      <li class="active">
+        <a class="active" href="<?php print $edit_url ?>">Edit</a>
+      </li>
+    </ul>
+  </div>
+<?php endif; ?>
 
 <?php if (!empty($block->subject)): ?>
   <h2><?php print $block->subject ?></h2>
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/refresco/page.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 page.tpl.php
--- page.tpl.php	29 May 2008 02:40:09 -0000	1.1
+++ page.tpl.php	29 May 2008 15:41:51 -0000
@@ -13,26 +13,23 @@
     <![endif]-->
   </head>
   
-  <body class="<?php print $body_classes; ?>">
+  <body class="<?php print $body_classes ?>">
 		<div class="whitebar">
 			<div class="centered">
 				<div id="slogan">
-					<?php 
-					if ($messages) { 
-						print $messages; 
-					} else if ($search_box)
-					{
-						print $search_box;
-					}
-					?>		
-					<?php if ($site_slogan) { print '<h3>' . $site_slogan . '</h3>'; } ?>
+					<?php if ($messages): ?>
+						<?php print $messages ?>
+					<?php elseif ($search_box): ?>
+						<?php print $search_box ?>
+					<?php endif; ?>
+					<?php if ($site_slogan): ?><h3><?php print $site_slogan ?></h3><?php endif; ?>
 				</div>
 			</div>
 		</div>
 
   	<div id="menubar">  	
 			<div id="navigation">
-				<?php if (isset($primary_links)) : ?>
+				<?php if (isset($primary_links)): ?>
 					<?php print theme('links', $primary_links) ?>
 				<?php endif; ?>
 			</div>
@@ -41,69 +38,77 @@
   	<div id="bluebar">
   		<div class="centered">
 				<div id="logo">
-					<a href="<?php print $base_path; ?>"><img src="<?php print $logo; ?>" alt="logo" /></a><?php if ($site_name) { print '<h1><a href="'. $base_path .'">'. $site_name .'</a>' . '</h1>'; } ?>
-					<?php print '<h3 class="mission">' . $mission . '</h3>'; ?>
-					<?php print '<div id="mission-region">' . $mission_region  . '</div>'; ?>
+          <?php if ($logo): ?>
+					  <a href="<?php print $base_path ?>"><img src="<?php print $logo ?>" alt="logo" /></a>
+					<?php endif; ?>
+					<?php if ($site_name): ?><h1><a href="<?php print $base_path ?>"><?php print $site_name ?></a></h1><?php endif; ?>
+					<?php if ($mission): ?><h3 class="mission"><?php print $mission ?></h3><?php endif; ?>
+					<?php if ($mission_region): ?><div id="mission-region"><?php print $mission_region ?></div><?php endif; ?>
 				</div>
 			</div>
 		</div>
 
 		<?php if ($breadcrumb || $secondary_links): ?>
-		<div class="whitebar">		
-			<div class="centered">		
-				<div id="crumbbar">
-					<?php 
-					if ($breadcrumb) { print '<div id="breadcrumb">' . $breadcrumb . '</div>'; } 
-					if ($secondary_links) { print '<div id="secondary">' . theme('links', $secondary_links) . '</div>'; } ?>
-				</div>
-			</div>	
-		</div>
+  		<div class="whitebar">
+  			<div class="centered">
+  				<div id="crumbbar">
+  					<?php if ($breadcrumb): ?><div id="breadcrumb"><?php print $breadcrumb ?></div><?php endif; ?>
+  					<?php if ($secondary_links):?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php endif; ?>
+  				</div>
+  			</div>	
+  		</div>
 		<?php endif; ?>
 
 		<?php if ($callout_left || $callout_right): ?>
-		<div class="whitebar">
-			<div class="centered">
-				<div id="callout">
-					<?php if ($callout_left): ?>
-					<div id="callout-left">		
-						<?php	print $callout_left; ?>
-					</div>  
-					<?php endif; ?>
-					<?php if ($callout_right) {
-						print '<div id="callout-right">'.$callout_right.'</div>';
-					} else 
-					{
-						print '<div id="callout-right-empty">&nbsp;</div>';	
-					}
-					?>
-				</div>
-			</div>
-		</div>		
+  		<div class="whitebar">
+  			<div class="centered">
+  				<div id="callout">
+  					<?php if ($callout_left): ?>
+    					<div id="callout-left">		
+    						<?php	print $callout_left ?>
+    					</div>  
+  					<?php endif; ?>
+  					<?php if ($callout_right): ?>
+  						<div id="callout-right"><?php print $callout_right ?></div>
+  					<?php else: ?>
+  						<div id="callout-right-empty">&nbsp;</div>
+  					<?php endif;	?>
+  				</div>
+  			</div>
+  		</div>		
 		<?php endif; ?>
 
 		<div id="greybar">
 			<div class="centered">
-					<?php if ($tabs) { print '<div id="tabs-wrapper"><ul class="tabs primary">'. $tabs. '</ul></div>'; } ?>
-					<?php 
-					if ($content_left && $content_right) { print '<div id="three-content-columns">'; } 
-					else if ($content_left || $content_right) { print '<div id="two-content-columns">'; }
-						if ($content_left) { print '<div id="content-left">'. $content_left. '</div>'; }
-						print '<div id="content">';
-						if ($title) { print '<h2>'. $title . '</h2>'; }
-						print $content. '</div>';
-						if ($content_right) { print '<div id="content-right">'. $content_right. '</div>'; }
-					if ($content_left || $content_right) { print '</div>'; }
-					?>			
+				<?php if ($tabs): ?><div id="tabs-wrapper"><ul class="tabs primary"><?php print $tabs ?></ul></div><?php endif; ?>
+				<?php if ($content_left && $content_right): ?>
+				  <div id="three-content-columns">
+				<?php elseif ($content_left || $content_right): ?>
+				  <div id="two-content-columns">
+				<?php endif; ?>
+				<?php if ($content_left): ?>
+				  <div id="content-left"><?php print $content_left ?></div>
+				<?php endif; ?>
+				<div id="content">
+  				<?php if ($title): ?>
+  				  <h2><?php print $title ?></h2>
+  				<?php endif; ?>
+  				<?php print $content ?>
+				</div>
+				<?php if ($content_right): ?>
+				  <div id="content-right"><?php print $content_right ?></div>
+				<?php endif; ?>
+				<?php if ($content_left || $content_right): ?>
+				  </div>
+				<?php endif; ?>
 			</div>
 		</div>
-			
-
+		
 		<div id="lightbluebar">
 			<div class="centered">
 				<div id="footerinner">
 					<p>Refresco designed by <a href="http://brauerranch.com">Patrick Teglia</a></p>
 					<?php if($footer) { print $footer; } ?>
-
 				</div>
 		  </div>
 		</div>

