From: <ir...@us...> - 2012-08-04 10:33:57
|
Revision: 9984 http://xoops.svn.sourceforge.net/xoops/?rev=9984&view=rev Author: irmtfan Date: 2012-08-04 10:33:49 +0000 (Sat, 04 Aug 2012) Log Message: ----------- bug fix in polls.php templates hardcore removed Modified Paths: -------------- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt XoopsModules/newbb/branches/irmtfan/newbb/polls.php XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block.html XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_author.html XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_post.html XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_text.html XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_topic.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_edit_post.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_results.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_view.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_search.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_searchresults.html XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum_subforum.html Added Paths: ----------- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css Removed Paths: ------------- XoopsModules/newbb/branches/irmtfan/newbb/templates/style.css Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev9883.txt 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,4 +1,11 @@ Changelog from rev.9883 +date: 2012-08-04 +================================================ +1- bug fixed: error in newbb/polls.php when the strtotime is not defined in XoopsLocal class (irmtfan) +solution: replace XoopsLocal::strtotime($end_time) by method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time) +in newbb/polls.php +2- more hardcodes in newbb/templates has been removed + date: 2012-08-01 ================================================ 1- localization: input date localized (for other date systems like hegira) by replacing strtotime by XoopsLocal::strtotime Modified: XoopsModules/newbb/branches/irmtfan/newbb/polls.php =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/polls.php 2012-08-04 10:33:49 UTC (rev 9984) @@ -181,7 +181,8 @@ $timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null; // Start user input time in hegira date - hacked by irmtfan (www.jadoogaran.org) // $_POST['end_time']=inputTimeToGregorian($_POST['end_time']); - $poll->setVar("end_time", userTimeToServerTime(XoopsLocal::strtotime($_POST['end_time']), $timezone)); +// if method is not exist use the original strtotime function + $poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($_POST['end_time']) : strtotime($_POST['end_time']), $timezone)); // End user input time in hegira date - hacked by irmtfan (www.jadoogaran.org) } else { // if expiration date is not set, set it to 10 days from now @@ -327,7 +328,8 @@ $timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null; // Start user input time in hegira date - hacked by irmtfan (www.jadoogaran.org) // $end_time=inputTimeToGregorian($end_time); - $poll->setVar("end_time", userTimeToServerTime(XoopsLocal::strtotime($end_time), $timezone)); +// if method is not exist use the original strtotime function + $poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone)); // End user input time in hegira date - hacked by irmtfan (www.jadoogaran.org) } @@ -535,7 +537,8 @@ $timezone = is_object($xoopsUser) ? $xoopsUser->getVar("timezone") : null; // Start user input time in hegira date - hacked by irmtfan (www.jadoogaran.org) // $end_time=inputTimeToGregorian($end_time); - $poll->setVar("end_time", userTimeToServerTime(XoopsLocal::strtotime($end_time), $timezone)); +// if method is not exist use the original strtotime function + $poll->setVar("end_time", userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone)); // End user input time in hegira date - hacked by irmtfan (www.jadoogaran.org) } else { $poll->setVar("end_time", time() + (86400 * 10)); Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,55 +1,58 @@ -<table class="outer" cellspacing="1"> - <{if $block.disp_mode == 0}> - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_FORUM}></th> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_RPLS}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_VIEWS}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_LPOST}></th> - </tr> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_forum_url}></td> - <td><{$topic.seo_url}></td> - <td align="center"><{$topic.replies}></td> - <td align="center"><{$topic.views}></td> - <td align="right"><{$topic.time}><br /><{$topic.topic_poster}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 1}> - - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_RPLS}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_LPOST}></th> - </tr> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_url}></td> - <td align="center"><{$topic.replies}></td> - <td align="right"><{$topic.time}><br /><{$topic.topic_poster}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 2}> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_url}></td> - </tr> - <{/foreach}> - - <{/if}> - -</table> - -<{if $block.indexNav}> - <div style="text-align:right; padding: 5px;"> - <{$block.seo_top_allposts}> | - <{$block.seo_top_alltopics}> | - <{$block.seo_top_allforums}> - </div> +<table class="outer" cellspacing="1"> + <{if $block.disp_mode == 0}> + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_FORUM}></th> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_RPLS}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_VIEWS}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_LPOST}></th> + </tr> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_forum_url}></td> + <td><{$topic.seo_url}></td> + <td align="center"><{$topic.replies}></td> + <td align="center"><{$topic.views}></td> +<!-- irmtfan hardcode removed align="right" --> + <td class="align_right"><{$topic.time}><br /><{$topic.topic_poster}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 1}> + + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_RPLS}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_LPOST}></th> + </tr> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_url}></td> + <td align="center"><{$topic.replies}></td> +<!-- irmtfan hardcode removed align="right" --> + <td class="align_right"><{$topic.time}><br /><{$topic.topic_poster}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 2}> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_url}></td> + </tr> + <{/foreach}> + + <{/if}> + +</table> + +<{if $block.indexNav}> +<!-- irmtfan hardcode removed style="text-align:right; padding: 5px;" --> + <div class="pagenav"> + <{$block.seo_top_allposts}> | + <{$block.seo_top_alltopics}> | + <{$block.seo_top_allforums}> + </div> <{/if}> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_author.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_author.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_author.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,31 +1,32 @@ -<table class="outer" cellspacing="1"> - - <{if $block.disp_mode == 0}> - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_COUNT}></th> - </tr> - - <{foreachq item=author key=uid from=$block.authors}> - <tr class="<{cycle values="even,odd"}>"> - <td><a href="<{$xoops_url}>/userinfo.php?uid=<{$uid}>"><{$author.name}></a></td> - <td align="center"><{$author.count}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 1}> - - <{foreachq item=author key=uid from=$block.authors}> - <tr class="<{cycle values="even,odd"}>"> - <td><a href="<{$xoops_url}>/userinfo.php?uid=<{$uid}>"><{$author.name}></a> <{$author.count}></td> - </tr> - <{/foreach}> - - <{/if}> - -</table> -<{if $block.indexNav}> -<div style="text-align:right; padding: 5px;"> -<a href="<{$xoops_url}>/modules/newbb/"><{$smarty.const._MB_NEWBB_VSTFRMS}></a> -</div> +<table class="outer" cellspacing="1"> + + <{if $block.disp_mode == 0}> + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_COUNT}></th> + </tr> + + <{foreachq item=author key=uid from=$block.authors}> + <tr class="<{cycle values="even,odd"}>"> + <td><a href="<{$xoops_url}>/userinfo.php?uid=<{$uid}>"><{$author.name}></a></td> + <td align="center"><{$author.count}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 1}> + + <{foreachq item=author key=uid from=$block.authors}> + <tr class="<{cycle values="even,odd"}>"> + <td><a href="<{$xoops_url}>/userinfo.php?uid=<{$uid}>"><{$author.name}></a> <{$author.count}></td> + </tr> + <{/foreach}> + + <{/if}> + +</table> +<{if $block.indexNav}> +<!-- irmtfan hardcode removed style="text-align:right; padding: 5px;" --> +<div class="pagenav"> +<a href="<{$xoops_url}>/modules/newbb/"><{$smarty.const._MB_NEWBB_VSTFRMS}></a> +</div> <{/if}> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_post.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_post.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_post.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,61 +1,64 @@ -<table class="outer" cellspacing="1"> -<{if $block.disp_mode == 0}> - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_FORUM}></th> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TITLE}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> - </tr> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_forum_url}></td> - <td><{$topic.seo_url}></td> - <td align="right"><{$topic.time}><br /><{$topic.topic_poster}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 1}> - - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> - </tr> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_url}></td> - <td align="right"><{$topic.time}><br /><{$topic.topic_poster}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 2}> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_url}></td> - </tr> - <{/foreach}> - -<{else}> - <tr> - <td> - <{foreachq item=topic from=$block.topics}> - <div><strong><a href="<{$xoops_url}>/modules/newbb/viewtopic.php?forum=<{$topic.forum_id}>&post_id=<{$topic.post_id}>#forumpost<{$topic.post_id}>"><{$topic.title}></a></strong></div> - <div> - <a href="<{$xoops_url}>/modules/newbb/viewforum.php?forum=<{$topic.forum_id}>"><{$topic.forum_name}></a> | - <{$topic.topic_poster}> | <{$topic.time}> - </div> - <div style="padding: 5px 0px 10px 0px;"><{$topic.post_text}></div> - <{/foreach}> - </td> - </tr> - <{/if}> - -</table> - -<{if $block.indexNav}> - <div style="text-align:right; padding: 5px;"> - <{$block.seo_top_allposts}> | - <{$block.seo_top_allforums}> - </div> +<table class="outer" cellspacing="1"> +<{if $block.disp_mode == 0}> + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_FORUM}></th> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TITLE}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> + </tr> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_forum_url}></td> + <td><{$topic.seo_url}></td> +<!-- irmtfan hardcode removed align="right" --> + <td class="align_right"><{$topic.time}><br /><{$topic.topic_poster}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 1}> + + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> + </tr> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_url}></td> +<!-- irmtfan hardcode removed align="right" --> + <td class="align_right"><{$topic.time}><br /><{$topic.topic_poster}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 2}> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_url}></td> + </tr> + <{/foreach}> + +<{else}> + <tr> + <td> + <{foreachq item=topic from=$block.topics}> + <div><strong><a href="<{$xoops_url}>/modules/newbb/viewtopic.php?forum=<{$topic.forum_id}>&post_id=<{$topic.post_id}>#forumpost<{$topic.post_id}>"><{$topic.title}></a></strong></div> + <div> + <a href="<{$xoops_url}>/modules/newbb/viewforum.php?forum=<{$topic.forum_id}>"><{$topic.forum_name}></a> | + <{$topic.topic_poster}> | <{$topic.time}> + </div> + <div style="padding: 5px 0px 10px 0px;"><{$topic.post_text}></div> + <{/foreach}> + </td> + </tr> + <{/if}> + +</table> + +<{if $block.indexNav}> +<!-- irmtfan hardcode removed style="text-align:right; padding: 5px;" --> + <div class="pagenav"> + <{$block.seo_top_allposts}> | + <{$block.seo_top_allforums}> + </div> <{/if}> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_text.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_text.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_text.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,15 +1,16 @@ -<{foreachq item=topic from=$block.topics}> -<div><strong><a href="<{$xoops_url}>/modules/newbb/viewtopic.php?forum=<{$topic.forum_id}>&post_id=<{$topic.post_id}>#forumpost<{$topic.post_id}>"><{$topic.title}></a></strong></div> -<div> -<a href="<{$xoops_url}>/modules/newbb/viewforum.php?forum=<{$topic.forum_id}>"><{$topic.forum_name}></a> -<{$topic.topic_poster}> <{$topic.time}> -</div> -<div style="padding: 5px 0px 10px 0px;"><{$topic.post_text}></div> -<{/foreach}> - -<{if $block.indexNav}> -<div style="text-align:right; padding: 5px;"> -<a href="<{$xoops_url}>/modules/newbb/viewpost.php"><{$smarty.const._MB_NEWBB_ALLPOSTS}></a> | -<a href="<{$xoops_url}>/modules/newbb/"><{$smarty.const._MB_NEWBB_VSTFRMS}></a> -</div> +<{foreachq item=topic from=$block.topics}> +<div><strong><a href="<{$xoops_url}>/modules/newbb/viewtopic.php?forum=<{$topic.forum_id}>&post_id=<{$topic.post_id}>#forumpost<{$topic.post_id}>"><{$topic.title}></a></strong></div> +<div> +<a href="<{$xoops_url}>/modules/newbb/viewforum.php?forum=<{$topic.forum_id}>"><{$topic.forum_name}></a> +<{$topic.topic_poster}> <{$topic.time}> +</div> +<div style="padding: 5px 0px 10px 0px;"><{$topic.post_text}></div> +<{/foreach}> + +<{if $block.indexNav}> +<!-- irmtfan hardcode removed style="text-align:right; padding: 5px;" --> +<div class="pagenav"> +<a href="<{$xoops_url}>/modules/newbb/viewpost.php"><{$smarty.const._MB_NEWBB_ALLPOSTS}></a> | +<a href="<{$xoops_url}>/modules/newbb/"><{$smarty.const._MB_NEWBB_VSTFRMS}></a> +</div> <{/if}> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_topic.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_topic.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/blocks/newbb_block_topic.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,53 +1,56 @@ -<table class="outer" cellspacing="1"> - - <{if $block.disp_mode == 0}> - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_FORUM}></th> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TITLE}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_RPLS}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_VIEWS}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> - </tr> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_forum_url}></td> - <td><{$topic.seo_url}></td> - <td align="center"><{$topic.replies}></td> - <td align="center"><{$topic.views}></td> - <td align="right"><{$topic.time}><br /><{$topic.topic_poster}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 1}> - - <tr> - <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> - <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> - </tr> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_url}></td> - <td align="right"><{$topic.time}><br /><{$topic.topic_poster}></td> - </tr> - <{/foreach}> - - <{elseif $block.disp_mode == 2}> - - <{foreachq item=topic from=$block.topics}> - <tr class="<{cycle values="even,odd"}>"> - <td><{$topic.seo_url}></td> - </tr> - <{/foreach}> - - <{/if}> - -</table> - -<{if $block.indexNav}> - <div style="text-align:right; padding: 5px;"> - <{$block.seo_top_allposts}> | - <{$block.seo_top_allforums}> - </div> +<table class="outer" cellspacing="1"> + + <{if $block.disp_mode == 0}> + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_FORUM}></th> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TITLE}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_RPLS}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_VIEWS}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> + </tr> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_forum_url}></td> + <td><{$topic.seo_url}></td> + <td align="center"><{$topic.replies}></td> + <td align="center"><{$topic.views}></td> +<!-- irmtfan hardcode removed align="right" --> + <td class="align_right"><{$topic.time}><br /><{$topic.topic_poster}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 1}> + + <tr> + <th class="head" nowrap="nowrap"><{$smarty.const._MB_NEWBB_TOPIC}></th> + <th class="head" align="center" nowrap="nowrap"><{$smarty.const._MB_NEWBB_AUTHOR}></th> + </tr> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_url}></td> +<!-- irmtfan hardcode removed align="right" --> + <td class="align_right"><{$topic.time}><br /><{$topic.topic_poster}></td> + </tr> + <{/foreach}> + + <{elseif $block.disp_mode == 2}> + + <{foreachq item=topic from=$block.topics}> + <tr class="<{cycle values="even,odd"}>"> + <td><{$topic.seo_url}></td> + </tr> + <{/foreach}> + + <{/if}> + +</table> + +<{if $block.indexNav}> +<!-- irmtfan hardcode removed style="text-align:right; padding: 5px;" --> + <div class="pagenav"> + <{$block.seo_top_allposts}> | + <{$block.seo_top_allforums}> + </div> <{/if}> \ No newline at end of file Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css (rev 0) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/english/style.css 2012-08-04 10:33:49 UTC (rev 9984) @@ -0,0 +1,316 @@ +/* -- style.css -- */ +.forum_header { + float : center; + overflow : hidden; + border : 1px solid #aaaaaa; + width : 100%; +} + +.forum_title { + float : left; + text-align : left; + padding : 5px; + width : 100%; + +} + +.forum_title a { + font-weight: bold; +} + + +.forum_stats { + float:center; + overflow:hidden; + text-align:left; + /* border:1px solid #aaaaaa; */ + padding:5px; +} + +.forum_stats_left { + float: left; + text-align: left; + width:45%; +} + +.forum_stats_right { + float: right; + text-align: right; + width:45%; +} + +.forum_body { + margin-top: -10px; + padding-top: 20px; + float:center; + width:99%; + overflow:hidden; +} + +.forum_footer { + float:center; + width:99%; + overflow:hidden; +} + +.index_category{ + border: 0px; + /*margin-top: -10px; + margin-bottom: 5px;*/ +} + +.ThreadUserName a { + font-weight: bold; + margin-bottom: 2px; + /*color: #000; irmtfan */ +} + +.ThreadTitle, .ThreadTitle a{ + font-weight: bold; + margin-bottom: 2px; + /*color: #fff; irmtfan */ +} + +.icon_left { + float: left; text-align: left; +} + +.icon_right { + float: right; text-align: right; +} + +div.karma +{ + background-color: transparent; + text-align: left; + border-top: 1px solid #DDDDFF; + border-left: 1px solid #DDDDFF; + border-right: 1px solid #AAAAAA; + border-bottom: 1px solid #AAAAAA; + padding: 10px; +} + +span.digest +{ +} + +span.index_title{ + float: left; + border: 0px; +} + +span.index_extra{ + float: right; + padding: 2px; + border: 0px; +} + +div.signature { + bottom: 10px; +} + +div#index_welcome{ + margin: 10px; + margin-bottom: 10px; +} +html>body div#index_welcome { + margin-bottom: 15px; +} + +#index_welcome div.title{ + font-size: 18px; + font-weight: bold; + border-bottom: dashed 1px; + padding: 5px; +} + +#index_welcome div.desc{ + padding: 5px; + font-size: 12px; + color: #000; +} + +#index_welcome div.visit{ + padding: 10px 5px; +} + +.left { text-align: left; } +.right { text-align: right; } +.floatleft { float: left;} +.floatright { float: right;} + +#index_forum a{ + font-weight: bold; +} + +table.index_category{ + border: 0px; + margin-top: -10px; + margin-bottom: 5px; +} + +table.index_category td{ + padding: 2px; +} + +table.index_category td a:first-letter{} + +table.index_category .desc, table.index_category .desc a{ + font-weight: normal !important; + padding-left: 0; + margin-top: 5px; + margin-bottom: 0px; +} + +table.index_category .desc:first-letter, table.index_category .desc a:first-letter{} + +#index_forum span.item{ + padding: 0px 0px 0px 0px; + margin: 0px; + border: 0px; +} + +#index_forum span.extra{ + float: right; + text-align: left; + margin: 0px; +} + +div#forum_header{ + margin: 5px; +} +#forum_header div{ + padding-top: 5px; +} + + + +/* -- dropdown menu -- */ + +div.dropdown{ + float: left; +} + +div.dropdown .menu, div.dropdown .userbar{ + font-weight: bold; + float: left; + margin: 0px 1px; + border: 0px !important; + padding: 0px; +} + +div.dropdown .item{ + font-weight: bold; + padding: 2px 5px; + white-space: nowrap; + border: 0px !important; +} + +div.dropdown ul, div.dropdown table { + width: 135px; +} +/* -- dropdown menu -- */ + +/* -- user level -- */ +table.userlevel{ + width: 90%; + border: 0px; + padding: 0px; + border-collapse: collapse; + border-spacing: 0; + text-align: left; +} + +table.userlevel td{ + height: 13px; + padding: 0px; +} + +table.userlevel td.end{ + width: 3px; +} + +table.userlevel td.end img{ + width: 3px; + height: 13px; +} + +table.userlevel td.center{ + width: 100%; +} + +table.userlevel td.center img{ + height: 12px; +} +/* -- user level -- */ + +span.online_admin{ + color:#FFA34F; +} + +span.online_moderator{ + color:#006600; +} + + +/* + * From http://www.positioniseverything.net/easyclearing.html + */ +.clear:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.clear {display: inline-table;} +/* Hides from IE-mac \*/ +* html .clear {height: 1%;} +.clear {display: block;} +/* End hide from IE-mac */ + +/* color -- dropdown menu for Forum */ +div.dropdown a, div.dropdown .menubar a{ + /* irmtfan remove hardcode color color:#FFF; */ +} + +div.dropdown .menu, div.dropdown .menubar, div.dropdown .item, div.dropdown .separator{ + /* irmtfan remove hardcode color background-color: #436792;*/ + /* same color set as in your theme/style.ss .th{} is recommended */ + /* irmtfan remove hardcode color color:#FFF; */ +} + +div.dropdown .separator{ + border: 1px inset #e0e0e0; +} + +div.dropdown .menu a:hover, div.dropdown .userbar a:hover{ + color: #333; +} +/* irmtfan class added for solve some hard codes */ +.post_edit { + float: right; + padding: 5px; + margin-top: 10px; + border:1px solid #000; +} +.post_ip { + float: right; + padding: 5px; + margin-top: 10px; +} +.pagenav { + float: right; + text-align: right; + padding: 5px; +} +.align_left, #align_left { + margin-left: 0; + text-align: left; +} +.align_right, #align_right { + margin-right: 0; + text-align: right; +} + +/* color - end */ \ No newline at end of file Added: XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css (rev 0) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/images/language/persian/style.css 2012-08-04 10:33:49 UTC (rev 9984) @@ -0,0 +1,322 @@ +/* -- style.css -- */ +.forum_header { + float : center; + overflow : hidden; + border : 1px solid #aaaaaa; + width : 100%; +} + +.forum_title { + float : /*irmtfan left*/ right; + text-align : /*irmtfan left*/ right; + padding : 5px; + width : 100%; + +} + +.forum_title a { + font-weight: bold; +} + + +.forum_stats { + float:center; + overflow:hidden; + text-align:/*irmtfan left*/right; + /* border:1px solid #aaaaaa; */ + padding:5px; +} + +.forum_stats_left { + float: /*irmtfan left*/ right; + text-align: /*irmtfan left*/ right; + width:45%; +} + +.forum_stats_right { + float: /*irmtfan right*/left; + text-align: /*irmtfan right*/ left; + width:45%; +} + +.forum_body { + margin-top: -10px; + padding-top: 20px; + float:center; + width:99%; + overflow:hidden; +} + +.forum_footer { + float:center; + width:99%; + overflow:hidden; +} + +.index_category{ + border: 0px; + /*margin-top: -10px; + margin-bottom: 5px;*/ +} + +.ThreadUserName a { + font-weight: bold; + margin-bottom: 2px; + /*color: #000; irmtfan */ +} + +.ThreadTitle, .ThreadTitle a{ + font-weight: bold; + margin-bottom: 2px; + /*color: #fff; irmtfan */ +} + +.icon_left { + float: /*irmtfan left*/ right; text-align: /*irmtfan left*/ right; +} + +.icon_right { + float: /*irmtfan right*/ left; text-align: /*irmtfan right*/ left; +} + +div.karma +{ + background-color: transparent; + text-align: left; + border-top: 1px solid #DDDDFF; + border-left: 1px solid #DDDDFF; + border-right: 1px solid #AAAAAA; + border-bottom: 1px solid #AAAAAA; + padding: 10px; +} + +span.digest +{ +} + +span.index_title{ + float: /*irmtfan left*/ right; + border: 0px; +} + +span.index_extra{ + float: /*irmtfan right*/ left; + padding: 2px; + border: 0px; +} + +div.signature { + bottom: 10px; +} + +div#index_welcome{ + margin: 10px; + margin-bottom: 10px; +} +html>body div#index_welcome { + margin-bottom: 15px; +} + +#index_welcome div.title{ + font-size: 18px; + font-weight: bold; + border-bottom: dashed 1px; + padding: 5px; +} + +#index_welcome div.desc{ + padding: 5px; + font-size: 12px; + color: #000; +} + +#index_welcome div.visit{ + padding: 10px 5px; +} + +.left { text-align: /*irmtfan left*/ right; } +.right { text-align: /*irmtfan right*/ left; } +.floatleft { float: /*irmtfan left*/ right;} +.floatright { float: /*irmtfan right*/ left;} + +#index_forum a{ + font-weight: bold; +} + +table.index_category{ + border: 0px; + margin-top: -10px; + margin-bottom: 5px; +} + +table.index_category td{ + padding: 2px; +} + +table.index_category td a:first-letter{} + +table.index_category .desc, table.index_category .desc a{ + font-weight: normal !important; + /* irmtfan padding-left: 0; */ padding-right: 0; + margin-top: 5px; + margin-bottom: 0px; +} + +table.index_category .desc:first-letter, table.index_category .desc a:first-letter{} + +#index_forum span.item{ + padding: 0px 0px 0px 0px; + margin: 0px; + border: 0px; +} + +#index_forum span.extra{ + float: /*irmtfan right*/ left; + text-align: /*irmtfan left*/ right; + margin: 0px; +} + +div#forum_header{ + margin: 5px; +} +#forum_header div{ + padding-top: 5px; +} + + + +/* -- dropdown menu -- */ + +div.dropdown{ + float: /*irmtfan left*/ right; +} + +div.dropdown .menu, div.dropdown .userbar{ + font-weight: bold; + float: /*irmtfan left*/ right; + margin: 0px 1px; + border: 0px !important; + padding: 0px; +} + +div.dropdown .item{ + font-weight: bold; + padding: 2px 5px; + white-space: nowrap; + border: 0px !important; +} + +div.dropdown ul, div.dropdown table { + width: 135px; +} +/* -- dropdown menu -- */ + +/* -- user level -- */ +table.userlevel{ + width: 90%; + border: 0px; + padding: 0px; + border-collapse: collapse; + border-spacing: 0; + text-align: /*irmtfan left*/ right; +} + +table.userlevel td{ + height: 13px; + padding: 0px; +} + +table.userlevel td.end{ + width: 3px; +} + +table.userlevel td.end img{ + width: 3px; + height: 13px; +} + +table.userlevel td.center{ + width: 100%; +} + +table.userlevel td.center img{ + height: 12px; +} +/* -- user level -- */ + +span.online_admin{ + color:#FFA34F; +} + +span.online_moderator{ + color:#006600; +} + + +/* + * From http://www.positioniseverything.net/easyclearing.html + */ +.clear:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.clear {display: inline-table;} +/* Hides from IE-mac \*/ +* html .clear {height: 1%;} +.clear {display: block;} +/* End hide from IE-mac */ + +/* color -- dropdown menu for Forum */ +div.dropdown a, div.dropdown .menubar a{ + /* irmtfan remove hardcode color color:#FFF; */ +} + +div.dropdown .menu, div.dropdown .menubar, div.dropdown .item, div.dropdown .separator{ + /* irmtfan remove hardcode color background-color: #436792;*/ + /* same color set as in your theme/style.ss .th{} is recommended */ + /* irmtfan remove hardcode color color:#FFF; */ +} + +div.dropdown .separator{ + border: 1px inset #e0e0e0; +} + +div.dropdown .menu a:hover, div.dropdown .userbar a:hover{ + color: #333; +} +/* irmtfan class added for solve some hard codes */ +.post_edit { + float: /*irmtfan right*/ left; + padding: 5px; + margin-top: 10px; + border:1px solid #000; +} +.post_ip { + float: /*irmtfan right*/ left; + padding: 5px; + margin-top: 10px; +} +.pagenav { + float: /*irmtfan right*/ left; + text-align: /*irmtfan right*/ left; + padding: 5px; +} +.align_left, #align_left { + direction: rtl; + /* irmtfan margin-left: 0; */ margin-right: 0; + text-align: /*irmtfan left*/ right; +} +.align_right, #align_right { + direction: rtl; + /* irmtfan margin-right: 0; */ margin-left: 0; + text-align: /*irmtfan right*/ left; +} +.poll { + direction: rtl; + text-align: center; + margin: 3px; +} +/* color - end */ \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_edit_post.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_edit_post.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_edit_post.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,89 +1,90 @@ -<div class="forum_header"> - <div class="forum_title"> - <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$lang_forum_index}></a></h2> - <hr align="left" width="50%" size="1" /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$smarty.const._MD_FORUMINDEX}></a> - <span class="delimiter">»</span> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.id}>"><{$category.title}></a> - <{if $parentforum}> - <{foreachq item=forum from=$parentforum}> - <span class="delimiter">»</span> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a> - <{/foreach}> - <{/if}> - <span class="delimiter">»</span> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a> - <span class="delimiter">»</span> - <strong><{$form_title}></strong> - </div> -</div> -<div class="clear"></div> -<br /> - -<{if $disclaimer}> - <div class="confirmMsg"><{$disclaimer}></div> - <div class="clear"></div> - <br /> -<{/if}> - -<{if $error_message}> - <div class="errorMsg"><{$error_message}></div> - <div class="clear"></div> - <br /> -<{/if}> - -<{if $post_preview}> -<table width='100%' class='outer' cellspacing='1'> - <tr valign="top"> - <td class="head"><{$post_preview.subject}></td> - </tr> - <tr valign="top"> - <td><{$post_preview.meta}><br /><br /> - <{$post_preview.content}> - </td> - </tr> -</table> -<div class="clear"></div> -<br /> -<{/if}> - -<form name="<{$form_post.name}>" id="<{$form_post.name}>" action="<{$form_post.action}>" method="<{$form_post.method}>" <{$form_post.extra}> > -<table width='100%' class='outer' cellspacing='1'> -<{foreachq item=element from=$form_post.elements}> - <{if $element.hidden != true}> - <tr valign="top"> - <td class="head"> - <div class="xoops-form-element-caption<{if $element.required}>-required<{/if}>"><span class="caption-text"><{$element.caption}></span><span class="caption-marker">*</span></div> - <{if $element.description != ''}> - <div class="xoops-form-element-help"><{$element.description}></div> - <{/if}> - </td> - <td class="odd" style="white-space: nowrap;"><{$element.body}></td> - </tr> - <{/if}> -<{/foreach}> -</table> -<{foreachq item=element from=$form_post.elements}> - <{if $element.hidden == true}> - <{$element.body}> - <{/if}> -<{/foreach}> -</form> -<{$form_post.javascript}> -<div class="clear"></div> -<br /> - -<{if $posts_context}> -<table width='100%' class='outer' cellspacing='1'> -<{foreachq item=post from=$posts_context}> - <tr valign="top"> - <td class="head"><{$post.subject}></td> - </tr> - <tr valign="top"> - <td><{$post.meta}><br /><br /> - <{$post.content}> - </td> - </tr> -<{/foreach}> -</table> +<div class="forum_header"> + <div class="forum_title"> + <h2><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$lang_forum_index}></a></h2> +<!-- irmtfan hardcode removed align="left" --> + <hr class="align_left" width="50%" size="1" /> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$smarty.const._MD_FORUMINDEX}></a> + <span class="delimiter">»</span> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php?cat=<{$category.id}>"><{$category.title}></a> + <{if $parentforum}> + <{foreachq item=forum from=$parentforum}> + <span class="delimiter">»</span> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum.forum_id}>"><{$forum.forum_name}></a> + <{/foreach}> + <{/if}> + <span class="delimiter">»</span> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$forum_id}>"><{$forum_name}></a> + <span class="delimiter">»</span> + <strong><{$form_title}></strong> + </div> +</div> +<div class="clear"></div> +<br /> + +<{if $disclaimer}> + <div class="confirmMsg"><{$disclaimer}></div> + <div class="clear"></div> + <br /> +<{/if}> + +<{if $error_message}> + <div class="errorMsg"><{$error_message}></div> + <div class="clear"></div> + <br /> +<{/if}> + +<{if $post_preview}> +<table width='100%' class='outer' cellspacing='1'> + <tr valign="top"> + <td class="head"><{$post_preview.subject}></td> + </tr> + <tr valign="top"> + <td><{$post_preview.meta}><br /><br /> + <{$post_preview.content}> + </td> + </tr> +</table> +<div class="clear"></div> +<br /> +<{/if}> + +<form name="<{$form_post.name}>" id="<{$form_post.name}>" action="<{$form_post.action}>" method="<{$form_post.method}>" <{$form_post.extra}> > +<table width='100%' class='outer' cellspacing='1'> +<{foreachq item=element from=$form_post.elements}> + <{if $element.hidden != true}> + <tr valign="top"> + <td class="head"> + <div class="xoops-form-element-caption<{if $element.required}>-required<{/if}>"><span class="caption-text"><{$element.caption}></span><span class="caption-marker">*</span></div> + <{if $element.description != ''}> + <div class="xoops-form-element-help"><{$element.description}></div> + <{/if}> + </td> + <td class="odd" style="white-space: nowrap;"><{$element.body}></td> + </tr> + <{/if}> +<{/foreach}> +</table> +<{foreachq item=element from=$form_post.elements}> + <{if $element.hidden == true}> + <{$element.body}> + <{/if}> +<{/foreach}> +</form> +<{$form_post.javascript}> +<div class="clear"></div> +<br /> + +<{if $posts_context}> +<table width='100%' class='outer' cellspacing='1'> +<{foreachq item=post from=$posts_context}> + <tr valign="top"> + <td class="head"><{$post.subject}></td> + </tr> + <tr valign="top"> + <td><{$post.meta}><br /><br /> + <{$post.content}> + </td> + </tr> +<{/foreach}> +</table> <{/if}> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_results.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_results.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_results.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,21 +1,24 @@ -<div style="text-align: center; margin: 3px;"> - <table width="100%" class="outer" cellspacing="1"> - <tr> - <th colspan="2"><{$poll.question}></th> - </tr> - <tr> - <td class="head" align="right" colspan="2"><{$poll.end_text}> </td> - </tr> -<{foreachq item=option from=$poll.options}> - <tr> - <td class="even" width="30%" align="left"><{$option.text}> </td> - <td class="odd" width="70%" align="left"><{$option.image}> <{$option.percent}> </td> - </tr> -<{/foreach}> - <tr> - <td class="foot" colspan="2" align="center"><{$poll.totalVotes}><br /> -<{$poll.totalVoters}></td> - </tr> - </table> -</div> +<!-- irmtfan hardcode removed style="text-align: center;margin: 3px;" --> +<div class="poll"> + <table width="100%" class="outer" cellspacing="1"> + <tr> + <th colspan="2"><{$poll.question}></th> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right" colspan="2"><{$poll.end_text}> </td> + </tr> +<{foreachq item=option from=$poll.options}> + <tr> +<!-- irmtfan hardcode removed align="left" --> + <td class="even" id="align_left" width="30%"><{$option.text}></td> + <td class="odd" id="align_left" width="70%"><{$option.image}> <{$option.percent}></td> + </tr> +<{/foreach}> + <tr> + <td class="foot" colspan="2" align="center"><{$poll.totalVotes}><br /> +<{$poll.totalVoters}></td> + </tr> + </table> +</div> <br /> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_view.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_view.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_poll_view.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,19 +1,20 @@ -<form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/votepolls.php" method="post"> - <input type="hidden" name="topic_id" value="<{$topic_id}>" /> - <input type="hidden" name="forum" value="<{$forum_id}>" /> - <table width="100%" class="outer" cellspacing="1"> - <tr> - <th align="center" colspan="2"><input type="hidden" name="poll_id" value="<{$poll.pollId}>" /> -<{$poll.question}></th> - </tr> -<{foreachq item=option from=$poll.options}> - <tr> - <td class="even" align="left" width="2%"><{$option.input}></td> - <td class="odd" align="left" width="98%"><{$option.text}></td> - </tr> -<{/foreach}> - <tr> - <td align="center" colspan="2" class="foot"><input type="submit" value="<{$lang_vote}>" /></td> - </tr> - </table> +<form action="<{$xoops_url}>/modules/<{$xoops_dirname}>/votepolls.php" method="post"> + <input type="hidden" name="topic_id" value="<{$topic_id}>" /> + <input type="hidden" name="forum" value="<{$forum_id}>" /> + <table width="100%" class="outer" cellspacing="1"> + <tr> + <th align="center" colspan="2"><input type="hidden" name="poll_id" value="<{$poll.pollId}>" /> +<{$poll.question}></th> + </tr> +<{foreachq item=option from=$poll.options}> + <tr> +<!-- irmtfan hardcode removed align="left" --> + <td class="even" id="align_left" width="2%"><{$option.input}></td> + <td class="odd" id="align_left" width="98%"><{$option.text}></td> + </tr> +<{/foreach}> + <tr> + <td align="center" colspan="2" class="foot"><input type="submit" value="<{$lang_vote}>" /></td> + </tr> + </table> </form> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_search.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_search.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_search.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,69 +1,78 @@ -<div id="forum_header"> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$forumindex}></a> - > - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._SR_SEARCH}></a> -</div> - -<{if $search_info}> -<{includeq file="db:newbb_searchresults.html" results=$results}> -<{/if}> -<form name="Search" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="get"> - <table class="outer" border="0" cellpadding="1" cellspacing="0" align="center" width="95%"> - <tr> - <td><table border="0" cellpadding="1" cellspacing="1" width="100%" class="head"> - <tr> - <td class="head" width="10%" align="right"><strong><{$smarty.const._SR_KEYWORDS}></strong> </td> - <td class="even"><input type="text" name="term" /></td> - </tr> - <tr> - <td class="head" align="right"><strong><{$smarty.const._SR_TYPE}></strong> </td> - <td class="even"> - <select name="andor"> - <option value="or" selected="selected"><{$smarty.const._SR_ANY}></option> - <option value="all"><{$smarty.const._SR_ALL}></option> - <option value="exact"><{$smarty.const._SR_EXACT}></option> - </select> - </td> - </tr> - <tr> - <td class="head" align="right"><strong><{$smarty.const._MD_FORUMC}></strong> </td> - <td class="even"><{$forum_selection_box}></td> - </tr> - <tr> - <td class="head" align="right"><strong><{$smarty.const._SR_SEARCHIN}></strong> </td> - <td class="even"><input type="radio" name="searchin" value="title" /><{$smarty.const._MD_SUBJECT}> - <input type="radio" name="searchin" value="text" /><{$smarty.const._MD_BODY}> - <input type="radio" name="searchin" value="both" checked="checked" /><{$smarty.const._MD_SUBJECT}> & <{$smarty.const._MD_BODY}> </td> - </tr> - <tr> - <td class="head" align="right"><strong><{$smarty.const._MD_AUTHOR}></strong> </td> - <td class="even"><input type="text" name="uname" value="" /></td> - </tr> - <tr> - <td class="head" align="right"><strong><{$smarty.const._MD_SORTBY}></strong> </td> - <td class="even"> - <select name=="sortby"> - <option value="p.post_time desc" selected="selected"><{$smarty.const._MD_DATE}></option> - <option value="t.topic_title"><{$smarty.const._MD_TOPIC}></option> - <option value="f.forum_name"><{$smarty.const._MD_FORUM}></option> - <option value="u.uname"><{$smarty.const._MD_USERNAME}></option> - </select> - </td> - </tr> - <tr> - <td class="head" align="right"><strong><{$smarty.const._MD_SINCE}></strong> </td> - <td class="even"><{$since_selection_box}></td> - </tr> - <{if $search_rule}> - <tr> - <td class="head" align="right"><strong><{$smarty.const._SR_SEARCHRULE}></strong> </td> - <td class="even"><{$search_rule}></td> - </tr> - <{/if}> - <tr> - <td class="head" align="right"> </td> - <td class="even"><input type="submit" name="submit" value="<{$smarty.const._MD_SEARCH}>" /></td> - </table></td> - </tr> - </table> +<div id="forum_header"> + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/index.php"><{$forumindex}></a> + > + <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php"><{$smarty.const._SR_SEARCH}></a> +</div> + +<{if $search_info}> +<{includeq file="db:newbb_searchresults.html" results=$results}> +<{/if}> +<form name="Search" action="<{$xoops_url}>/modules/<{$xoops_dirname}>/search.php" method="get"> + <table class="outer" border="0" cellpadding="1" cellspacing="0" align="center" width="95%"> + <tr> + <td><table border="0" cellpadding="1" cellspacing="1" width="100%" class="head"> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" width="10%" id="align_right"><strong><{$smarty.const._SR_KEYWORDS}></strong> </td> + <td class="even"><input type="text" name="term" /></td> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._SR_TYPE}></strong> </td> + <td class="even"> + <select name="andor"> + <option value="or" selected="selected"><{$smarty.const._SR_ANY}></option> + <option value="all"><{$smarty.const._SR_ALL}></option> + <option value="exact"><{$smarty.const._SR_EXACT}></option> + </select> + </td> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._MD_FORUMC}></strong> </td> + <td class="even"><{$forum_selection_box}></td> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._SR_SEARCHIN}></strong> </td> + <td class="even"><input type="radio" name="searchin" value="title" /><{$smarty.const._MD_SUBJECT}> + <input type="radio" name="searchin" value="text" /><{$smarty.const._MD_BODY}> + <input type="radio" name="searchin" value="both" checked="checked" /><{$smarty.const._MD_SUBJECT}> & <{$smarty.const._MD_BODY}> </td> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._MD_AUTHOR}></strong> </td> + <td class="even"><input type="text" name="uname" value="" /></td> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._MD_SORTBY}></strong> </td> + <td class="even"> + <select name=="sortby"> + <option value="p.post_time desc" selected="selected"><{$smarty.const._MD_DATE}></option> + <option value="t.topic_title"><{$smarty.const._MD_TOPIC}></option> + <option value="f.forum_name"><{$smarty.const._MD_FORUM}></option> + <option value="u.uname"><{$smarty.const._MD_USERNAME}></option> + </select> + </td> + </tr> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._MD_SINCE}></strong> </td> + <td class="even"><{$since_selection_box}></td> + </tr> + <{if $search_rule}> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"><strong><{$smarty.const._SR_SEARCHRULE}></strong> </td> + <td class="even"><{$search_rule}></td> + </tr> + <{/if}> + <tr> +<!-- irmtfan hardcode removed align="right" --> + <td class="head" id="align_right"> </td> + <td class="even"><input type="submit" name="submit" value="<{$smarty.const._MD_SEARCH}>" /></td> + </table></td> + </tr> + </table> </form> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_searchresults.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_searchresults.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_searchresults.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,41 +1,43 @@ -<div class="resultMsg"> <{$search_info}> </div> -<br /> -<{if $results}> -<table class="outer" border="0" cellpadding="0" cellspacing="0" align="center" width="95%"> - <tr> - <td><table border="0" cellpadding="4" cellspacing="1" width="100%"> - <tr class="head" align="center"> - <td><{$smarty.const._MD_FORUMC}></td> - <td><{$smarty.const._MD_SUBJECT}></td> - <td><{$smarty.const._MD_AUTHOR}></td> - <td nowrap="nowrap"><{$smarty.const._MD_POSTTIME}></td> - </tr> - <!-- start search results --> -<{section name=i loop=$results}> - <!-- start each result --> - <tr align="center"> - <td class="even"><a href="<{$results[i].forum_link}>"><{$results[i].forum_name}></a></td> - <td class="odd" align="left"><a href="<{$results[i].link}>"><{$results[i].title}></a></td> - <td class="even"><{$results[i].poster}></a></td> - <td class="odd"><{$results[i].post_time}></td> - </tr> - <!-- end each result --> -<{/section}> - <!-- end search results --> - </table></td> - </tr> -<{if $search_next or $search_prev}> - <tr> - <td><table border="0" cellpadding="4" cellspacing="1" width="100%"> - <tr class="head"> - <td align="left" width="50%"><{$search_prev}> </td><td align="right" width="50%"> <{$search_next}></td> - </tr> - </table></td> - </tr> -<{/if}> -</table> -<br /> -<{elseif $lang_nomatch}> -<div class="resultMsg"> <{$lang_nomatch}> </div> -<br /> +<div class="resultMsg"> <{$search_info}> </div> +<br /> +<{if $results}> +<table class="outer" border="0" cellpadding="0" cellspacing="0" align="center" width="95%"> + <tr> + <td><table border="0" cellpadding="4" cellspacing="1" width="100%"> + <tr class="head" align="center"> + <td><{$smarty.const._MD_FORUMC}></td> + <td><{$smarty.const._MD_SUBJECT}></td> + <td><{$smarty.const._MD_AUTHOR}></td> + <td nowrap="nowrap"><{$smarty.const._MD_POSTTIME}></td> + </tr> + <!-- start search results --> +<{section name=i loop=$results}> + <!-- start each result --> + <tr align="center"> + <td class="even"><a href="<{$results[i].forum_link}>"><{$results[i].forum_name}></a></td> +<!-- irmtfan hardcode removed align="left" --> + <td class="odd" id="align_left"><a href="<{$results[i].link}>"><{$results[i].title}></a></td> + <td class="even"><{$results[i].poster}></a></td> + <td class="odd"><{$results[i].post_time}></td> + </tr> + <!-- end each result --> +<{/section}> + <!-- end search results --> + </table></td> + </tr> +<{if $search_next or $search_prev}> + <tr> + <td><table border="0" cellpadding="4" cellspacing="1" width="100%"> + <tr class="head"> +<!-- irmtfan hardcode removed align="left" --> + <td class="align_left" width="50%"><{$search_prev}> </td><td class="align_right" width="50%"> <{$search_next}></td> + </tr> + </table></td> + </tr> +<{/if}> +</table> +<br /> +<{elseif $lang_nomatch}> +<div class="resultMsg"> <{$lang_nomatch}> </div> +<br /> <{/if}> \ No newline at end of file Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum_subforum.html =================================================================== --- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum_subforum.html 2012-08-03 23:18:02 UTC (rev 9983) +++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewforum_subforum.html 2012-08-04 10:33:49 UTC (rev 9984) @@ -1,38 +1,40 @@ -<table cellspacing="1" class="outer" width="100%"> - <tr class="head" align="center"> - <td width="5%"> </td> - <td nowrap="nowrap" align="left"><{$smarty.const._MD_SUBFORUMS}></td> - <td nowrap="nowrap"> </td> - <td nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td> - </tr> - <!-- start subforums --> - <{foreachq item=sforum from=$subforum}> - <tr> - <td class="even" align="center" valign="middle"><{$sforum.forum_folder}></td> - <td class="odd" onclick="window.location='<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$sforum.forum_id}>'"><a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$sforum.forum_id}>"><strong><{$sforum.forum_name}></strong></a><br /> - <div id="index_forum"> - <{$sforum.forum_desc}> - <{if $sforum.forum_moderators}><br/> - <span class="extra"><{$smarty.const._MD_MODERATOR}>: </strong><{$sforum.forum_moderators}> - <{/if}> - </div> - </td> - <td class="even" align="center" valign="middle"> - <{$sforum.forum_topics}> <{$smarty.const._MD_TOPICS}> - <br /> - <{$sforum.forum_posts}> <{$smarty.const._MD_POSTS}> - </td> - <td class="odd" align="right" valign="middle"> - <{if $sforum.forum_lastpost_subject}> - <{$sforum.forum_lastpost_time}> <{$smarty.const._MD_BY}> <{$sforum.forum_lastpost_user}><br /> - <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/viewtopic.php?post_id=<{$sforum.forum_lastpost_id}>"> - <{$sforum.forum_lastpost_subject}> <img src="<{$xoops_url}>/modules/<{$xoops_dirname}>/templates/images/icon/<{$sforum.forum_lastpost_icon}>" alt="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" title="<{$smarty.const._MD_NEWBB_GOTOLASTPOST}>" /> - </a> - <{else}> - <{$smarty.const._MD_NONEWPOSTS}> - <{/if}> - </td> - </tr> - <{/foreach}> - <!-- end subforums --> +<table cellspacing="1" class="outer" width="100%"> + <tr class="head" align="center"> + <td width="5%"> </td> +<!-- irmtfan hardcode removed align="left" --> + <td nowrap="nowrap" class="align_left"><{$smarty.const._MD_SUBFORUMS}></td> + <td nowrap="nowrap"> </td> + <td nowrap="nowrap"><{$smarty.const._MD_LASTPOST}></td> + </tr> + <!-- start subforums --> + <{foreachq item=sforum from=$subforum}> + <tr> + <td class="even" align="center" valign="middle"><{$sforum.forum_folder}></td> + <td class="odd" onclick="window.location='<{$xoops_url}>/modules/<{$xoops_dirname}>/viewforum.php?forum=<{$sforum.forum_id}>'"><a href="<{$xoops_url}>/modules/<{$xo... [truncated message content] |