[Vtigercrm-commits] [vtiger-commits] r7319 - in /vtigercrm/trunk: Smarty/templates/Rss.tpl modules/Rss/Delete.php modules/Rss/Popup.php modules/Rss/Rss.php modules/Rss/RssAjax.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Jun 21 01:37:39 EDT 2006
Author: saraj
Date: Tue Jun 20 23:37:32 2006
New Revision: 7319
Log:
category removed from rss
Modified:
vtigercrm/trunk/Smarty/templates/Rss.tpl
vtigercrm/trunk/modules/Rss/Delete.php
vtigercrm/trunk/modules/Rss/Popup.php
vtigercrm/trunk/modules/Rss/Rss.php
vtigercrm/trunk/modules/Rss/RssAjax.php
Modified: vtigercrm/trunk/Smarty/templates/Rss.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Rss.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Rss.tpl Tue Jun 20 23:37:32 2006
@@ -22,7 +22,7 @@
'index.php',
{queue: {position: 'end', scope: 'command'},
method: 'post',
- postBody: 'module=Rss&action=RssAjax&vtigerfile=ListView&directmode=ajax&record='+id,
+ postBody: 'module=Rss&action=RssAjax&file=ListView&directmode=ajax&record='+id,
onComplete: function(response) {
$("status").style.display="none";
$("rssfeedscont").innerHTML=response.responseText;
@@ -44,7 +44,7 @@
'index.php',
{queue: {position: 'end', scope: 'command'},
method: 'post',
- postBody: 'module=Rss&return_module=Rss&action=RssAjax&vtigerfile=Delete&directmode=ajax&record='+id,
+ postBody: 'module=Rss&return_module=Rss&action=RssAjax&file=Delete&directmode=ajax&record='+id,
onComplete: function(response) {
$("status").style.display="none";
$("rssfeedscont").innerHTML=response.responseText;
@@ -59,12 +59,11 @@
$("status").style.display="inline";
rssurl = $('rssurl').value;
rssurl = rssurl.replace(/&/gi,"##amp##");
- var category = $('rsscategory')[$('rsscategory').selectedIndex].value;
new Ajax.Request(
'index.php',
{queue: {position: 'end', scope: 'command'},
method: 'post',
- postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&rsscategory='+category+'&rssurl='+rssurl,
+ postBody:'module=Rss&action=RssAjax&file=Popup&directmode=ajax&rssurl='+rssurl,
onComplete: function(response) {
$("status").style.display="none";
@@ -177,10 +176,6 @@
<td align="left" width="70%"><input type="text" id="rssurl" class="txtBox" /></td>
</tr>
- <tr>
- <td align="right"><b>{$MOD.LBL_CATEGORY}</b></td>
- <td align="left"><select id="rsscategory" class="importBox" style="width:100%">{$RSSCATEG}</select></td>
- </tr>
<tr><td colspan="2" style="border-bottom:1px dashed #CCCCCC;"> </td></tr>
<tr>
<td colspan="2" align="center">
@@ -192,18 +187,6 @@
</div>
<script type="text/javascript" language="Javascript">
-function toggleRSSFolder(id) {ldelim}
- if (document.getElementById(id+"_feeds").style.display=="none") {ldelim}
- document.getElementById(id+"_feeds").style.display="block"
- document.getElementById(id+"_folder").src="{$IMAGE_PATH}rss_folder_opn.gif"
- document.getElementById(id+"_toggle").src="{$IMAGE_PATH}minus.gif"
- {rdelim} else {ldelim}
- document.getElementById(id+"_feeds").style.display="none"
- document.getElementById(id+"_folder").src="{$IMAGE_PATH}rss_folder_cls.gif"
- document.getElementById(id+"_toggle").src="{$IMAGE_PATH}plus.gif"
- {rdelim}
-
-{rdelim}
function makedefaultRss(id)
{ldelim}
if(id != '')
@@ -213,7 +196,7 @@
'index.php',
{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
method: 'post',
- postBody:'module=Rss&action=RssAjax&vtigerfile=Popup&directmode=ajax&record='+id,
+ postBody:'module=Rss&action=RssAjax&file=Popup&directmode=ajax&record='+id,
onComplete: function(response) {ldelim}
$("status").style.display="none";
getrssfolders();
@@ -228,7 +211,7 @@
'index.php',
{ldelim}queue: {ldelim}position: 'end', scope: 'command'{rdelim},
method: 'post',
- postBody:'module=Rss&action=RssAjax&vtigerfile=ListView&folders=true',
+ postBody:'module=Rss&action=RssAjax&file=ListView&folders=true',
onComplete: function(response) {ldelim}
$("status").style.display="none";
$("rssfolders").innerHTML=response.responseText;
Modified: vtigercrm/trunk/modules/Rss/Delete.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Delete.php (original)
+++ vtigercrm/trunk/modules/Rss/Delete.php Tue Jun 20 23:37:32 2006
@@ -25,5 +25,5 @@
DeleteEntity($_REQUEST['module'],$_REQUEST['return_module'],'',$_REQUEST['record'],'');
//code added for returning back to the current view after delete from list view
-header("Location: index.php?module=".$_REQUEST['return_module']."&action=RssAjax&vtigerfile=ListView&directmode=ajax");
+header("Location: index.php?module=".$_REQUEST['return_module']."&action=RssAjax&file=ListView&directmode=ajax");
?>
Modified: vtigercrm/trunk/modules/Rss/Popup.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Popup.php (original)
+++ vtigercrm/trunk/modules/Rss/Popup.php Tue Jun 20 23:37:32 2006
@@ -21,7 +21,7 @@
global $adb;
$query = 'update vtiger_rss set starred=0';
$adb->query($query);
- $query = 'update vtiger_rss set starred=1 where vtiger_rssid ='.$_REQUEST["record"];
+ $query = 'update vtiger_rss set starred=1 where rssid ='.$_REQUEST["record"];
$adb->query($query);
echo $_REQUEST["record"];
}
Modified: vtigercrm/trunk/modules/Rss/Rss.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/Rss.php (original)
+++ vtigercrm/trunk/modules/Rss/Rss.php Tue Jun 20 23:37:32 2006
@@ -136,7 +136,7 @@
}else
{
$shtml .= "<td width=\"15\">
- <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
+ <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\"></td>";
}
$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]
\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td>";
@@ -164,7 +164,7 @@
}else
{
$shtml .= "<td width=\"15\">
- <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\"></td>";
+ <img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\"></td>";
}
$shtml .= "<td class=\"rssTitle\"><a href=\"index.php?module=Rss&action=ListView&record=$allrssrow[rssid]\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td> </td>";
$shtml .= "</tr>";
@@ -378,7 +378,7 @@
$shtml .= "<img src=\"".$image_path."onstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
}else
{
- $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\">";
+ $shtml .= "<img src=\"".$image_path."offstar.gif\" align=\"absmiddle\" onMouseOver=\"this.style.cursor='pointer'\" id=\"star-$allrssrow[rssid]\" onClick=\"makedefaultRss($allrssrow[rssid])\">";
}
$shtml .= "</td>";
$shtml .= "<td class=\"rssTitle\" width=\"10%\" nowrap><a href=\"javascript:GetRssFeedList('$allrssrow[rssid]')\" class=\"rssTitle\">".$allrssrow[rsstitle]."</a></td><td> </td>";
Modified: vtigercrm/trunk/modules/Rss/RssAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Rss/RssAjax.php (original)
+++ vtigercrm/trunk/modules/Rss/RssAjax.php Tue Jun 20 23:37:32 2006
@@ -10,5 +10,5 @@
********************************************************************************/
- require_once('modules/'.$_REQUEST['module'].'/'.$_REQUEST['vtigerfile'].'.php');
+ require_once('modules/'.$_REQUEST['module'].'/'.$_REQUEST['file'].'.php');
?>
More information about the vtigercrm-commits
mailing list