Changeset 5761

Timestamp:

Nov 28, 2019, 9:06:32 AM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #1207: Replace the "Nothing yet" in the activity log with a quote-of-the-day

Implemented a static qoute from our old friend Indy.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• resources/index.js (modified) (1 diff)
• resources/index.jsp (modified) (3 diffs)
• src/net/sf/basedb/reggie/activity/ActivityLog.java (modified) (2 diffs)
• src/net/sf/basedb/reggie/activity/QuoteOfTheDay.java (added)
• src/net/sf/basedb/reggie/servlet/SessionServlet.java (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/index.js

@@ -228 +228 @@
         html += '<span class="activity-time">'+Strings.encodeTags(activity.time)+'</span>';
         html += '<span class="activity-message">' + Strings.encodeTags(activity.message) + '</span>';
+        if (activity.quoteOfTheDay && activityNo == 0)
+        {
+          html += '<span class="activity-author">' + Strings.encodeTags(activity.author) + '</span>';
+          html += '<div class="activity-link">';
+          html += '<a href="https://theysaidso.com" title="Powered by quotes from The Said So" target="_blank" rel="noopener noreferrer">theysaidso.com</a>';
+          html += '</div>';
+        }
         html += '</div>';
+        if (activity.quoteOfTheDay && activityNo == 0)
+        {
+          Doc.element('quote-of-the-day').innerHTML = html;
+          html = '';
+        }
       }
       Doc.element('activity-log-entries').innerHTML = html;

extensions/net.sf.basedb.reggie/trunk/resources/index.jsp

@@ -218 +218 @@
 }
 
+
+#activity-log .activity.quote-of-the-day
+{
+  font-style: italic;
+  white-space: normal;
+  text-align: center;
+  margin: 1em 1em 0.5em 0;
+  border-top-width: 1px;
+  border-top-style: dotted;
+  padding-top: 0.5em;
+}
+
+#activity-log .activity-author
+{
+  white-space: nowrap;
+}
+
+#activity-log .activity-author:before
+{
+  content: '–';
+  padding-left: 0.5em;
+  padding-right: 0.25em;
+}
+
+#activity-log .quote-of-the-day .activity-link
+{
+  text-align: right;
+  border-top-width: 1px;
+  border-top-style: dotted;
+  margin-top: 0.5em;
+}
+
 #activity-log .activity-time
 {
@@ -223 +255 @@
   color: #666666;
 }
+
+#activity-log .quote-of-the-day .activity-time
+{
+  display: none;
+}
+
 #activity-log-rss
 {
@@ -1229 +1267 @@
 
           <div id="activity-log">
+            <div id="quote-of-the-day"></div>
             <a id="activity-log-rss" href="<%=servletHome%>/ActivityLog.rss" 
               title="Get the activity log as an RSS feed"><img src="images/rss.png"></a>

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/activity/ActivityLog.java

@@ -108 +108 @@
   
   private volatile byte[] rssFeed;
+  private volatile QuoteOfTheDay quoteOfTheDay;
   
   private ActivityLog()
@@ -188 +189 @@
   }
 
+  public QuoteOfTheDay getQuoteOfTheDay()
+  {
+    if (quoteOfTheDay == null)
+    {
+      QuoteOfTheDay tmp = new QuoteOfTheDay();
+      tmp.setAuthor("Indiana Jones - Raiders of the Lost Ark");
+      tmp.setQuote("There's a big snake in the plane, Jock!");
+      quoteOfTheDay = tmp;
+    }
+    return quoteOfTheDay;
+  }
   
   /**

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/SessionServlet.java

@@ -29 +29 @@
 import net.sf.basedb.reggie.activity.ActivityEntry;
 import net.sf.basedb.reggie.activity.ActivityLog;
+import net.sf.basedb.reggie.activity.QuoteOfTheDay;
 import net.sf.basedb.reggie.converter.DateToStringConverter;
 import net.sf.basedb.reggie.counter.CounterService;
@@ -155 +156 @@
         if (!"Today".equals(firstDay))
         {
-          // Add 'Nothing yet' as first entry of Today
           JSONObject jsonActivity = new JSONObject();
-          jsonActivity.put("day", "Today");
-          jsonActivity.put("message", "Nothing yet");
           jsonActivity.put("time", toTime.convert(new Date()));
-          jsonActivity.put("subclass", "nothing-yet");
+          QuoteOfTheDay qod = ActivityLog.getInstance().getQuoteOfTheDay();
+          if (qod != null)
+          {
+            jsonActivity.put("message", qod.getQuote());
+            jsonActivity.put("author", qod.getAuthor());
+            jsonActivity.put("subclass", "quote-of-the-day");
+            jsonActivity.put("quoteOfTheDay", true);
+          }
+          else
+          {
+            // Add 'Nothing yet' as first entry of Today
+            jsonActivity.put("day", "Today");
+            jsonActivity.put("message", "Nothing yet");
+            jsonActivity.put("subclass", "nothing-yet");
+          }
           jsonActivityLog.add(0, jsonActivity);
         }
@@ -285 +297 @@
   }
   
-  
 }