Changeset 720

Timestamp:

11/08/08 19:57:28 (2 months ago)

Author:

Paul

Message:

See note with r.719

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• footer.php (modified) (3 diffs)
• header.php (modified) (2 diffs)
• include/cache.php (modified) (3 diffs)
• include/functions.php (modified) (33 diffs)
• include/template/main.tpl (modified) (3 diffs)
• style/Oxygen/Oxygen.css (deleted)
• style/Oxygen/Oxygen.php (modified) (1 diff)
• style/Oxygen/Oxygen_cs.css (deleted)
• style/Oxygen/Oxygen_ie6.css (deleted)
• style/Oxygen/Oxygen_ie7.css (deleted)
• style/Oxygen/tab.png (deleted)
• style/Oxygen/tab_hover.png (deleted)

fluxbb/branches/fluxbb-1.3-dev/upload/footer.php

@@ -13 +13 @@
         exit;
 
-// START SUBST - <!-- forum_about -->
+// START SUBST - <!-- forum_qjump -->
+if ($forum_user['g_read_board'] == '1' && $forum_config['o_quickjump'] == '1')
+{
+
 ob_start();
 
-($hook = get_hook('ft_about_output_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+($hook = get_hook('ft_qjump_output_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
 // Display the "Jump to" drop list
-if ($forum_user['g_read_board'] == '1' && $forum_config['o_quickjump'] == '1')
-{
         // Load cached quickjump
         if (file_exists(FORUM_CACHE_DIR.'cache_quickjump_'.$forum_user['g_id'].'.php'))
@@ -33 +34 @@
                 require FORUM_CACHE_DIR.'cache_quickjump_'.$forum_user['g_id'].'.php';
         }
+
+($hook = get_hook('ft_qjump_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+$tpl_temp = forum_trim(ob_get_contents());
+$tpl_main = str_replace('<!-- forum_qjump -->', $tpl_temp, $tpl_main);
+ob_end_clean();
+
 }
+// END SUBST - <!-- forum_qjump -->
 
 
-($hook = get_hook('ft_about_pre_copyright')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+// START SUBST - <!-- forum_about -->
+ob_start();
+
+($hook = get_hook('ft_about_pre_about')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
 // End the transaction
@@ -42 +54 @@
 
 ?>
-        <p id="copyright"><?php echo sprintf($lang_common['Powered by'], '<a href="http://fluxbb.org/">FluxBB</a>'.($forum_config['o_show_version'] == '1' ? ' '.$forum_config['o_cur_version'] : '')); ?></p>
+        <div id="brd-about">
+                <p id="copyright"><?php echo sprintf($lang_common['Powered by'], '<a href="http://fluxbb.org/">FluxBB</a>'.($forum_config['o_show_version'] == '1' ? ' '.$forum_config['o_cur_version'] : '')); ?></p>
+        </div>
 <?php
 

fluxbb/branches/fluxbb-1.3-dev/upload/header.php

@@ -171 +171 @@
 
 // Main Navigation
-$gen_elements['<!-- forum_navlinks -->'] = '<ul>'."\n\t\t".generate_navlinks()."\n\t".'</ul>';
+$gen_elements['<!-- forum_navlinks -->'] = '<ul>'."\n\t\t\t".generate_navlinks()."\n\t\t".'</ul>';
 
 // Announcement
-$gen_elements['<!-- forum_announcement -->'] = ($forum_config['o_announcement'] == '1' && $forum_user['g_read_board'] == '1') ? '<div id="brd-announcement" class="gen-content">'."\n\t".'<div class="userbox">'.($forum_config['o_announcement_heading'] != '' ? "\n\t\t".'<h1 class="msg-head">'.$forum_config['o_announcement_heading'].'</h1>' : '')."\n\t\t".$forum_config['o_announcement_message']."\n\t".'</div>'."\n".'</div>'."\n" : '';
+$gen_elements['<!-- forum_announcement -->'] = ($forum_config['o_announcement'] == '1' && $forum_user['g_read_board'] == '1') ? '<div class="gen">'."\n\t".'<div id="brd-announcement" class="content">'."\n\t\t".'<div class="userbox">'.($forum_config['o_announcement_heading'] != '' ? "\n\t\t\t".'<h1 class="msg-head">'.$forum_config['o_announcement_heading'].'</h1>' : '')."\n\t\t\t".$forum_config['o_announcement_message']."\n\t\t".'</div>'."\n\t".'</div>'."\n".'</div>'."\n" : '';
 
 // Maintenance Warning
@@ -280 +280 @@
 
 // Top breadcrumbs
-$main_elements['<!-- forum_crumbs_top -->'] = (FORUM_PAGE != 'index') ? '<div id="brd-crumbs-top" class="crumbs gen-content">'."\n\t".'<p>'.generate_crumbs(false).'</p>'."\n".'</div>' : '';
+$main_elements['<!-- forum_crumbs_top -->'] = (FORUM_PAGE != 'index') ? '<div id="brd-crumbs-top" class="s1-gen s1-crumbs">'."\n\t".'<p>'.generate_crumbs(false).'</p>'."\n".'</div>' : '';
 
 // Bottom breadcrumbs
-$main_elements['<!-- forum_crumbs_end -->'] = (FORUM_PAGE != 'index') ? '<div id="brd-crumbs-end" class="crumbs gen-content">'."\n\t".'<p>'.generate_crumbs(false).'</p>'."\n".'</div>' : '';
+$main_elements['<!-- forum_crumbs_end -->'] = (FORUM_PAGE != 'index') ? '<div id="brd-crumbs-end" class="s1-gen s1-crumbs">'."\n\t".'<p>'.generate_crumbs(false).'</p>'."\n".'</div>' : '';
 
 // Main section heading
-$main_elements['<!-- forum_main_head -->'] =  '<div class="main-head">'."\n\t".'<h1 class="hn"><span>'.((isset($forum_page['main_head'])) ? $forum_page['main_head'] : end($forum_page['crumbs'])).(isset($forum_page['main_head_pages']) ? ' <small>'.$forum_page['main_head_pages'].'</small>' : '').'</span></h1>'."\n".'</div>';
+$main_elements['<!-- forum_main_hd -->'] =  '<div class="main-hd">'."\n\t\t".'<h1 class="hn"><span>'.$forum_page['main_hd'].'</span></h1>'."\n\t".'</div>'."\n";
 
 // Top pagination and post links
-$main_elements['<!-- forum_main_pagepost_top -->'] = (!empty($forum_page['page_post'])) ? '<div id="brd-pagepost-top" class="main-pagepost gen-content">'."\n\t".implode("\n\t", $forum_page['page_post'])."\n".'</div>' : '';
+$main_elements['<!-- forum_main_pagepost_top -->'] = (!empty($forum_page['page_post'])) ? '<div id="brd-pagepost-top" class="main-pagepost">'."\n\t\t".implode("\n\t\t", $forum_page['page_post'])."\n\t".'</div>' : '';
 
 // Bottom pagination and postlink
-$main_elements['<!-- forum_main_pagepost_end -->'] = (!empty($forum_page['page_post'])) ? '<div id="brd-pagepost-end" class="main-pagepost gen-content">'."\n\t".implode("\n\t", $forum_page['page_post'])."\n".'</div>' : '';
+$main_elements['<!-- forum_main_pagepost_end -->'] = (!empty($forum_page['page_post'])) ? '<div id="brd-pagepost-end" class="main-pagepost">'."\n\t\t".implode("\n\t\t", $forum_page['page_post'])."\n\t".'</div>' : '';
 
 // Main section menu e.g. profile menu
-$main_elements['<!-- forum_main_menu -->'] = (!empty($forum_page['main_menu'])) ? '<div class="main-menu gen-content">'."\n\t".'<ul>'."\n\t\t".implode("\n\t\t", $forum_page['main_menu'])."\n\t".'</ul>'."\n".'</div>' : '';
+$main_elements['<!-- forum_main_menu -->'] = (!empty($forum_page['main_menu'])) ? '<div class="main-menu gen-section">'."\n\t".'<ul>'."\n\t\t".implode("\n\t\t", $forum_page['main_menu'])."\n\t".'</ul>'."\n".'</div>' : '';
 
 // Main section menu e.g. profile menu
 if (substr(FORUM_PAGE, 0, 5) == 'admin' && FORUM_PAGE_TYPE != 'paged')
 {
-        $main_elements['<!-- forum_admin_menu -->'] = '<div class="admin-menu gen-content">'."\n\t".'<ul>'."\n\t\t".generate_admin_menu(false)."\n\t".'</ul>'."\n".'</div>';
+        $main_elements['<!-- forum_admin_menu -->'] = '<div class="admin-menu gen-section">'."\n\t".'<ul>'."\n\t\t".generate_admin_menu(false)."\n\t".'</ul>'."\n".'</div>';
 
         $forum_page['admin_sub'] = generate_admin_menu(true);
-                $main_elements['<!-- forum_admin_submenu -->'] = ($forum_page['admin_sub'] != '') ? '<div class="admin-submenu gen-content">'."\n\t".'<ul>'."\n\t\t".$forum_page['admin_sub']."\n\t".'</ul>'."\n".'</div>' : '';
+                $main_elements['<!-- forum_admin_submenu -->'] = ($forum_page['admin_sub'] != '') ? '<div class="admin-submenu gen-section">'."\n\t".'<ul>'."\n\t\t".$forum_page['admin_sub']."\n\t".'</ul>'."\n".'</div>' : '';
 }
 
 // Main section options bar
-$main_elements['<!-- forum_main_options -->'] = (!empty($forum_page['main_options'])) ? '<div class="main-options gen-content">'."\n\t\t".'<h2 class="hn"><span>'.$forum_page['main_options_head'].'</span></h2>'."\n\t\t".'<p class="options">'.implode(' ', $forum_page['main_options']).'</p>'."\n\t".'</div>' : '';
+$main_elements['<!-- forum_main_options -->'] = (!empty($forum_page['main_options'])) ? '<div class="main-options">'."\n\t\t".'<h2 class="hn"><span>'.$forum_page['main_options_head'].'</span></h2>'."\n\t\t".'<p class="options">'.implode(' ', $forum_page['main_options']).'</p>'."\n\t".'</div>' : '';
 
 ($hook = get_hook('hd_main_elements')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;

fluxbb/branches/fluxbb-1.3-dev/upload/include/cache.php

@@ -204 +204 @@
 
                 $output = '<?php'."\n\n".'if (!defined(\'FORUM\')) exit;'."\n".'define(\'FORUM_QJ_LOADED\', 1);'."\n".'$forum_id = isset($forum_id) ? $forum_id : 0;'."\n\n".'?>';
-                $output .= '<form id="qjump" method="get" accept-charset="utf-8" action="'.$base_url.'/viewforum.php">'."\n\t".'<div class="frm-fld frm-select">'."\n\t\t".'<label for="qjump-select"><span><?php echo $lang_common[\'Jump to\'] ?>'.'</span></label><br />'."\n\t\t".'<span class="frm-input"><select id="qjump-select" name="id">'."\n";
+                $output .= '<div id="brd-qjump">'."\n\t\t".'<form id="qjump" method="get" accept-charset="utf-8" action="'.$base_url.'/viewforum.php">'."\n\t\t".'<div class="frm-fld frm-select">'."\n\t\t\t".'<label for="qjump-select"><span><?php echo $lang_common[\'Jump to\'] ?>'.'</span></label><br />'."\n\t\t\t".'<span class="frm-input"><select id="qjump-select" name="id">'."\n";
 
                 // Get the list of categories and forums from the DB
@@ -237 +237 @@
                         {
                                 if ($cur_category)
-                                        $output .= "\t\t\t".'</optgroup>'."\n";
-
-                                $output .= "\t\t\t".'<optgroup label="'.forum_htmlencode($cur_forum['cat_name']).'">'."\n";
+                                        $output .= "\t\t\t\t".'</optgroup>'."\n";
+
+                                $output .= "\t\t\t\t".'<optgroup label="'.forum_htmlencode($cur_forum['cat_name']).'">'."\n";
                                 $cur_category = $cur_forum['cid'];
                         }
@@ -249 +249 @@
                 }
 
-                $output .= "\t\t\t".'</optgroup>'."\n\t\t".'</select>'."\n\t\t".'<input type="submit" value="<?php echo $lang_common[\'Go\'] ?>" onclick="return Forum.doQuickjumpRedirect(forum_quickjump_url, sef_friendly_url_array);" /></span>'."\n\t".'</div>'."\n".'</form>'."\n";
-                $output .= '<script type="text/javascript">'."\n\t\t".'var forum_quickjump_url = "'.forum_link($forum_url['forum']).'";'."\n\t\t".'var sef_friendly_url_array = new Array('.$forum_db->num_rows($result).');';
+                $output .= "\t\t\t\t".'</optgroup>'."\n\t\t\t".'</select>'."\n\t\t\t".'<input type="submit" value="<?php echo $lang_common[\'Go\'] ?>" onclick="return Forum.doQuickjumpRedirect(forum_quickjump_url, sef_friendly_url_array);" /></span>'."\n\t\t".'</div>'."\n\t\t".'</form>'."\n";
+                $output .= "\t\t".'<script type="text/javascript">'."\n\t\t\t".'var forum_quickjump_url = "'.forum_link($forum_url['forum']).'";'."\n\t\t\t".'var sef_friendly_url_array = new Array('.$forum_db->num_rows($result).');';
 
                 foreach ($sef_friendly_names as $forum_id => $forum_name)
-                        $output .= "\n\t".'sef_friendly_url_array['.$forum_id.'] = "'.forum_htmlencode($forum_name).'";';
-
-                $output .= "\n".'</script>'."\n";
+                        $output .= "\n\t\t\t".'sef_friendly_url_array['.$forum_id.'] = "'.forum_htmlencode($forum_name).'";';
+
+                $output .= "\n\t\t".'</script>'."\n";
+                $output .= "\t".'</div>'."\n";
 
                 if ($forum_count < 2)

fluxbb/branches/fluxbb-1.3-dev/upload/include/functions.php

@@ -15 +15 @@
         global $forum_user;
         static $stopwords;
-        
+
         $return = ($hook = get_hook('fn_validate_search_word_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
         if ($return != null)
@@ -50 +50 @@
         return str_replace(']]>', ']]>', $str);
 }
- 
- 
+
+
  //
  // Return a list of all URL schemes installed
@@ -58 +58 @@
  {
         $schemes = array();
- 
+
         foreach (glob(FORUM_ROOT.'include/url/*') as $dirname)
                 if (is_dir($dirname) && file_exists($dirname.'/forum_urls.php'))
                         $schemes[] = basename($dirname);
-        
+
         ($hook = get_hook('fn_get_scheme_packs_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
         return $schemes;
  }
- 
- 
+
+
  //
  // Return a list of all styles installed
@@ -75 +75 @@
  {
         $styles = array();
- 
+
         foreach (glob(FORUM_ROOT.'style/*') as $dirname)
         {
@@ -82 +82 @@
                         $styles[] = $tempname;
         }
- 
         ($hook = get_hook('fn_get_style_packs_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -353 +352 @@
                         $forum_user['csrf_token'] = random_key(40, false, true);
                         $forum_user['prev_url'] = get_current_url(255);
-        
+
                         // REPLACE INTO avoids a user having two rows in the online table
                         $query = array(
@@ -361 +360 @@
                                 'UNIQUE'        => 'user_id=1 AND ident=\''.$forum_db->escape($remote_addr).'\''
                         );
-        
+
                         if ($forum_user['prev_url'] != null)
                         {
@@ -367 +366 @@
                                 $query['VALUES'] .= ', \''.$forum_db->escape($forum_user['prev_url']).'\'';
                         }
-        
+
                         ($hook = get_hook('fn_set_default_user_qr_add_online_guest_user')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
                         $forum_db->query_build($query) or error(__FILE__, __LINE__);
@@ -378 +377 @@
                                 'WHERE'         => 'ident=\''.$forum_db->escape($remote_addr).'\''
                         );
-        
+
                         $current_url = get_current_url(255);
                         if ($current_url != null)
                                 $query['SET'] .= ', prev_url=\''.$forum_db->escape($current_url).'\'';
-        
+
                         ($hook = get_hook('fn_set_default_user_qr_update_online_guest_user')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
                         $forum_db->query_build($query) or error(__FILE__, __LINE__);
@@ -645 +644 @@
         ($hook = get_hook('fn_generate_navlinks_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-        return implode("\n\t\t", $links);
+        return implode("\n\t\t\t", $links);
 }
 
@@ -700 +699 @@
         {
                 for ($i = ($num_crumbs - 1); $i >= 0; --$i)
-                        $crumbs .= (is_array($forum_page['crumbs'][$i]) ? forum_htmlencode($forum_page['crumbs'][$i][0]) : forum_htmlencode($forum_page['crumbs'][$i])).((isset($forum_page['page']) && $i == ($num_crumbs - 1)) ? ' ('.$lang_common['Page'].' '.forum_number_format($forum_page['page']).')' : '').($i > 0 ? $lang_common['Title separator'] : '');
+                        $crumbs .= (is_array($forum_page['crumbs'][$i]) ? forum_htmlencode($forum_page['crumbs'][$i][0]) : forum_htmlencode($forum_page['crumbs'][$i])).((isset($forum_page['page']) && $i == ($num_crumbs - 1)) ? ' '.sprintf($lang_common['Title page'], forum_number_format($forum_page['page']), forum_number_format($forum_page['num_pages'])) : '').($i > 0 ? $lang_common['Title separator'] : '');
         }
         else
@@ -1474 +1473 @@
                         );
                 }
-                
+
                 ($hook = get_hook('fn_add_topic_qr_update_last_post')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
                 $forum_db->query_build($query) or error(__FILE__, __LINE__);
@@ -1750 +1749 @@
         if (!isset($lang_url_replace))
                 require FORUM_ROOT.'lang/'.$forum_user['language'].'/url_replace.php';
-        
+
         if (!isset($forum_reserved_strings))
         {
@@ -1925 +1924 @@
 // Generate a string with page and item information for multipage headings
 //
-function generate_items_info($label, $first, $total)
+function generate_page_info($label, $first, $total)
 {
         global $forum_page, $lang_common;
@@ -1934 +1933 @@
 
         if ($forum_page['num_pages'] == 1)
+        {
                 $item_info =  '<span class="item-info">'.sprintf($lang_common['Item info single'], $label, forum_number_format($total)).'</span>';
+                $info_string = $item_info;
+        }
         else
+        {
+                $page_info = '<span class="page-info">'.sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']).'</span>';
                 $item_info = '<span class="item-info">'.sprintf($lang_common['Item info plural'], $label, forum_number_format($first), forum_number_format($forum_page['finish_at']), forum_number_format($total)).'</span>';
+                $info_string = $page_info.' '.$item_info;
+        }
 
         ($hook = get_hook('fn_generate_page_info_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-        return $item_info;
+        return $info_string;
 }
 
@@ -2059 +2065 @@
 
 ?>
-        <div class="main-content main-message">
+        <div class="main-section main-message">
                 <p><?php echo $message.($link ? ' <span>'.$link.'</span>' : '') ?></p>
         </div>
@@ -2067 +2073 @@
 
         $tpl_temp = forum_trim(ob_get_contents());
-        $tpl_main = str_replace('<!-- forum_main -->', "\t".$tpl_temp, $tpl_main);
+        $tpl_main = str_replace('<!-- forum_main_content -->', "\t".$tpl_temp, $tpl_main);
         ob_end_clean();
         // END SUBST - <!-- forum_main -->
@@ -2155 +2161 @@
                 <h2><span><?php echo $lang_common['Confirm action head'] ?></span></h2>
         </div>
-        <div class="main-content main-frm">
+        <div class="main-section main-frm">
                 <div class="frm-info">
                         <p><?php echo $lang_common['CSRF token mismatch'] ?></p>
@@ -2175 +2181 @@
 
         $tpl_temp = forum_trim(ob_get_contents());
-        $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);
+        $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main);
         ob_end_clean();
         // END SUBST - <!-- forum_main -->
@@ -2222 +2228 @@
         if ($return != null)
                 return $return;
-        
+
         if ($sublink == $forum_url['page'] && $subarg == 1)
                 return forum_link($link, $args);
@@ -2425 +2431 @@
         // Clean up the URL so that it should match the rules we have
         $url = str_replace('&amp;', '&', urldecode($url));
-        
+
         $return = ($hook = get_hook('fn_confirm_current_url_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
         if ($return != null)
@@ -2437 +2443 @@
         if ($url != $current_url && $url.'?login=1' != $current_url && $url.'&login=1' != $current_url)
         {
-                header('HTTP/1.1 301 Moved Permanently'); 
+                header('HTTP/1.1 301 Moved Permanently');
                 header('Location: '.$url);
         }
@@ -2515 +2521 @@
         if ($return != null)
                 return $return;
-        
+
 
         // If we have cURL, we might as well use it
@@ -2529 +2535 @@
                 curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
                 curl_setopt($ch, CURLOPT_USERAGENT, 'FluxBB');
-                
+
                 ($hook = get_hook('fn_get_remote_file_curl_options')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -2564 +2570 @@
                         fwrite($remote, 'Host: '.$parsed_url['host']."\r\n");
                         fwrite($remote, 'User-Agent: FluxBB'."\r\n");
-                        
+
                         ($hook = get_hook('fn_get_remote_file_socket_options')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-                        
+
                         fwrite($remote, 'Connection: Close'."\r\n\r\n");
 
@@ -2614 +2620 @@
                                 )
                         );
-                        
+
                         ($hook = get_hook('fn_get_remote_file_context_options')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -2700 +2706 @@
                 <h1 class="hn"><span><?php echo $lang_common['Maintenance mode'] ?></span></h1>
         </div>
-        <div class="main-content main-message">
+        <div class="main-section main-message">
                 <div class="ct-box user-box">
                         <?php echo $message."\n" ?>
@@ -2824 +2830 @@
         </div>
 
-        <div class="main-content main-message">
+        <div class="main-section main-message">
                 <p><?php printf($lang_common['Forwarding info'], $forum_config['o_redirect_delay'], intval($forum_config['o_redirect_delay']) == 1 ? $lang_common['second'] : $lang_common['seconds']) ?><span> <a href="<?php echo $destination_url ?>"><?php echo $lang_common['Click redirect'] ?></a></span></p>
         </div>
@@ -2966 +2972 @@
 {
         global $forum_config;
-        
+
         if (!isset($_SERVER['REQUEST_URI']) || (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) && strpos($_SERVER['REQUEST_URI'], '?') === false))
         {
@@ -2972 +2978 @@
                 if (isset($_SERVER['HTTP_X_ORIGINAL_URL']))
                         $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
-                
+
                 // IIS6 also doesn't set REQUEST_URI, If we are using the default SEF URL scheme then we can work around it
                 else if (!isset($forum_config) || $forum_config['o_sef'] == 'Default')
@@ -2979 +2985 @@
                         $_SERVER['REQUEST_URI'] = $requested_page.(isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) ? '?'.$_SERVER['QUERY_STRING'] : '');
                 }
-                
+
                 // Otherwise I am not aware of a work around...
                 else
@@ -3050 +3056 @@
         // Get the queries so that we can print them out
         $saved_queries = $forum_db->get_saved_queries();
-        
+
         ob_start();
 
@@ -3060 +3066 @@
         </div>
 
-        <div class="main-content debug">
+        <div class="main-section debug">
                 <table cellspacing="0" summary="<?php echo $lang_common['Debug summary'] ?>">
                         <thead>

fluxbb/branches/fluxbb-1.3-dev/upload/include/template/main.tpl

@@ -11 +11 @@
 <div <!-- forum_page -->>
 
-<div id="brd-head" class="gen-content">
-        <!-- forum_skip -->
-        <!-- forum_title -->
-        <!-- forum_desc -->
-</div>
+<div id="brd-start" class="gen">
+        <div id="brd-head">
+                <!-- forum_skip -->
+                <!-- forum_title -->
+                <!-- forum_desc -->
+        </div>  
 
-<div id="brd-navlinks" class="gen-content">
-        <!-- forum_navlinks -->
-        <!-- forum_admod -->
-</div>
+        <div id="brd-navlinks">
+                <!-- forum_navlinks -->
+                <!-- forum_admod -->
+        </div>
 
-<div id="brd-visit" class="gen-content">
-        <!-- forum_welcome -->
-        <!-- forum_visit -->
+        <div id="brd-visit">
+                <!-- forum_welcome -->
+                <!-- forum_visit -->
+        </div>
 </div>
 
@@ -32 +34 @@
 
 <!-- forum_crumbs_top -->
-<!-- forum_main_menu -->
-<!-- forum_main_pagepost_top -->
-<!-- forum_main_head -->
-<!-- forum_main -->
-<!-- forum_main_options -->
-<!-- forum_main_pagepost_end -->
+
+<div id="brd-main" class="main">
+        <!-- forum_main_menu -->
+        <!-- forum_main_pagepost_top -->
+        <!-- forum_main_hd -->
+        <!-- forum_main_content -->
+        <!-- forum_main_options -->
+        <!-- forum_main_pagepost_end -->
+</div>
+
 <!-- forum_crumbs_end -->
 <!-- forum_qpost -->
@@ -45 +51 @@
 <div class="hr"><hr /></div>
 
-<div id="brd-about" class="gen-content">
+<div id="brd-end" class="gen">
+        <!-- forum_qjump -->
         <!-- forum_about -->
 </div>

fluxbb/branches/fluxbb-1.3-dev/upload/style/Oxygen/Oxygen.php

@@ -1 @@
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $base_url.'/style/'.$forum_user['style'] ?>/Oxygen.css" />
-<link rel="stylesheet" type="text/css" media="screen" href="<?php echo $base_url.'/style/'.$forum_user['style'] ?>/Oxygen_cs.css" />
-<!--[if lte IE 6]><link rel="stylesheet" type="text/css" href="<?php echo $base_url.'/style/'.$forum_user['style'] ?>/Oxygen_ie6.css" /><![endif]-->
-<!--[if IE 7]><link rel="stylesheet" type="text/css" href="<?php echo $base_url.'/style/'.$forum_user['style'] ?>/Oxygen_ie7.css" /><![endif]-->
+// Holding file