diff options
| -rw-r--r-- | BitBoardPost.php | 12 | ||||
| -rw-r--r-- | post.php | 6 | ||||
| -rw-r--r-- | styles/bitboards.css | 7 | ||||
| -rw-r--r-- | templates/comment_post.tpl | 5 | ||||
| -rw-r--r-- | templates/flipswitch.tpl | 51 | ||||
| -rw-r--r-- | templates/header_inc.tpl | 4 | ||||
| -rw-r--r-- | templates/list_posts.tpl | 22 | ||||
| -rw-r--r-- | templates/list_topics.tpl | 7 | ||||
| -rw-r--r-- | templates/post_display.tpl | 2 | ||||
| -rw-r--r-- | topic.php | 6 |
10 files changed, 62 insertions, 60 deletions
diff --git a/BitBoardPost.php b/BitBoardPost.php index 5c7e613..27d65f4 100644 --- a/BitBoardPost.php +++ b/BitBoardPost.php @@ -1,7 +1,7 @@ <?php /** -* $Header: /cvsroot/bitweaver/_bit_boards/BitBoardPost.php,v 1.8 2006/09/08 06:06:30 lsces Exp $ -* $Id: BitBoardPost.php,v 1.8 2006/09/08 06:06:30 lsces Exp $ +* $Header: /cvsroot/bitweaver/_bit_boards/BitBoardPost.php,v 1.9 2006/11/22 12:33:57 squareing Exp $ +* $Id: BitBoardPost.php,v 1.9 2006/11/22 12:33:57 squareing Exp $ */ /** @@ -10,7 +10,7 @@ * * @date created 2004/8/15 * @author spider <spider@steelsun.com> -* @version $Revision: 1.8 $ $Date: 2006/09/08 06:06:30 $ $Author: lsces $ +* @version $Revision: 1.9 $ $Date: 2006/11/22 12:33:57 $ $Author: squareing $ * @class BitMBPost */ @@ -177,16 +177,16 @@ class BitBoardPost extends LibertyComment { return intval(substr($this->mInfo['thread_forward_sequence'],0,9)); } - function mod_approve() { + function modApprove() { $data['approved'] = 1; $this->setMetaData($data); } - function mod_reject() { + function modReject() { $this->deleteComment(); } - function mod_warn($message) { + function modWarn($message) { global $gBitSystem, $gBitUser; if (empty($message)) { @@ -15,16 +15,16 @@ if (!empty($_REQUEST['action'])) { switch ($_REQUEST['action']) { case 1: // Aprove - $comment->mod_approve(); + $comment->modApprove(); break; case 2: // Reject - $comment->mod_reject(); + $comment->modReject(); break; case 3: //Moderate $comment->loadMetaData(); - $comment->mod_warn($_REQUEST['warning_message']); + $comment->modWarn($_REQUEST['warning_message']); default: break; } diff --git a/styles/bitboards.css b/styles/bitboards.css index 73dc9f0..1755120 100644 --- a/styles/bitboards.css +++ b/styles/bitboards.css @@ -11,7 +11,7 @@ span.quote-title --> p.quotetitle {} unregistered user post highlight --> .bitboard a.highlight {} -*/ +* / .bitboard .mb-threading {} @@ -25,13 +25,13 @@ unregistered user post highlight /* post layout */ .bitboard .mb-post {clear:both;} -.bitboard .mb-post .body {float:right;width:100%; margin-left:-200px;} +.bitboard .mb-post .body {float:right;width:98%; margin-left:-200px;} .bitboard .mb-post .content {margin-left:200px;} .bitboard .mb-post .header {} .bitboard .mb-post .userinfo {float:left;width:200px;} .bitboard .mb-post .signature {clear:both;} -/* debugging and testing */ +/* debugging and testing * / .bitboard .mb-post {background:#ffc; padding-bottom:1em; margin:1em;} .bitboard .mb-post .body {background:#ccc;} .bitboard .mb-post .header {background:#cfc; padding:1em;} @@ -47,3 +47,4 @@ blockquote {padding:0.5em; border:1px #aaa solid; background:#f7f7f7;} ul.iconlegend {list-style:none; clear:both;} ul.iconlegend li {list-style:none; width:200px;} ul.iconlegend li img {vertical-align:middle;} +/* */ diff --git a/templates/comment_post.tpl b/templates/comment_post.tpl index 2798c12..20a4bcc 100644 --- a/templates/comment_post.tpl +++ b/templates/comment_post.tpl @@ -1,7 +1,7 @@ {if $smarty.request.post_comment_request} {strip} <br /> -<div class="display comment"> +<div class="edit comment"> {if ( $smarty.request.post_comment_request || $post_comment_preview )} <a name="editcomments"></a> {/if} @@ -63,9 +63,8 @@ {/if} {/form} - {libertypagination hash=$commentsPgnHash} </div><!-- end .body --> </div><!-- end .comment --> {/strip} -{/if}
\ No newline at end of file +{/if} diff --git a/templates/flipswitch.tpl b/templates/flipswitch.tpl index c041965..5292d0f 100644 --- a/templates/flipswitch.tpl +++ b/templates/flipswitch.tpl @@ -1,3 +1,4 @@ +{strip} {* $flip_state=>$flip.$flip_name.state $flip_name @@ -9,36 +10,36 @@ $flip_upname=>$flip.$flip_name.upname $flip_down=>$flip.$flip_name.down $flip_downname=>$flip.$flip_name.downname *} -{strip} {if $gBitUser->hasPermission( $flip.$flip_name.perm )} -<span> - <a onclick=" - var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req={$flip.$flip_name.req}&seq=' - + new Date().getTime()+ - '&{$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"} - &{$flip_name}={$flip.$flip_name.state|escape:"url"}'; - var element = this.parentNode; - var params = null; - {literal} - var ajax = new Ajax.Updater( - {success: element}, - url, {method: 'get', parameters: params, onFailure: reportError} - ); - {/literal} - return false; - " href="{$smarty.const.BITBOARDS_PKG_URL}topic.php? - {$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"} - &{$flip_name}={$flip.$flip_name.state|escape:"url"}"> + <span> + <a onclick=" + var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req={$flip.$flip_name.req}&seq=' + + new Date().getTime()+ + '&{$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"} + &{$flip_name}={$flip.$flip_name.state|escape:"url"}'; + var element = this.parentNode; + var params = null; + var ajax = new Ajax.Updater( + {ldelim}success: element{rdelim}, + url, + {ldelim}method: 'get', parameters: params, onFailure: reportError{rdelim} + ); + return false; + " href="{$smarty.const.BITBOARDS_PKG_URL}topic.php? + {$flip.$flip_name.idname}={$flip.$flip_name.id|escape:"url"} + &{$flip_name}={$flip.$flip_name.state|escape:"url"}"> {/if} + {if $flip.$flip_name.state==1} - {biticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"} + {biticon ipackage=icons iname=$flip.$flip_name.up iexplain=$flip.$flip_name.upname iforce="icon"} {else} - {if $gBitUser->hasPermission( $flip.$flip_name.perm )} - {biticon ipackage=icons iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname iforce="icon"} - {/if} + {if $gBitUser->hasPermission( $flip.$flip_name.perm )} + {biticon ipackage=icons iname=$flip.$flip_name.down iexplain=$flip.$flip_name.downname iforce="icon"} + {/if} {/if} + {if $gBitUser->hasPermission( 'p_bitboards_edit' )} - </a> -</span> + </a> + </span> {/if} {/strip} diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl index af4e564..af0b4c8 100644 --- a/templates/header_inc.tpl +++ b/templates/header_inc.tpl @@ -33,7 +33,7 @@ /* ]]> */</script> {if $gBitSystem->isPackageActive( 'rss' ) && !empty($board)} - <link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title} RSS" href="{$smarty.const.BITBOARDS_PKG_URL}bitboards_rss.php?version=rss20&b={$smarty.request.b}" /> - <link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title} ATOM" href="{$smarty.const.BITBOARDS_PKG_URL}bitboards_rss.php?version=atom&b={$smarty.request.b}" /> + <link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title} RSS" href="{$smarty.const.BITBOARDS_PKG_URL}bitboards_rss.php?version=rss20&b={$smarty.request.b}" /> + <link rel="alternate" type="application/rss+xml" title="Board {$board->mInfo.title} ATOM" href="{$smarty.const.BITBOARDS_PKG_URL}bitboards_rss.php?version=atom&b={$smarty.request.b}" /> {/if} {/if} diff --git a/templates/list_posts.tpl b/templates/list_posts.tpl index ab38e3b..8516a06 100644 --- a/templates/list_posts.tpl +++ b/templates/list_posts.tpl @@ -1,21 +1,21 @@ -{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_posts.tpl,v 1.1 2006/09/23 03:47:27 spiderr Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_posts.tpl,v 1.2 2006/11/22 12:33:57 squareing Exp $ *} {strip} - <div class="navbar"> -<div class="floaticon"> - {assign var=flip value=$thread->getFlipFlop()} - {foreach from=$flip item=flip_s key=flip_name} - {include file="bitpackage:bitboards/flipswitch.tpl"} - {/foreach} -</div> - «{tr}Back to{/tr} <a href="{$board->mInfo.display_url}">{$board->mInfo.title|escape}</a> + <div class="boards breadcrumb"> + « {tr}Back to{/tr} <a href="{$board->mInfo.display_url}">{$board->mInfo.title|escape}</a> </div> <div class="listing bitboard"> + <div class="floaticon"> + {assign var=flip value=$thread->getFlipFlop()} + {foreach from=$flip item=flip_s key=flip_name} + {include file="bitpackage:bitboards/flipswitch.tpl"} + {/foreach} + </div> <div class="header"> <h1>{$thread->mInfo.title|escape}</h1> </div> - + <div class="body"> {* not happy with this yet - xing *} <div class="floaticon"> @@ -43,7 +43,7 @@ </div> {if !$topic_locked} - <a title="{tr}Post Reply{/tr}" class="button" href="{$comments_return_url}&post_comment_reply_id={$thread->mInfo.flc_content_id}&post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-reply-sender" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a> + <a title="{tr}Post Reply{/tr}" class="button" href="{$comments_return_url}&post_comment_reply_id={$thread->mInfo.flc_content_id}&post_comment_request=1#editcomments">{biticon ipackage="icons" iname="mail-reply-sender" iexplain="Post Reply" iforce="icon"} {tr}Post Reply{/tr}</a> {/if} {formfeedback hash=$formfeedback} diff --git a/templates/list_topics.tpl b/templates/list_topics.tpl index 05c4ba0..8382d92 100644 --- a/templates/list_topics.tpl +++ b/templates/list_topics.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.2 2006/10/05 14:18:52 spiderr Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_boards/templates/list_topics.tpl,v 1.3 2006/11/22 12:33:57 squareing Exp $ *} {strip} <div class="listing bitboard"> <div class="floaticon"> @@ -105,7 +105,7 @@ {*smartlink ititle="Edit" ifile="edit.php" ibiticon="liberty/edit" board_id=$thread.board_id*} <a onclick=" document.getElementById('move_block_{$thread.th_thread_id|escape:"url"}').style['display']='inline'; - var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req=1&seq=' + new Date().getTime(); + var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req=1&seq=' + new Date().getTime(); var element = 'move_{$thread.th_thread_id|escape:"url"}'; var params = null; {literal} @@ -136,8 +136,9 @@ {if $gBitUser->hasPermission( 'p_bitboards_edit' )} <br /> <div style="display:none;" id="move_block_{$thread.th_thread_id|escape:"url"}"> - Move to: <select onchange="window.location=('{$smarty.const.BITBOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}&target='+ + Move to: <select onchange="window.location=('{$smarty.const.BITBOARDS_PKG_URL}topic_move.php?t={$thread.th_thread_id|escape:"url"}&target='+ document.getElementById('move_{$thread.th_thread_id|escape:"url"}').value);" id="move_{$thread.th_thread_id|escape:"url"}"> + <option></option> </select> </div> {/if} diff --git a/templates/post_display.tpl b/templates/post_display.tpl index 2b41c8d..8ded72f 100644 --- a/templates/post_display.tpl +++ b/templates/post_display.tpl @@ -81,7 +81,7 @@ {assign var=comment_id value=$comment.comment_id} <a onclick=" var e = document.getElementById('warned_message_{$comment.comment_id|escape:"url"}'); - var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req=10&comment_id={$comment_id}&seq=' + new Date().getTime(); + var url = '{$smarty.const.BITBOARDS_PKG_URL}ajax.php?req=10&comment_id={$comment_id}&seq=' + new Date().getTime(); var element = 'warned_message_{$comment.comment_id|escape:"url"}'; var params = null; {literal} @@ -1,5 +1,5 @@ <?php -// $Header: /cvsroot/bitweaver/_bit_boards/Attic/topic.php,v 1.8 2006/09/23 03:47:27 spiderr Exp $ +// $Header: /cvsroot/bitweaver/_bit_boards/Attic/topic.php,v 1.9 2006/11/22 12:33:57 squareing Exp $ // Copyright (c) 2004 bitweaver Messageboards // All Rights Reserved. See copyright.txt for details and a complete list of authors. // Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. @@ -60,11 +60,11 @@ if (isset($_REQUEST["new"])) { switch ($_REQUEST['action']) { case 1: // Aprove - $comment->mod_approve(); + $comment->modApprove(); break; case 2: // Reject - $comment->mod_reject(); + $comment->modReject(); break; default: break; |
