*** adc.theme.old 2006-05-20 13:13:25.000000000 -0500 --- adc.theme 2006-05-21 02:26:43.000000000 -0500 *************** *** 1,27 **** ! t('left sidebar'), ! 'right' => t('right sidebar') ! ); ! } function adc_page($content) { if (theme_get_setting('toggle_favicon')) { drupal_set_html_head(''); } ! $output = "\n"; $output .= "\n"; $output .= "\n"; $output .= drupal_get_html_head(); --- 1,28 ---- ! t('left sidebar'), ! 'right' => t('right sidebar'), ! 'header' => t('header'), ! 'footer' => t('footer') ! ); } function adc_page($content) { if (theme_get_setting('toggle_favicon')) { drupal_set_html_head(''); } ! drupal_add_js(path_to_theme().'/rollup.js'); ! $output = "\n"; $output .= "\n"; $output .= "\n"; $output .= drupal_get_html_head(); *************** *** 69,74 **** --- 70,77 ---- $leftblocks = theme("blocks", "left"); $rightblocks = theme("blocks", "right"); + $topblocks = theme("blocks", "header"); + $bottomblocks = theme("blocks", "footer"); if ($leftblocks && $rightblocks) { $output .= "

\n"; *************** *** 83,88 **** --- 86,95 ---- $output .= "

\n"; } + if ($topblocks) { + $output .= "

\n"; + } + if ($title) { $output .= theme("breadcrumb", drupal_get_breadcrumb()); $output .= "

$title

"; *************** *** 102,109 **** --- 109,118 ---- $output .= "

\n"; + $output .= $topblocks ? "

$topblocks

\n" : ""; $output .= $leftblocks ? "

$leftblocks

\n" : ""; $output .= $rightblocks ? "

$rightblocks

\n" : ""; + $output .= $bottomtblocks ? "

$bottomblocks

\n" : ""; if ($footerText = variable_get(site_footer, "")) { $output .= "\n"; *************** *** 111,118 **** $output .= theme_closure(); $output .= "\n\n"; ! return $output; ! } function adc_node($node, $teaser = 0, $page = 0) { $output = "

\n"; --- 120,126 ---- $output .= theme_closure(); $output .= "\n\n"; ! return $output; } function adc_node($node, $teaser = 0, $page = 0) { $output = "

\n"; *************** *** 141,148 **** $output .= "

\n

\n"; ! return $output; ! } function adc_comment($comment, $links = array()) { $output = "

\n"; --- 149,155 ---- $output .= "

\n

\n"; ! return $output; } function adc_comment($comment, $links = array()) { $output = "

\n"; *************** *** 152,171 **** $output .= $comment->comment; $output .= "

". theme('links', $links) ."
"; ! return $output; ! } function adc_block($block) { ! $output = '

'; ! $output .= '

'; ! $output .= $block->subject ."

$block->content

\n"; $output .= "
\n"; ! return $output; ! } function adc_help() { if ($help = menu_get_active_help()) { return '

'. $help .'

'; ! } ! } --- 159,194 ---- $output .= $comment->comment; $output .= "

". theme('links', $links) ."
"; ! return $output; } function adc_block($block) { ! global $user; ! $user1=$user->name; ! $value=$block->subject; ! $value1="Navigation"; ! global $boxcounter; ! $boxcounter++; ! ! $output = '

'; ! ! if($value!=$user1 && $value!=$value1){ ! $output .= '

'; ! $output .= '

'; ! $output .= ""; ! $output .= '

'; ! $output .= '

'; ! $output .= $value."

"; ! $output .= "

"; ! } else $output .= "

"; ! ! $output .= $block->content."

\n"; $output .= "
\n"; ! return $output; } function adc_help() { if ($help = menu_get_active_help()) { return '

'. $help .'

'; ! } }