[gatein-commits] gatein SVN: r7639 - epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator.

Author: theute Date: 2011-10-04 03:02:13 -0400 (Tue, 04 Oct 2011) New Revision: 7639 Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/rssAggregator.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js Log: JBEPP-1251: Small issues in RSS gadget Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/rssAggregator.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/rssAggregator.xml 2011-10-04 06:49:53 UTC (rev 7638) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/rssAggregator.xml 2011-10-04 07:02:13 UTC (rev 7639) @@ -23,7 +23,8 @@ <Module> <ModulePrefs title="RSS Reader" title_url="http://www.exoplatform.com" directory_title="RSS Reader" description="RSS Reader" - thumbnail="images/rssAggregator.png"> + thumbnail="images/rssAggregator.png" + height="229"> <Require feature="dynamic-height" /> <Require feature="setprefs"/> <Require feature="settitle"/> @@ -35,7 +36,7 @@ <link rel="stylesheet" type="text/css" href="style.css"></link> <script type="text/javascript" src="script.js"></script> -<div id="feedContainer" style="height:229px;overflow:auto;"></div> +<div id="feedContainer" style="height:auto;overflow:auto;"></div> <script type="text/javascript"> // Get userprefs Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js 2011-10-04 06:49:53 UTC (rev 7638) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/src/main/webapp/gadgets/rssAggregator/script.js 2011-10-04 07:02:13 UTC (rev 7639) @@ -44,43 +44,7 @@ return "an indeterminate amount of time ago" } time = (new Date().getTime()*1000 - B) / 1000; - if (time < 60) { - return "less than a minute ago" - } else { - if (time < 120) { - return "about a minute ago" - } else { - if (time < 3600) { - var A = Math.round(time / 60); - return "about " + A + " minutes ago" - } else { - if (time < 7200) { - return "about an hour ago" - } else { - if (time < 86400) { - var A = Math.round(time / 3600); - return "about " + A + " hours ago" - } else { - if (time < 172800) { - return "about a day ago" - } else { - if (time < 2592000) { - var A = Math.round(time / 86400); - return "about " + A + " days ago" - } else { - if (time < 5184000) { - return "about a month ago" - } else { - var A = Math.round(time / 2592000); - return "about " + A + " months ago" - } - } - } - } - } - } - } - } + return (new Date(B).toLocaleString()); } RssAggregator.prototype.renderFeed = function(feedObj) {