[xoops-svn] SF.net SVN: xoops:[10123] XoopsModules/newbb/branches/irmtfan/newbb

[<ir...@us...>]

Revision: 10123
          http://xoops.svn.sourceforge.net/xoops/?rev=10123&view=rev
Author:   irmtfan
Date:     2012-08-27 11:18:20 +0000 (Mon, 27 Aug 2012)
Log Message:
-----------
improve text link instead of buttons, correct some extra spaces

Modified Paths:
--------------
    XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
    XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
    XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php
    XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
    XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php

Modified: XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt	2012-08-27 08:04:06 UTC (rev 10122)
+++ XoopsModules/newbb/branches/irmtfan/newbb/changelog-rev10109.txt	2012-08-27 11:18:20 UTC (rev 10123)
@@ -1,3 +1,11 @@
+date: 2012-08-27 - 2
+================================================
+1- improve text link instead of buttons to only show text buttons when: a) alt key is set b)display is not set to true c)only buttons like reply, edit
+newbb/include/functions.render.php, newbb/class/icon.php
+
+2- add alt key for quickreply button and remove one extra space ( ) and sort reply - addpoll - newtopic
+newbb/viewtopic.php, newbb/templates/newbb_viewtopic.html
+
 date: 2012-08-27
 ================================================
 1- remove icon_path and use newbb_displayImage

Modified: XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php	2012-08-27 08:04:06 UTC (rev 10122)
+++ XoopsModules/newbb/branches/irmtfan/newbb/class/icon.php	2012-08-27 11:18:20 UTC (rev 10123)
@@ -150,12 +150,13 @@
 	function assignImage($image, $alt = "", $extra = "")
 	{
 		$this->setImage($image, $alt, $extra);
-		// START hacked by iemrfan - improve to CSS3 buttons
-		if ($alt !='') {
-			return "<button {$extra} id={$image}>$alt</button>";
+		// START hacked by irmtfan - improve function to CSS3 buttons
+		$tag="span";
+		if (in_array( substr($image,0,2),array('t_','p_','up') )) {
+			$tag="button";
 		}
-		return true;
-		// END hacked by iemrfan - improve to CSS3 buttons
+		return "<{$tag} align=\"middle\" {$extra} id={$image}>$alt</{$tag}>";
+		// END hacked by irmtfan - improve function to CSS3 buttons
 	}
 
 	function assignImages($images)

Modified: XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php	2012-08-27 08:04:06 UTC (rev 10122)
+++ XoopsModules/newbb/branches/irmtfan/newbb/include/functions.render.php	2012-08-27 11:18:20 UTC (rev 10123)
@@ -97,12 +97,12 @@
 {
 	$icon_handler = newbb_getIconHandler();
 	// START hacked by irmtfan
-	// to show text links instead of buttons
+	// to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set 
 	global $xoopsModuleConfig;
-    if (!empty($xoopsModuleConfig['display_text_links'])){
+    if (!empty($xoopsModuleConfig['display_text_links']) && func_num_args()== 2){
         $display=false;
     }
-	// END hacked by irmtfan
+    // END hacked by irmtfan
 	if (empty($display)) {
 		return $icon_handler->assignImage($image, $alt, $extra);
 	} else {

Modified: XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html	2012-08-27 08:04:06 UTC (rev 10122)
+++ XoopsModules/newbb/branches/irmtfan/newbb/templates/newbb_viewtopic.html	2012-08-27 11:18:20 UTC (rev 10123)
@@ -204,7 +204,7 @@
 <br />
 
 <div class="left" style="padding: 5px;">
-	<{$forum_addpoll}>&nbsp;<{$forum_reply}>&nbsp;<{$forum_post_or_register}>
+	<{$forum_reply}>&nbsp;<{$forum_addpoll}>&nbsp;<{$forum_post_or_register}>
 </div>
 <div class="clear"></div>
 <br />

Modified: XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php
===================================================================
--- XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php	2012-08-27 08:04:06 UTC (rev 10122)
+++ XoopsModules/newbb/branches/irmtfan/newbb/viewtopic.php	2012-08-27 11:18:20 UTC (rev 10123)
@@ -463,7 +463,7 @@
     if (!$topic_obj->getVar('topic_haspoll')) {	
 		if ( is_object($xoopsUser) && $xoopsUser->getVar("uid")==$topic_obj->getVar("topic_poster") ) {
 			$t_poll = newbb_displayImage('t_poll',_MD_ADDPOLL);
-			$xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/polls.php?op=add&amp;topic_id=".$topic_id."\">".$t_poll."</a>&nbsp;");
+			$xoopsTpl->assign('forum_addpoll', "<a href=\"".XOOPS_URL."/modules/".$xoopsModule->getVar("dirname", "n")."/polls.php?op=add&amp;topic_id=".$topic_id."\">".$t_poll."</a>");
 		}
 	} elseif ($isadmin
 		|| (is_object($poll) && is_object($xoopsUser) && $xoopsUser->getVar("uid")==$poll->getVar("user_id") )
@@ -623,7 +623,7 @@
 
 	$toggles = newbb_getcookie('G', true);
 	$display = (in_array('qr', $toggles)) ? 'none;' : 'block;';
-    $xoopsTpl->assign('quickreply', array( 'show' => 1, 'display' => $display, 'icon' => newbb_displayImage('t_qr'), 'form' => $forum_form->render()));
+    $xoopsTpl->assign('quickreply', array( 'show' => 1, 'display' => $display, 'icon' => newbb_displayImage('t_qr',_MD_QUICKREPLY), 'form' => $forum_form->render()));
 	unset($forum_form);
 
 } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.