Changeset 5478

Timestamp:

Nov 5, 2010, 11:38:08 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1545: Publish news as a rss feed

Added servlet RssNewsFeed to serve rss document. It will cache the current news so it should not be too heavy even if clients update often.

The feed includes all public news and the broadcast message that the admin can set in the Administrate -> Broadcast message dialog.

Location:

trunk

Files:

• config/dist/web.xml (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/servlet/RssNewsFeed.java (added)
• www/admin/news/index.jsp (modified) (6 diffs)
• www/admin/server/submit_server.jsp (modified) (2 diffs)
• www/images/rss.png (added)
• www/include/styles/main.css (modified) (1 diff)
• www/info/news.jsp (modified) (4 diffs)
• www/main.jsp (modified) (2 diffs)
• www/my_base/index.jsp (modified) (1 diff)

trunk/config/dist/web.xml

@@ -181 +181 @@
   </servlet-mapping>
 
+  <!-- The News feed servlet  -->
+  <servlet>
+    <servlet-name>news-feed</servlet-name>
+    <servlet-class>
+      net.sf.basedb.clients.web.servlet.RssNewsFeed
+    </servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>news-feed</servlet-name>
+    <url-pattern>/info/news.rss</url-pattern>
+  </servlet-mapping>
 
   <!-- Axis2 servlets for web services -->

trunk/www/admin/news/index.jsp

@@ -43 +43 @@
   import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
+  import="net.sf.basedb.clients.web.servlet.RssNewsFeed"
   import="java.util.Date"
   import="java.util.Set"
@@ -151 +152 @@
     dc.commit();
     cc.removeObject("item");
+    RssNewsFeed.reset();
   }
   else if ("DeleteItem".equals(cmd))
@@ -159 +161 @@
     RemovableUtil.setRemoved(dc, itemType, Collections.singleton(cc.getId()), true);
     dc.commit();
+    RssNewsFeed.reset();
     redirect = viewPage;
   }
@@ -169 +172 @@
     int numRemoved = RemovableUtil.setRemoved(dc, itemType, cc.getSelected(), true);
     dc.commit();
+    RssNewsFeed.reset();
     if (numTotal != numRemoved)
     {
@@ -182 +186 @@
     RemovableUtil.setRemoved(dc, itemType, Collections.singleton(cc.getId()), false);
     dc.commit();
+    RssNewsFeed.reset();
     redirect = viewPage;
   }
@@ -192 +197 @@
     int numRemoved = RemovableUtil.setRemoved(dc, itemType, cc.getSelected(), false);
     dc.commit();
+    RssNewsFeed.reset();
     if (numTotal != numRemoved)
     {

trunk/www/admin/server/submit_server.jsp

@@ -35 +35 @@
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.clients.web.servlet.RssNewsFeed"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -123 +124 @@
       message = "Message is now disabled";
     }
+    RssNewsFeed.reset();
   }
   else

trunk/www/include/styles/main.css

@@ -71 +71 @@
   border-bottom: 0px;
 }
+
+h3 * { vertical-align: bottom; }
 
 h4 {

trunk/www/info/news.jsp

@@ -50 +50 @@
 final String root = request.getContextPath()+"/";
 ItemResultList<News> news = null;
+String broadcastTitle = (String)application.getAttribute("broadcast.title");
+String broadcastMessage = (String)application.getAttribute("broadcast.message");
+boolean denyLogin = Boolean.TRUE.equals(application.getAttribute("broadcast.deny-login"));
+
 try
 {
@@ -63 +67 @@
     <tr>
     <td>
-      <h3>News and announcements</h3>
+      <h3>News and announcements <a href="news.rss" 
+        title="Subscribe to news from this BASE server"
+        ><base:icon image="rss.png" /></a></h3>
       <div id="news" class="news">
       <%
+      if (broadcastTitle != null)
+      {
+        %>
+        <div class="item"><base:icon image="warning.gif" />
+          <a name="broadcast"></a>
+          <span class="date"><%=dateFormatter.format(new Date())%></span>
+          <span class="headline"><%=HTML.encodeTags(broadcastTitle)%><%=denyLogin ? " (login disabled)" : "" %></span><br>
+          <span class="text"><%=HTML.niceFormat(broadcastMessage)%></span>
+        </div>
+        <% 
+      }
       ItemQuery<News> query = News.getQuery();
       query.order(Orders.desc(Hql.property("newsDate")));
@@ -75 +92 @@
         %>
         <div class="item">
+          <a name="<%=n.getId() + "-" + n.getVersion()%>"></a>
           <span class="date"><%=dateFormatter.format(n.getNewsDate())%></span>
           <span class="headline"><%=HTML.encodeTags(n.getName())%></span><br>
@@ -85 +103 @@
     </td>
     </tr>
-    <tr><td><base:icon image="left_arrow.gif" /><a href="<%=root%>/main.jsp?ID=<%=ID%>">Back to login</a></td></tr>
+    <tr><td><base:icon image="goback.gif" /><a href="<%=root%>/main.jsp?ID=<%=ID%>">Back to login</a></td></tr>
     </table>
   </base:body>

trunk/www/main.jsp

@@ -242 +242 @@
       %>
       
-      <h3>News and announcements</h3>
+      <h3>News and announcements <a href="info/news.rss" 
+        title="Subscribe to news from this BASE server"
+        ><base:icon image="rss.png" /></a>
+      </h3>
       <div id="news" class="news">
       <%
@@ -276 +279 @@
       {
         %>
-        <base:icon image="bullet.gif" /><a href="info/news.jsp"><%=news.getTotalCount()-10%> more</a>
+        <base:icon image="bullet.gif" /><a href="info/news.jsp" 
+          title="Show older news..."><%=news.getTotalCount()-10%> more</a>
         <%
       }

trunk/www/my_base/index.jsp

@@ -329 +329 @@
   <td width="50%">
   
-  <h3 class="light docked"><base:icon image="news.gif" />&nbsp;News and announcements (<%=news.size()%>)</h3>
+  <h3 class="light docked"><base:icon image="news.gif" />&nbsp;News and announcements (<%=news.size()%>) <a href="../info/news.rss" 
+        title="Subscribe to news from this BASE server"
+        ><base:icon image="rss.png" /></a></h3>
     <div id="news" class="news welcomesection" style="height: 400px; overflow: auto;">
     <%