"+(owner != undefined?owner.firstChild.nodeValue:get_lang('nobody'))+", "+pubDate+" | "+
- ' | '+
- ''+get_lang('Complete news')+'';
- if ( owner != undefined )
- toolbarCode += ' | '+get_lang('forward')+' | '+
- 'Responder | ';
- toolbarCode += ''+
- ( item_number == 1 ? '' :
- '')+
- ' '+
+ ""+pubDate+" | "+
+ " | "+
+ ""+get_lang("Complete news")+"";
+
+
+ toolbarCode += ' | '+
+ ( item_number == 1 ? '' :
+ '')+
+ ' '+
(this.rssXml.getElementsByTagName('item')[parseInt(item_number)] == undefined ? '' :
- '')+
+ '')+
" |
"+title+" "+description+"";
- Element('content_id_'+border_id).innerHTML = toolbarCode;
+
+ document.getElementById('content_id_'+border_id).innerHTML = toolbarCode;
+
resizeWindow();
+
+ var footerMenu = document.getElementById("footer_menu");
+
+ // footer Menu;
+ if( footerMenu )
+ {
+ footerMenu.style.display = "none";
+ }
}
@@ -99,161 +123,94 @@
}
-cnews_edit.prototype.makeWindow = function(options)
-{
- _this = this;
-
- var params =
- {
- 'lang_label1' : get_lang('Enter the URL of RSS service'),
- 'lang_label2' : get_lang('List of registered RSS'),
- 'lang_subscribe' : get_lang('Subscribe')
- };
-
- var el = document.createElement("DIV");
- el.style.visibility = "hidden";
- el.style.position = "absolute";
- el.style.left = "0px";
- el.style.top = "0px";
- el.style.width = "0px";
- el.style.height = "0px";
- el.id = 'dJSWin_newswin';
- el.innerHTML = this.xtools.parse( this.xtools.xml('make_window'), 'stylesheet/makeWindow.xsl', params );
-
- document.body.appendChild(el);
-
- var butt = Element('dJSWin_wfolders_bok');
-
- if ( !butt )
- {
- butt = document.createElement('INPUT');
- butt.style.margin = "3px";
- butt.id = 'dJSWin_wfolders_bok';
- butt.type = 'button';
- butt.value = get_lang('Close');
- el.appendChild(butt);
- }
-
- butt.onclick = function ()
- {
- news_edit.arrayWin[el.id].close();
- }
-
- _this.showWindow(el);
-}
-
-cnews_edit.prototype.showWindow = function (div)
-{
- if(! this.arrayWin[div.id])
- {
- div.style.height = "280px";
- div.style.width = "340px";
- var title = " ";
- var wHeight = div.offsetHeight + "px";
- var wWidth = div.offsetWidth + "px";
- div.style.width = div.offsetWidth - 5;
-
- win = new dJSWin({
- id: 'win_'+div.id,
- content_id: div.id,
- width: wWidth,
- height: wHeight,
- title_color: '#3978d6',
- bg_color: '#eee',
- title: title,
- title_text_color: 'white',
- button_x_img: '../phpgwapi/images/winclose.gif',
- border: true
- });
- this.arrayWin[div.id] = win;
- win.draw();
- }
- else
- {
- win = this.arrayWin[div.id];
- }
-
- win.open();
-
- var handlerChannel = function( data )
- {
- var _listRss = document.getElementById("listRSS");
-
- if( data != null )
- {
- for( var i = 0 ; i < data.length; i++)
- {
- _listRss.innerHTML += "" +
- " " +
- " " +
- " ";
- }
- }
- }
-
- cExecute('$this.rss.getChannels',handlerChannel);
-}
+cnews_edit.prototype.trim = function(inputString)
+{
+ if (typeof inputString != "string")
+ return inputString;
+
+ var retValue = inputString;
+ var ch = retValue.substring(0, 1);
+
+ while (ch == " ")
+ {
+ retValue = retValue.substring(1, retValue.length);
+ ch = retValue.substring(0, 1);
+ }
+ ch = retValue.substring(retValue.length-1, retValue.length);
+
+ while ( ch == " ")
+ {
+ retValue = retValue.substring(0, retValue.length-1);
+ ch = retValue.substring(retValue.length-1, retValue.length);
+ }
+
+ while (retValue.indexOf(" ") != -1)
+ {
+ retValue = retValue.substring(0, retValue.indexOf(" ")) + retValue.substring(retValue.indexOf(" ")+1, retValue.length);
+ }
+
+ return retValue;
+}
+
+
cnews_edit.prototype.unsubscribe = function(url,el)
{
- var rem_handler = function (data)
- {
- if ( data != "Success" )
- {
- if (data == "Error")
- alert(get_lang("Database Error"));
- else
- alert(get_lang("Invalid entry"));
- }
- else
- {
- el.parentNode.parentNode.removeChild( el.parentNode );
- }
- };
-
- cExecute('$this.rss.removeChannel&url='+escape(url),rem_handler);
-}
+ var _select = document.getElementById("list_rss");
+
+ for( var i = 0 ; i < _select.options.length; i++ )
+ {
+ if( _select.options[i].selected == true )
+ {
+ _select.removeChild(_select.options[i]);
+ i--;
+ }
+ }
+}
+
cnews_edit.prototype.subscribe = function()
{
- var newTableEl = document.getElementById("listRSS");
- var val = trim( Element('rssEnter').value );
-
- if( val != "" )
- {
- this.rssXml = this.xtools.load('controller.php?action=$this.rss.getContent&url='+escape(val));
-
- var params =
- {
- 'linkURL' : val
- };
-
- var _div = document.createElement("div");
- _div.innerHTML = this.xtools.parse( this.rssXml, 'stylesheet/news_add.xsl', params );
-
- var add_handler = function (data)
- {
- if ( data != "Success" )
- {
- if ( data == "Error" )
- alert( get_lang("Database Error") );
- else
- alert( get_lang("Invalid entry") );
- }
- else
- {
- newTableEl.appendChild(_div);
- }
- };
-
- try
- {
- if( _div.childNodes[2].getAttribute("titleRss") )
- {
- var name = _div.childNodes[2].getAttribute("titleRss");
-
- cExecute('$this.rss.addChannel&url='+escape(val)+'&name='+name,add_handler);
- }
- }
- catch(e){ }
- }
-
+ var _select = document.getElementById("list_rss");
+
+ var _rssUrl = this.trim( document.getElementById('rssEnter').value );
+
+ if( _rssUrl != "" )
+ {
+ var _lang = document.getElementById('lang_can_not_access_this_rss').value
+
+ try
+ {
+ this.rssXml = this.xtools.load('expressoMail1_2/controller.php?action=$this.rss.getContent&url='+escape(_rssUrl));
+
+ title = this.rssXml.getElementsByTagName("title");
+
+ if( title.length > 0 && this.trim(title[0].childNodes[0].nodeValue) != "" )
+ {
+ var flag = false;
+
+ for( var i = 0; i < _select.options.length; i++ )
+ {
+ if( this.trim( _select.options[i].value ) == this.trim( _rssUrl ) )
+ {
+ flag = true;
+ }
+ }
+
+ if( !flag )
+ {
+ var _value = _rssUrl + "|" + title[0].childNodes[0].nodeValue;
+ _select.options[_select.length] = new Option( title[0].childNodes[0].nodeValue, _value , false, true );
+ }
+
+ document.getElementById('rssEnter').value = "";
+ }
+ else
+ {
+ alert( _lang + "!!" );
+ }
+ }
+ catch(e)
+ {
+ alert( _lang + "!!" );
+ }
+ }
};
Index: branches/2.2/expressoMail1_2/js/draw_api.js
===================================================================
--- branches/2.2/expressoMail1_2/js/draw_api.js (revision 4688)
+++ branches/2.2/expressoMail1_2/js/draw_api.js (revision 4957)
@@ -115,5 +115,5 @@
else{
if (!expresso_offline)
- {
+ {
tree_folders = new dFTree({name: 'tree_folders'});
@@ -159,54 +159,59 @@
}
- var handlerChannel = function(data)
+ var handlerChannel = function(data)
+ {
+
+ if ( data == null || typeof(data) == 'string')
+ {
+ return false;
+ }
+
+ var nodeParent = document.getElementById('content_folders');
+ var treeRss = new dFTree({name: 'treeRss'});
+ var root_rss = new dNode({id:'news_root', caption: get_lang("News")});
+
+ treeRss.add(root_rss,'anything');
+
+ for( i=0; i < data.length; i++ )
{
-
- if ( data == null || typeof(data) == 'string')
- {
- return false;
- }
-
- var nodeParent = document.getElementById('content_folders');
- var treeRss = new dFTree({name: 'treeRss'});
- var root_rss = new dNode({id:'news_root', caption: get_lang("News")});
-
- treeRss.add(root_rss,'anything');
-
- for( i=0; i < data.length; i++ )
+ var nodeNews = new dNode(
{
- var nodeNews = new dNode(
- {
id: "NEWS/"+data[i].name,
caption: data[i].name,
onClick: "open_rss('"+data[i].rss_url+"')",
plusSign: 0
- });
- treeRss.add(nodeNews,"news_root");
- }
+ });
+ treeRss.add(nodeNews,"news_root");
+ }
- treeRss.draw( nodeParent );
+ treeRss.draw( nodeParent );
- with ( document.getElementById('lnews_roottreeRss') )
- {
- style.backgroundImage = "url(templates/"+template+"/images/menu/rss.png)";
- style.marginLeft = "2px";
- }
-
- if( nodeParent.firstChild.id != ("dftree_" + treeRss.name ) )
- {
- var _folder = Element(nodeParent.firstChild.id);
- var _rssNews = Element("dftree_" + treeRss.name );
+ with ( document.getElementById('lnews_roottreeRss') )
+ {
+ style.backgroundImage = "url(templates/"+template+"/images/menu/rss.png)";
+ style.marginLeft = "2px";
+ }
+
+ if( nodeParent.firstChild.id != ("dftree_" + treeRss.name ) )
+ {
+ var _folder = Element(nodeParent.firstChild.id);
+ var _rssNews = Element("dftree_" + treeRss.name );
- nodeParent.insertBefore( _rssNews, _folder );
- }
+ nodeParent.insertBefore( _rssNews, _folder );
+ }
- }
-
- if( eval(enabledReadRSS ) == true )
- cExecute('$this.rss.getChannels',handlerChannel);
-
+ }
+
+ if( eval(enabledReadRSS ) == true )
+ {
+ setTimeout(function()
+ {
+ cExecute('$this.rss.getChannels',handlerChannel);
+ }, 2000);
+ }
+
/**
- * Pastas locais
- */
+ * Pastas locais
+ */
if (preferences.use_local_messages==1 || expresso_offline) {
if (!window.google || !google.gears) {
Index: branches/2.2/expressoMail1_2/js/doiMenuData.js
===================================================================
--- branches/2.2/expressoMail1_2/js/doiMenuData.js (revision 4684)
+++ branches/2.2/expressoMail1_2/js/doiMenuData.js (revision 4957)
@@ -10,24 +10,10 @@
if (!expresso_offline)
{
- if( eval(enabledReadRSS ) == true )
- {
- var itens = new Array( "preferences_mail()|" + get_lang("Preferences") + "|preferences.png",
- "search_emails(\"\")|" + get_lang("Search") + "|search.png",
- "filterbox()|" + get_lang("Edit filters") + "|filters.png",
- "folderbox()|" + get_lang("Edit folders") + "|editfolders.png",
- "sharebox()|" + get_lang("Share mailbox") + "|usersfolders.png",
- "editrss()|" + get_lang("Edit my news") + "|rss.png",
- "empty_trash_imap()|" + get_lang("Empty trash") + "|trash.png");
- }
- else
- {
- var itens = new Array( "preferences_mail()|" + get_lang("Preferences") + "|preferences.png",
- "search_emails(\"\")|" + get_lang("Search") + "|search.png",
- "filterbox()|" + get_lang("Edit filters") + "|filters.png",
- "folderbox()|" + get_lang("Edit folders") + "|editfolders.png",
- "sharebox()|" + get_lang("Share mailbox") + "|usersfolders.png",
- "empty_trash_imap()|" + get_lang("Empty trash") + "|trash.png");
-
- }
+ var itens = new Array( "preferences_mail()|" + get_lang("Preferences") + "|preferences.png",
+ "search_emails(\"\")|" + get_lang("Search") + "|search.png",
+ "filterbox()|" + get_lang("Edit filters") + "|filters.png",
+ "folderbox()|" + get_lang("Edit folders") + "|editfolders.png",
+ "sharebox()|" + get_lang("Share mailbox") + "|usersfolders.png",
+ "empty_trash_imap()|" + get_lang("Empty trash") + "|trash.png");
if(preferences.use_local_messages==1)
|