[Vtigercrm-commits] [vtiger-commits] r3960 - in /vtigercrm/trunk: Smarty/templates/Header.tpl modules/Users/Announcements.php modules/Users/UsersAjax.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon Feb 27 07:53:28 2006
New Revision: 3960

Log:
issue in announcement has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/Header.tpl
    vtigercrm/trunk/modules/Users/Announcements.php
    vtigercrm/trunk/modules/Users/UsersAjax.php

Modified: vtigercrm/trunk/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Header.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Header.tpl Mon Feb 27 07:53:28 2006
@@ -18,7 +18,7 @@
 		<td width=100% align=center>
 		<table border=0 cellspacing=0 cellpadding=2 width=90% class="rssDisplay">
 		 <tr>
-		 <td class=rssDisplayPanel align=center><marquee id="rss" direction="left" scrolldelay="10" scrollamount="3" behavior="scroll" class="marStyle" onMouseOver="javascript:stop();" onMouseOut="javascript:start();">  </marquee></td>
+		 <td class=rssDisplayPanel align=center><marquee id="rss" direction="left" scrolldelay="10" scrollamount="3" behavior="scroll" class="marStyle" onMouseOver="javascript:stop();" onMouseOut="javascript:start();">&nbsp;</marquee></td>
 		 {*<td class=rssDisplayPanel align=center> RSS is not configured. <a href="#">Click here</a> to configure</td>*}
 		 </tr>
 		</table>

Modified: vtigercrm/trunk/modules/Users/Announcements.php
==============================================================================
--- vtigercrm/trunk/modules/Users/Announcements.php (original)
+++ vtigercrm/trunk/modules/Users/Announcements.php Mon Feb 27 07:53:28 2006
@@ -25,7 +25,7 @@
 	$html='<script>
 	function ajaxSaveResponse(response)
 	{
-		document.getElementById("announcement").value=response.responseText;
+		document.getElementById("announcement").innerHTML=response.responseText;
 		hide("an_busy");
 	}
 	function Announcement()
@@ -36,9 +36,7 @@
 	var announcement=document.getElementById("announcement").value;
 	var title=document.getElementById("title_announce").value;
 	var urlstring = "module=Users&action=UsersAjax&announcement="+announcement+"&announce_save=yes&title_announcement="+title;
-	if(announcement != "")
 		ajaxObj.process("index.php?",urlstring);
-	
 	}
 	</script>
 	<br><br><table align="center"><tbody><tr style="height: 40px;">

Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Mon Feb 27 07:53:28 2006
@@ -16,7 +16,12 @@
 	$announcement='';
 	$sql="select * from announcement order by time";
 	$result=$adb->query($sql);
-		$announcement.=getUserName($adb->query_result($result,$i,'creatorid')).' :  '.$adb->query_result($result,$i,'announcement').'   ';
+	for($i=0;$i<$adb->num_rows($result);$i++)
+	{
+		$announce = getUserName($adb->query_result($result,$i,'creatorid')).' :  '.$adb->query_result($result,$i,'announcement').'   ';
+		if($adb->query_result($result,$i,'announcement')!='')
+			$announcement.=$announce;
+	}
 	echo $announcement; 
 		
 }elseif(isset($_REQUEST['announce_save']) && ($_REQUEST['announce_save'] != ''))
@@ -31,6 +36,6 @@
 	else
 		$query="insert into announcement values (".$current_user->id.",".$adb->formatString("announcement","announcement",$announcement).",".$adb->formatString("announcement","time",$date_var).",'".$date_var."')";
 	$result=$adb->query($query);
-	echo $query.$announcement;
+	echo $announcement;
 	}
 ?>