Author: jonathan Date: Sun Jul 13 20:06:38 2008 New Revision: 19205 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19205
Log: Added support for announcements with "announcement" styles, startTime and endTimes set, and reenabled announcements to appear (it looks to me line only announcement exceptions would appear!) Modified: trunk/mashup/java/modules/www/ajax_announcements.jsp trunk/mashup/java/modules/www/css/styles.css trunk/mashup/java/modules/www/taskbar.jsp Modified: trunk/mashup/java/modules/www/ajax_announcements.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/ajax_announcements.jsp?rev=19205&r1=19204&r2=19205&view=diff ============================================================================== --- trunk/mashup/java/modules/www/ajax_announcements.jsp (original) +++ trunk/mashup/java/modules/www/ajax_announcements.jsp Sun Jul 13 20:06:38 2008 @@ -25,9 +25,9 @@ String announcement = announcementsFetcher.get(MashupUtils.getServerUUID(), RegistryUtils.getAnnouncementsUrl()); if (announcement == null) { announcement = ""; - }else{ + } else { // Validate the announcement - if(!announcement.contains("org.wso2.mashup.announcements")){ + if (announcement.contains("org.wso2.mashup.announcements")){ announcement = ""; } } Modified: trunk/mashup/java/modules/www/css/styles.css URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/css/styles.css?rev=19205&r1=19204&r2=19205&view=diff ============================================================================== --- trunk/mashup/java/modules/www/css/styles.css (original) +++ trunk/mashup/java/modules/www/css/styles.css Sun Jul 13 20:06:38 2008 @@ -988,10 +988,17 @@ } div#announcements { - margin:2em 0em 2em 2em; + margin:2em 0em 2em 0em; text-align:center; -}.login-error { +} + +div.announcement { + padding-bottom:2em; + padding-top:2em; +} + +.login-error { color: #FF0000; } Modified: trunk/mashup/java/modules/www/taskbar.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/taskbar.jsp?rev=19205&r1=19204&r2=19205&view=diff ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Sun Jul 13 20:06:38 2008 @@ -345,10 +345,23 @@ }, onSuccess: function (transport) { - document.getElementById("announcements").innerHTML = transport.responseText; + var announcementsDiv = $("announcements"); + announcementsDiv.hide(); + announcementsDiv.innerHTML = transport.responseText; + var now = new Date().valueOf(); + var timedAnnouncements = announcementsDiv.select("div.announcement"); + for (var i=0; i< timedAnnouncements.length; i++) { + var a = timedAnnouncements[i]; + if (a.readAttribute("announcementStartTime") != null) { + if (now < parseInt(a.readAttribute("announcementStartTime")) || parseInt(a.readAttribute("announcementEndTime")) < now) { + a.hide(); + } + } + } + announcementsDiv.show(); }, onFailure: function (transport) { - //Do nothing + //Do nothing } }); </script> \ No newline at end of file _______________________________________________ Mashup-dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
