mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
- fixed topic icon display (correct radio box checked, only visible in first post)
git-svn-id: file:///svn/phpbb/trunk@4919 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
2f4f5c5ede
commit
48eeecb258
3 changed files with 11 additions and 14 deletions
|
@ -714,7 +714,7 @@ function posting_gen_topic_icons($mode, $icon_id)
|
||||||
'ICON_WIDTH' => $data['width'],
|
'ICON_WIDTH' => $data['width'],
|
||||||
'ICON_HEIGHT' => $data['height'],
|
'ICON_HEIGHT' => $data['height'],
|
||||||
|
|
||||||
'S_ICON_CHECKED' => ($id == $icon_id && $mode != 'reply') ? ' checked="checked"' : '')
|
'S_ICON_CHECKED' => ($id == $icon_id) ? ' checked="checked"' : '')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,6 @@ if ($sql)
|
||||||
$forum_id = (int) $forum_id;
|
$forum_id = (int) $forum_id;
|
||||||
$topic_id = (int) $topic_id;
|
$topic_id = (int) $topic_id;
|
||||||
$post_id = (int) $post_id;
|
$post_id = (int) $post_id;
|
||||||
$icon_id = 0;
|
|
||||||
|
|
||||||
$post_edit_locked = (isset($post_edit_locked)) ? (int) $post_edit_locked : 0;
|
$post_edit_locked = (isset($post_edit_locked)) ? (int) $post_edit_locked : 0;
|
||||||
|
|
||||||
|
@ -857,26 +856,24 @@ if (($mode == 'reply' || $mode == 'quote') && !$preview && !$refresh)
|
||||||
// Forum moderators?
|
// Forum moderators?
|
||||||
get_moderators($moderators, $forum_id);
|
get_moderators($moderators, $forum_id);
|
||||||
|
|
||||||
|
|
||||||
// Generate smilie listing
|
// Generate smilie listing
|
||||||
generate_smilies('inline', $forum_id);
|
generate_smilies('inline', $forum_id);
|
||||||
|
|
||||||
|
|
||||||
// Generate Topic icons
|
|
||||||
$s_topic_icons = false;
|
|
||||||
if ($enable_icons)
|
|
||||||
{
|
|
||||||
$s_topic_icons = posting_gen_topic_icons($mode, $icon_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate inline attachment select box
|
// Generate inline attachment select box
|
||||||
posting_gen_inline_attachments($message_parser);
|
posting_gen_inline_attachments($message_parser);
|
||||||
|
|
||||||
// Topic type selection ... only for first post in topic.
|
|
||||||
$topic_type_toggle = false;
|
// Do show topic icons and topic type selection only in first post.
|
||||||
|
$topic_type_toggle = $s_topic_icons = false;
|
||||||
|
|
||||||
if ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id))
|
if ($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id))
|
||||||
{
|
{
|
||||||
$topic_type_toggle = posting_gen_topic_types($forum_id, $topic_type);
|
$topic_type_toggle = posting_gen_topic_types($forum_id, $topic_type);
|
||||||
|
|
||||||
|
if ($enable_icons)
|
||||||
|
{
|
||||||
|
$s_topic_icons = posting_gen_topic_icons($mode, $icon_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,7 @@ function checkForm()
|
||||||
<td class="row1"><b class="genmed">{L_ICON}:</b></td>
|
<td class="row1"><b class="genmed">{L_ICON}:</b></td>
|
||||||
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
|
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
|
||||||
<tr>
|
<tr>
|
||||||
<td><input type="radio" name="icon" value="0" checked="checked" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
|
<td><input type="radio" name="icon" value="0" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table></td>
|
</table></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Add table
Reference in a new issue