Changeset 728

Timestamp:

11/12/08 14:28:41 (2 months ago)

Author:

Paul

Message:

See note to r.719

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• delete.php (modified) (6 diffs)
• lang/English/delete.php (modified) (1 diff)

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

@@ -116 +116 @@
 
 // Setup form
-$forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;
+$forum_page['fld_count'] = 0;
 $forum_page['form_action'] = forum_link($forum_url['delete'], $id);
 
@@ -131 +131 @@
 );
 
-// Generate the post heading
-$forum_page['post_ident'] = array();
-$forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf((($cur_post['is_topic']) ? $lang_delete['Topic byline'] : $lang_delete['Reply byline']), '<strong>'.forum_htmlencode($cur_post['poster']).'</strong>').'</span>';
-$forum_page['post_ident']['link'] = '<span class="post-link"><a class="permalink" href="'.forum_link($forum_url['post'], $cur_post['tid']).'">'.format_time($cur_post['posted']).'</a></span>';
-
 ($hook = get_hook('dl_pre_item_ident_merge')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-
-// Generate the post title
-if ($cur_post['is_topic'])
-        $forum_page['item_subject'] = sprintf($lang_delete['Topic title'], $cur_post['subject']);
-else
-        $forum_page['item_subject'] = sprintf($lang_delete['Reply title'], $cur_post['subject']);
-
-$forum_page['item_subject'] = forum_htmlencode($forum_page['item_subject']);
 
 // Setup breadcrumbs
@@ -154 +141 @@
 );
 
+// Setup main heading
+$forum_page['main_hd'] = end($forum_page['crumbs']);
+
 ($hook = get_hook('dl_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -159 +149 @@
 require FORUM_ROOT.'header.php';
 
-// START SUBST - <!-- forum_main -->
+// START SUBST - <!-- forum_main_content -->
 ob_start();
 
@@ -165 +155 @@
 
 ?>
-        <div class="main-content main-frm">
-                <div class="ct-box info-box">
-                        <ul class="info-list">
-                                <?php echo implode("\n\t\t\t\t", $forum_page['frm_info'])."\n" ?>
-                        </ul>
+        <div class="content">
+                <div id="post-delete" class="section section-1 datafrm">
+<?php ($hook = get_hook('dl_pre_post_display')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                        <div class="section-hd">
+                                <ul class="info-list">
+                                        <?php echo implode("\n\t\t\t\t", $forum_page['frm_info'])."\n" ?>
+                                </ul>
+                        </div>
+                        <div class="post-entry">
+                                <div class="entry-content">
+                                        <?php echo $cur_post['message']."\n" ?>
+                                </div>
+<?php ($hook = get_hook('dl_new_post_entry_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                        </div>
                 </div>
-<?php ($hook = get_hook('dl_pre_post_display')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                <div class="post singlepost">
-                        <div class="posthead">
-                                <h3 class="hn post-ident"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
-<?php ($hook = get_hook('dl_new_post_head_option')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </div>
-                        <div class="postbody">
-                                <div class="post-entry">
-                                        <h4 class="entry-title hn"><?php echo $forum_page['item_subject'] ?></h4>
-                                        <div class="entry-content">
-                                                <?php echo $cur_post['message']."\n" ?>
-                                        </div>
-<?php ($hook = get_hook('dl_new_post_entry_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                </div>
-                        </div>
-                </div>
+                <div class="section datafrm">
                 <form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
                         <div class="hidden">
                                 <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
                         </div>
-<?php ($hook = get_hook('dl_pre_confirm_delete_fieldset')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        <fieldset class="frm-group group<?php echo ++$forum_page['group_count'] ?>">
-                                <legend class="group-legend"><strong><?php echo ($cur_post['is_topic']) ? $lang_delete['Delete topic'] : $lang_delete['Delete post'] ?></strong></legend>
+<?php ($hook = get_hook('dl_pre_confirm_delete_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                        <div class="frm-group frm-group-1">
 <?php ($hook = get_hook('dl_pre_confirm_delete_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
+                                <div class="sf-set frm-set frm-set-1">
                                         <div class="sf-box checkbox">
                                                 <span class="fld-input"><input type="checkbox" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="req_confirm" value="1" checked="checked" /></span>
-                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_delete['Please confirm'] ?></span> <?php printf(((($cur_post['is_topic'])) ? $lang_delete['Delete topic label'] : $lang_delete['Delete post label']), forum_htmlencode($cur_post['poster']), format_time($cur_post['posted'])) ?></label>
+                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_delete['Please confirm'] ?></span> <br /><small><?php printf(((($cur_post['is_topic'])) ? $lang_delete['Delete topic label'] : $lang_delete['Delete post label']), forum_htmlencode($cur_post['poster']), format_time($cur_post['posted'])) ?></small></label>
                                         </div>
                                 </div>
 <?php ($hook = get_hook('dl_pre_confirm_delete_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </fieldset>
+                        </div>
 <?php ($hook = get_hook('dl_confirm_delete_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                         <div class="frm-buttons">
-                                <span class="submit"><input type="submit" name="delete" value="<?php echo ($cur_post['is_topic']) ? $lang_delete['Delete topic'] : $lang_delete['Delete post'] ?>" /></span>
-                                <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span>
+                                <p class="frm-actions"><span class="submit"><input type="submit" name="delete" value="<?php echo ($cur_post['is_topic']) ? $lang_delete['Delete topic'] : $lang_delete['Delete post'] ?>" /></span> <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span></p>
                         </div>
                 </form>
+                </div>
         </div>
 <?php
@@ -217 +200 @@
 
 $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 -->
+// END SUBST - <!-- forum_main_content -->
 
 require FORUM_ROOT.'footer.php';

fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/delete.php

@@ -16 +16 @@
 'Topic title'                   =>      'Topic: %s',
 'Reply title'                   =>      'Reply to: %s',
-'Please confirm'                =>      'Please confirm:',
+'Please confirm'                =>      'Please confirm',
 'Post del redirect'             =>      'Post deleted. Redirecting 
',
 'Topic del redirect'    =>      'Topic deleted. Redirecting 
',