Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[9651] XoopsModules/newbb/branches/alfred/newbb
|
From: <dh...@us...> - 2012-06-16 08:16:30
|
Revision: 9651
http://xoops.svn.sourceforge.net/xoops/?rev=9651&view=rev
Author: dhcst
Date: 2012-06-16 08:16:22 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
merge trunk from Mamba
Modified Paths:
--------------
XoopsModules/newbb/branches/alfred/newbb/admin/index.php
XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
XoopsModules/newbb/branches/alfred/newbb/class/forum.php
XoopsModules/newbb/branches/alfred/newbb/class/post.php
XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
XoopsModules/newbb/branches/alfred/newbb/header.php
XoopsModules/newbb/branches/alfred/newbb/include/images.php
XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
XoopsModules/newbb/branches/alfred/newbb/viewforum.php
Modified: XoopsModules/newbb/branches/alfred/newbb/admin/index.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/admin/index.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -39,7 +39,7 @@
{
if (empty($path)) return false;
if (@is_writable($path)) {
- $path_status = _AM_NEWBB_AVAILABLE;
+ $path_status = "";
} elseif (!@is_dir($path)) {
$path_status = _AM_NEWBB_NOTAVAILABLE." <a href=index.php?op=createdir&path=$path>"._AM_NEWBB_CREATETHEDIR.'</a>';
} else {
@@ -168,20 +168,15 @@
$indexAdmin->addInfoBox(_AM_NEWBB_REPORT) ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PENDING.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 0)), 'Green') ;
$indexAdmin->addInfoBoxLine(_AM_NEWBB_REPORT, "<infolabel>" ._AM_NEWBB_REPORT_PROCESSED.': %s' . "</infolabel>" , $report_handler->getCount(new Criteria("report_result", 1)), 'Green') ;
-/*
- $temp1 = "<div style='padding: 8px;'>" . _AM_NEWBB_ATTACHPATH . ": ";
- $path_status1 = newbb_admin_getPathStatus($attach_path);
-
- $temp2 = "<br />" . _AM_NEWBB_THUMBPATH . ": ";
- $path_status2 = newbb_admin_getPathStatus($thumb_path);
-
- $indexAdmin->addConfigBoxLine($attach_path . ' (' . $path_status1 . ')', '');
- $indexAdmin->addConfigBoxLine($thumb_path . ' (' . $path_status2 . ')', '');
-*/
- foreach (array_keys( $folder) as $i) {
- $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+
+ foreach (array_keys($folder) as $i) {
+ if (!(newbb_admin_getPathStatus($folder[$i])) == '') {
+ $indexAdmin->addConfigBoxLine($folder[$i] . ' ' . newbb_admin_getPathStatus($folder[$i]), 'folder');
+ } else {
+ $indexAdmin->addConfigBoxLine($folder[$i], 'folder');
+ }
$indexAdmin->addConfigBoxLine(array($folder[$i], '755'), 'chmod');
- }
+ }
echo $indexAdmin->addNavigation('index.php');
echo $indexAdmin->renderIndex();
Modified: XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/blocks/newbb_block.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -95,7 +95,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
+ if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
}
$query = 'SELECT'.
@@ -166,8 +166,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
$topic['seo_forum_url'] = seo_urls($seo_forum_url);
@@ -179,11 +179,11 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/list.topic.php">'._MB_NEWBB_ALLTOPICS.'</a>';
$block['seo_top_alltopics'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -243,7 +243,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
+ if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
}
if (!isset($access_forums)) {
@@ -322,8 +322,8 @@
}
$topic['topic_poster'] = $topic_poster;
$topic['topic_page_jump'] = $topic_page_jump;
- $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -336,9 +336,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
@@ -394,7 +394,7 @@
if (!empty($newbbConfig['do_rewrite'])) {
include_once XOOPS_ROOT_PATH."/modules/newbb/seo_url.php";
} else {
- if (!defined('SEO_MODULE_NAME')) define('SEO_MODULE_NAME', 'modules/newbb');
+ if (!defined('REAL_MODULE_NAME')) define('REAL_MODULE_NAME', 'modules/newbb');
}
if (!empty($options[6])) {
@@ -475,8 +475,8 @@
$topic['post_text'] = $post_text;
}
- $seo_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
- $seo_forum_url = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
+ $seo_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'">'.$topic['title'].'</a>';
+ $seo_forum_url = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'].'">'.$topic['forum_name'].'</a>';
if (!empty($newbbConfig['do_rewrite'])) {
$topic['seo_url'] = seo_urls($seo_url);
@@ -490,9 +490,9 @@
$block['topics'][] = $topic;
unset($topic);
}
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/">'._MB_NEWBB_VSTFRMS.'</a>';
$block['seo_top_allforums'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
- $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
+ $seo_top_allforums = '<a href="'.XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewpost.php">'._MB_NEWBB_ALLPOSTS.'</a>';
$block['seo_top_allposts'] = (!empty($newbbConfig['do_rewrite'])) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
$block['indexNav'] = intval($options[4]);
Modified: XoopsModules/newbb/branches/alfred/newbb/class/forum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/class/forum.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -404,7 +404,8 @@
'type_id' => $myrow['type_id'],
'type_text' => $topic_prefix,
'topic_title' => $topic_title,
- 'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
+ //'topic_link' => XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $myrow['topic_id'],
+ 'topic_link' => 'viewtopic.php?topic_id=' . $myrow['topic_id'],
'rating_img' => $rating_img,
'topic_page_jump' => $topic_page_jump,
'topic_page_jump_icon' => $topic_page_jump_icon,
Modified: XoopsModules/newbb/branches/alfred/newbb/class/post.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/class/post.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -497,7 +497,12 @@
$thread_action['social_facebook']['image'] = newbb_displayImage('facebook', _MD_SHARE_FACEBOOK);
$thread_action['social_facebook']['link'] = "http://www.facebook.com/sharer.php?u=".$full_link;
$thread_action['social_facebook']['name'] = _MD_SHARE_FACEBOOK;
- $thread_action['social_facebook']['target'] = '_blank';
+ $thread_action['social_facebook']['target'] = '_blank';
+
+ $thread_action['social_gplus']['image'] = newbb_displayImage('googleplus', _MD_SHARE_GOOGLEPLUS);
+ $thread_action['social_gplus']['link'] = "https://plusone.google.com/_/+1/confirm?hl=en&url=".$full_link;
+ $thread_action['social_gplus']['name'] = _MD_SHARE_GOOGLEPLUS;
+ $thread_action['social_gplus']['target'] = '_blank';
$thread_action['social_linkedin']['image'] = newbb_displayImage('linkedin', _MD_SHARE_LINKEDIN);
$thread_action['social_linkedin']['link'] = "http://www.linkedin.com/shareArticle?mini=true&title=".$full_title."&url=".$full_link;
Modified: XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/docs/changelog.txt 2012-06-16 08:16:22 UTC (rev 9651)
@@ -1,6 +1,6 @@
newBB
Changelog 4.3
-03/17/2012
+06/16/2012
===========================================
1 Fix Cache Config for SEO
2 Fix Typos in templates
@@ -15,6 +15,9 @@
11 New cache for Seo
12 New Social-Links in Threads
13 New advertising for topics
+14 Fix Replaced Buzz with Google Plus (mamba)
+15 Fix Added "Create" links for missing directories (mamba)
+16 Fix Link to Blank.gif
newBB
Changelog 4.2
Modified: XoopsModules/newbb/branches/alfred/newbb/header.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/header.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/header.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -18,7 +18,7 @@
if(((strpos(getenv('REQUEST_URI'), '.html') === false) && !empty($xoopsModuleConfig['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)))
{
$redir = false;
- if ( strpos(getenv("REQUEST_URI"),"index.php?mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
+ if ( strpos(getenv("REQUEST_URI"),"mark_read=") == true || strpos(getenv("REQUEST_URI"),"mark=") == true) {
// Mark Forums
} else {
if ( in_array(basename(getenv('SCRIPT_NAME')),$toseo_url) ) {
Modified: XoopsModules/newbb/branches/alfred/newbb/include/images.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/include/images.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -72,7 +72,7 @@
$forumImage['facebook'] =
$forumImage['twitter'] =
$forumImage['linkedin'] =
-$forumImage['buzz'] =
+$forumImage['googleplus'] =
$forumImage['stumbleupon'] =
$forumImage['friendfeed'] =
$forumImage['digg'] =
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/admin.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -53,7 +53,7 @@
define('_AM_NEWBB_GDLIB2','GD2 library:');
define('_AM_NEWBB_AUTODETECTED','Autodetected: ');
define('_AM_NEWBB_AVAILABLE','Available');
-define('_AM_NEWBB_NOTAVAILABLE','<font color="red">Not available</font>');
+define('_AM_NEWBB_NOTAVAILABLE','<font color="red">is not available. </font>');
define('_AM_NEWBB_NOTWRITABLE','<font color="red">Not writable</font>');
define('_AM_NEWBB_IMAGEMAGICK','ImageMagicK:');
define('_AM_NEWBB_IMAGEMAGICK_NOTSET','Not set');
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/main.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -467,7 +467,7 @@
define("_MD_ADVERTISING_USER","Advertisement");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/english/modinfo.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -256,4 +256,7 @@
define("_MI_ADVERTISING_DESC","shows a commercial break after the 2nd Thread");
define("_MI_USERATTACH_ENABLE","Display attachments only for registered users");
define("_MI_USERATTACH_DESC","shows attachments in the forum only after logging in.");
+
+define("_MI_MAX_IMG_HEIGHT","Maximum height of an image");
+define("_MI_MAX_IMG_HEIGHT_DESC", "Sets the maximum allowed height of an uploaded image.");
?>
\ No newline at end of file
Modified: XoopsModules/newbb/branches/alfred/newbb/language/german/main.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/language/german/main.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -472,7 +472,7 @@
define("_MD_ADVERTISING_USER","Werbung");
define('_MD_SHARE_FACEBOOK', "Facebook");
define('_MD_SHARE_TWITTER', "Twitter");
-define('_MD_SHARE_BUZZ', "Google Buzz");
+define('_MD_SHARE_GOOGLEPLUS', "Google Plus");
define('_MD_SHARE_LINKEDIN', "Linkedin");
define('_MD_SHARE_STUMBLEUPON', "Stumbleupon");
define('_MD_SHARE_FRIENDFEED', "FriendFeed");
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -26,9 +26,9 @@
<a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/admin/index.php" target="_self" title="<{$smarty.const._MD_ADMINCP}>"><{$smarty.const._MD_ADMINCP}></a>
</div>
<div style="clear:both;"></div>
- </div>
- <br style="clear: both;" />
+ </div>
<{/if}>
+<br style="clear: both;" />
<div class="dropdown">
<{includeq file="db:newbb_index_menu.html"}>
</div>
@@ -301,8 +301,8 @@
<span style="padding: 2px;"><{$online.statistik}></span>
<strong><{$smarty.const._MD_NEWBB_STATS}></strong>
</div>
- <div style="clear:both;"></div>
- <div class="forum_stats odd" style="padding: 3px; line-height: 150%;">
+
+ <div class="forum_stats odd" style="padding: 5px; line-height: 150%;">
<div class="forum_stats_left odd">
<{$currenttime}><br />
<{$smarty.const._MD_TOTALTOPICSC}>
@@ -329,7 +329,7 @@
</div>
<br style="clear:both;"/>
<{/if}>
-
+<br style="clear: both;" />
<{if $online}>
<{includeq file="db:newbb_online.html"}>
<{/if}>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_index_menu.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -1,6 +1,5 @@
<select
name="mainoption" id="mainoption"
- class="menu"
onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_MAINFORUMOPT}></option>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -63,7 +63,7 @@
</div>
<{else}>
<div class="right" style="padding: 5px;">
- <{$forum_addpoll}> <{$forum_post_or_register}>
+ <{$forum_post_or_register}>
</div>
<{/if}>
<div class="clear"></div>
@@ -134,7 +134,7 @@
<{/if}>
</td>
<td width="4%" align="center"><{$topic.topic_icon}></td>
- <td> <a href="<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>">
+ <td> <a href="<{$xoops_url}>/modules/<{$xoops_dirname}>/<{$topic.topic_link}>" title="<{$topic.topic_excerpt}>">
<{$topic.topic_title}></a><{$topic.attachment}> <{$topic.topic_page_jump}>
</td>
<td align="center" valign="middle"><{$topic.topic_poster}></td>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewforum_menu.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -1,6 +1,6 @@
<select
name="forumoption" id="forumoption"
- class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
+ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_FORUMOPTION}></option>
<option value="<{$mark_read}>"><{$smarty.const._MD_MARK_ALL_TOPICS}> <{$smarty.const._MD_MARK_READ}></option>
@@ -17,7 +17,7 @@
<{if $type_options}>
<select
name="type" id="type"
- class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
+ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_NEWBB_TYPE}></option>
<{foreachq item=opt from=$type_options}>
Modified: XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/templates/newbb_viewtopic.html 2012-06-16 08:16:22 UTC (rev 9651)
@@ -100,7 +100,7 @@
<div>
<div class="dropdown">
- <select name="topicoption" id="topicoption" class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
+ <select name="topicoption" id="topicoption" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_TOPICOPTION}></option>
<{if $viewer_level gt 1}>
@@ -120,7 +120,6 @@
<{if $rating_enable}>
<select
name="rate" id="rate"
- class="menu"
onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.document.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_RATE}></option>
@@ -134,7 +133,7 @@
<select
name="viewmode" id="viewmode"
- class="menu" onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
+ onchange="if(this.options[this.selectedIndex].value.length >0 ) { window.location=this.options[this.selectedIndex].value;}"
>
<option value=""><{$smarty.const._MD_VIEWMODE}></option>
<{foreachq item=act from=$viewmode_options}>
Modified: XoopsModules/newbb/branches/alfred/newbb/viewforum.php
===================================================================
--- XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-15 21:21:45 UTC (rev 9650)
+++ XoopsModules/newbb/branches/alfred/newbb/viewforum.php 2012-06-16 08:16:22 UTC (rev 9651)
@@ -92,7 +92,7 @@
if ($forum_handler->getPermission($forum_obj, "post")) {
$xoopsTpl->assign('forum_post_or_register', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?forum={$forum_id}\">".newbb_displayImage('t_new', _MD_POSTNEW)."</a>");
- if ($forum_handler->getPermission($forum_obj, "addpoll")) {
+ if ($forum_handler->getPermission($forum_obj, "addpoll") && $pollmodules) {
$t_poll = newbb_displayImage('t_poll',_MD_ADDPOLL);
$xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/newbb/newtopic.php?op=add&forum={$forum_id}\">{$t_poll}</a>");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
