Changeset 337

Timestamp:

Jul 23, 2011, 7:52:44 PM (13 years ago)

Author:

Rick van der Zwet

Message:

More Flickr is better

File:

• dashboard/occ2011-dashboard.html (modified) (3 diffs)

dashboard/occ2011-dashboard.html

@@ -83 +83 @@
 
     // Now start cycling through our array of Flickr photo details
-    $.each(data.items, function(i,item){
-      var sourceSquare = (item.media.m);
-      // I only want the ickle square thumbnails
-      var sourceSquare = (item.media.m).replace("_m.jpg", "_s.jpg");
+    $.each(data.photos.photo, function(i,item){
+      // http://farm3.static.flickr.com/2753/5859450667_d6e29b9fb2_s.jpg
+      var url = 'http://farm' + item.farm + '.static.flickr.com/' + item.server + '/' + item.id + '_' + item.secret + '_s.jpg'; 
+      var target = 'http://www.flickr.com/photos/' + item.owner + '/' + item.id + '/';
 
       // Here's where we piece together the HTML
-      htmlString += '<li><a href="' + item.link + '" target="_blank">';
-      htmlString += '<img src="' + sourceSquare + '" alt="' + item.title + '" title="' + item.title + '"/>';
+      htmlString += '<li><a href="' + target + '" target="_blank">';
+      htmlString += '<img src="' + url + '" alt="' + item.title + '" title="' + item.title + '"/>';
       htmlString += '</a></li>';
     });
@@ -107 +107 @@
   $(document).ready(function(){
     // Our very special jQuery JSON fucntion call to Flickr, gets details of the most recent 20 images
-    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?tags=occ2011&format=json&jsoncallback=?", displayImages);
+//    $.getJSON("http://api.flickr.com/services/feeds/photos_public.gne?tags=occ2011&format=json&jsoncallback=?", displayImages);
+    $.getJSON("http://api.flickr.com/services/rest/?method=flickr.photos.search&name=value&api_key=138a25b8ce15c2cce5491b0c0170f2be&format=json&tags=occ2011&sort=interestingness-desc&page-count=1&jsoncallback=?&tag_mode=all",displayImages);
     $("#tab-set").tabs();
 
@@ -234 +235 @@
       <input type="radio" id="radio3" name="window" value="http://live.occ2011.org:9999/telex.html"   /><label for="radio3">IRC Telex</label>
       <input type="radio" id="radio4" name="window" value="http://live.occ2011.org:9999/room1.html"   /><label for="radio4">Live Presentations</label>
+      <input type="radio" id="radio5" name="window" value="http://noc.occ2011.org/nagios/"   /><label for="radio5">NOC Nagios</label>
+      <input type="radio" id="radio6" name="window" value="http://noc.occ2011.org/smokeping/smokeping.cgi"   /><label for="radio6">NOC Smokeping</label>
    </div>
 </form>