From 5c7da64ea83b4b274e31bc4dbd1fc62b413cb965 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 11 Sep 2013 11:08:50 -0700 Subject: [PATCH] Replaced admin Twitter feed with blog feed. Added Total Users online count to tab description. --- e107_admin/includes/infopanel.php | 57 ++--- e107_themes/bootstrap/admin_style.css | 5 +- e107_web/js/tweet/jquery.tweet.js | 264 -------------------- e107_web/js/zrssfeed/jquery.zrssfeed.min.js | 8 + 4 files changed, 37 insertions(+), 297 deletions(-) delete mode 100644 e107_web/js/tweet/jquery.tweet.js create mode 100644 e107_web/js/zrssfeed/jquery.zrssfeed.min.js diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index 3f72994b0..a50853d49 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -17,6 +17,8 @@ if (!defined('e107_INIT')) exit; } +define('ADMINFEED', 'http://e107.org/adminfeed'); +define('ADMINFEEDMORE', 'http://e107.org/blog'); class adminstyle_infopanel { @@ -25,33 +27,19 @@ class adminstyle_infopanel function __construct() { - e107::js('core','tweet/jquery.tweet.js'); - // e107::css('core','tweet/jquery.tweet.css'); + e107::js('core','zrssfeed/jquery.zrssfeed.min.js'); // http://www.zazar.net/developers/jquery/zrssfeed/ + + $code = " + - $code = <<- {time} » {retweet_action}", - filter: function(t){ return ! /^@\w+/.test(t.tweet_raw_text); }, - auto_join_text_default: "", - auto_join_text_ed: "", - auto_join_text_ing: "", - auto_join_text_reply: "", - auto_join_text_url: "", - loading_text: " Loading news...", - refresh_interval: 60 - }); - }); -EOF; - - - + $('#e-adminfeed').rssfeed('".ADMINFEED."', { + limit: 3, + header: false, + linktarget: '_blank' + }); + }); +"; global $user_pref; // quick fix. $pref = e107::getPref(); @@ -89,8 +77,9 @@ EOF; $pref = e107::getPref(); $frm = e107::getForm(); - /* - XXX Check Bootstrap bug is fixed. + + // XXX Check Bootstrap bug is fixed. + /* echo ' '; - */ - + */ //TODO LANs throughout. global $style, $user_pref; @@ -213,7 +201,7 @@ EOF; // ------------------------------- e107 News -------------------------------- - $text2 = $ns->tablerender("e107 News","
","core-infopanel_news",true); + $text2 = $ns->tablerender("e107 News","
".LAN_MORE."
","core-infopanel_news",true); @@ -354,7 +342,7 @@ EOF; $dashboard = '
@@ -380,7 +368,7 @@ EOF; - function renderOnlineUsers() + function renderOnlineUsers($data=false) { $ol = e107::getOnline(); @@ -408,6 +396,11 @@ EOF; "; $online = $ol->userList() + $ol->guestList(); + + if($data == 'count') + { + return count($online); + } // echo "Users: ".print_a($online); diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 98a977dc1..70b175151 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -898,7 +898,10 @@ li.plupload_delete a { background-position: -525px 0; width: 16px; height: 16px; } - +li.rssRow > div { + font-size: 80%; + color: rgb(153, 153, 153); +} diff --git a/e107_web/js/tweet/jquery.tweet.js b/e107_web/js/tweet/jquery.tweet.js deleted file mode 100644 index d611c5aa3..000000000 --- a/e107_web/js/tweet/jquery.tweet.js +++ /dev/null @@ -1,264 +0,0 @@ -// jquery.tweet.js - See http://tweet.seaofclouds.com/ or https://github.com/seaofclouds/tweet for more info -// Copyright (c) 2008-2012 Todd Matthews & Steve Purcell -(function (factory) { - if (typeof define === 'function' && define.amd) - define(['jquery'], factory); // AMD support for RequireJS etc. - else - factory(jQuery); -}(function ($) { - $.fn.tweet = function(o){ - var s = $.extend({ - username: null, // [string or array] required unless using the 'query' option; one or more twitter screen names (use 'list' option for multiple names, where possible) - list: null, // [string] optional name of list belonging to username - favorites: false, // [boolean] display the user's favorites instead of his tweets - query: null, // [string] optional search query (see also: http://search.twitter.com/operators) - avatar_size: null, // [integer] height and width of avatar if displayed (48px max) - count: 3, // [integer] how many tweets to display? - fetch: null, // [integer] how many tweets to fetch via the API (set this higher than 'count' if using the 'filter' option) - page: 1, // [integer] which page of results to fetch (if count != fetch, you'll get unexpected results) - retweets: true, // [boolean] whether to fetch (official) retweets (not supported in all display modes) - intro_text: null, // [string] do you want text BEFORE your your tweets? - outro_text: null, // [string] do you want text AFTER your tweets? - join_text: null, // [string] optional text in between date and tweet, try setting to "auto" - auto_join_text_default: " I said, ", // [string] auto text for non verb: "I said" bullocks - auto_join_text_ed: " I ", // [string] auto text for past tense: "I" surfed - auto_join_text_ing: " I am ", // [string] auto tense for present tense: "I was" surfing - auto_join_text_reply: " I replied to ", // [string] auto tense for replies: "I replied to" @someone "with" - auto_join_text_url: " I was looking at ", // [string] auto tense for urls: "I was looking at" http:... - loading_text: null, // [string] optional loading text, displayed while tweets load - refresh_interval: null, // [integer] optional number of seconds after which to reload tweets - twitter_url: "twitter.com", // [string] custom twitter url, if any (apigee, etc.) - twitter_api_url: "api.twitter.com", // [string] custom twitter api url, if any (apigee, etc.) - twitter_search_url: "search.twitter.com", // [string] custom twitter search url, if any (apigee, etc.) - template: "{avatar}{time}{join} {text}", // [string or function] template used to construct each tweet
  • - see code for available vars - comparator: function(tweet1, tweet2) { // [function] comparator used to sort tweets (see Array.sort) - return tweet2["tweet_time"] - tweet1["tweet_time"]; - }, - filter: function(tweet) { // [function] whether or not to include a particular tweet (be sure to also set 'fetch') - return true; - } - // You can attach callbacks to the following events using jQuery's standard .bind() mechanism: - // "loaded" -- triggered when tweets have been fetched and rendered - }, o); - - // See http://daringfireball.net/2010/07/improved_regex_for_matching_urls - var url_regexp = /\b((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi; - - // Expand values inside simple string templates with {placeholders} - function t(template, info) { - if (typeof template === "string") { - var result = template; - for(var key in info) { - var val = info[key]; - result = result.split('{'+key+'}').join(val === null ? '' : val); - } - return result; - } else return template(info); - } - // Export the t function for use when passing a function as the 'template' option - $.extend({tweet: {t: t}}); - - function replacer (regex, replacement) { - return function() { - var returning = []; - this.each(function() { - returning.push(this.replace(regex, replacement)); - }); - return $(returning); - }; - } - - function escapeHTML(s) { - return s.replace(//g,"^>"); - } - - $.fn.extend({ - linkUser: replacer(/(^|[\W])@(\w+)/gi, "$1@$2"), - // Support various latin1 (\u00**) and arabic (\u06**) alphanumeric chars - linkHash: replacer(/(?:^| )[\#]+([\w\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0600-\u06ff]+)/gi, - ' #$1'), - makeHeart: replacer(/(<)+[3]/gi, "♥") - }); - - function linkURLs(text, entities) { - return text.replace(url_regexp, function(match) { - var url = (/^[a-z]+:/i).test(match) ? match : "http://"+match; - var text = match; - for(var i = 0; i < entities.length; ++i) { - var entity = entities[i]; - if (entity.url == url && entity.expanded_url) { - url = entity.expanded_url; - text = entity.display_url; - break; - } - } - return ""+escapeHTML(text)+""; - }); - } - - function parse_date(date_str) { - // The non-search twitter APIs return inconsistently-formatted dates, which Date.parse - // cannot handle in IE. We therefore perform the following transformation: - // "Wed Apr 29 08:53:31 +0000 2009" => "Wed, Apr 29 2009 08:53:31 +0000" - return Date.parse(date_str.replace(/^([a-z]{3})( [a-z]{3} \d\d?)(.*)( \d{4})$/i, '$1,$2$4$3')); - } - - function extract_relative_time(date) { - var toInt = function(val) { return parseInt(val, 10); }; - var relative_to = new Date(); - var delta = toInt((relative_to.getTime() - date) / 1000); - if (delta < 1) delta = 0; - return { - days: toInt(delta / 86400), - hours: toInt(delta / 3600), - minutes: toInt(delta / 60), - seconds: toInt(delta) - }; - } - - function format_relative_time(time_ago) { - if ( time_ago.days > 2 ) return 'about ' + time_ago.days + ' days ago'; - if ( time_ago.hours > 24 ) return 'about a day ago'; - if ( time_ago.hours > 2 ) return 'about ' + time_ago.hours + ' hours ago'; - if ( time_ago.minutes > 45 ) return 'about an hour ago'; - if ( time_ago.minutes > 2 ) return 'about ' + time_ago.minutes + ' minutes ago'; - if ( time_ago.seconds > 1 ) return 'about ' + time_ago.seconds + ' seconds ago'; - return 'just now'; - } - - function build_auto_join_text(text) { - if (text.match(/^(@([A-Za-z0-9-_]+)) .*/i)) { - return s.auto_join_text_reply; - } else if (text.match(url_regexp)) { - return s.auto_join_text_url; - } else if (text.match(/^((\w+ed)|just) .*/im)) { - return s.auto_join_text_ed; - } else if (text.match(/^(\w*ing) .*/i)) { - return s.auto_join_text_ing; - } else { - return s.auto_join_text_default; - } - } - - function build_api_url() { - var proto = ('https:' == document.location.protocol ? 'https:' : 'http:'); - var count = (s.fetch === null) ? s.count : s.fetch; - var common_params = '&callback=?'; - if (s.list) { - return proto+"//"+s.twitter_api_url+"/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?page="+s.page+"&per_page="+count+common_params; - } else if (s.favorites) { - return proto+"//"+s.twitter_api_url+"/1/favorites.json?screen_name="+s.username[0]+"&page="+s.page+"&count="+count+common_params; - } else if (s.query === null && s.username.length == 1) { - return proto+'//'+s.twitter_api_url+'/1/statuses/user_timeline.json?screen_name='+s.username[0]+'&count='+count+(s.retweets ? '&include_rts=1' : '')+'&page='+s.page+common_params; - } else { - var query = (s.query || 'from:'+s.username.join(' OR from:')); - return proto+'//'+s.twitter_search_url+'/search.json?&q='+encodeURIComponent(query)+'&rpp='+count+'&page='+s.page+common_params; - } - } - - function extract_avatar_url(item, secure) { - if (secure) { - return ('user' in item) ? - item.user.profile_image_url_https : - extract_avatar_url(item, false). - replace(/^http:\/\/[a-z0-9]{1,3}\.twimg\.com\//, "https://s3.amazonaws.com/twitter_production/"); - } else { - return item.profile_image_url || item.user.profile_image_url; - } - } - - // Convert twitter API objects into data available for - // constructing each tweet
  • using a template - function extract_template_data(item){ - var o = {}; - o.item = item; - o.source = item.source; - o.screen_name = item.from_user || item.user.screen_name; - // The actual user name is not returned by all Twitter APIs, so please do not - // file an issue if it is empty: - o.name = item.from_user_name || item.user.name; - o.retweet = typeof(item.retweeted_status) != 'undefined'; - - o.tweet_time = parse_date(item.created_at); - o.join_text = s.join_text == "auto" ? build_auto_join_text(item.text) : s.join_text; - o.tweet_id = item.id_str; - o.twitter_base = "http://"+s.twitter_url+"/"; - o.user_url = o.twitter_base+o.screen_name; - o.tweet_url = o.user_url+"/status/"+o.tweet_id; - o.reply_url = o.twitter_base+"intent/tweet?in_reply_to="+o.tweet_id; - o.retweet_url = o.twitter_base+"intent/retweet?tweet_id="+o.tweet_id; - o.favorite_url = o.twitter_base+"intent/favorite?tweet_id="+o.tweet_id; - o.retweeted_screen_name = o.retweet && item.retweeted_status.user.screen_name; - o.tweet_relative_time = format_relative_time(extract_relative_time(o.tweet_time)); - o.entities = item.entities ? (item.entities.urls || []).concat(item.entities.media || []) : []; - o.tweet_raw_text = o.retweet ? ('RT @'+o.retweeted_screen_name+' '+item.retweeted_status.text) : item.text; // avoid '...' in long retweets - o.tweet_text = $([linkURLs(o.tweet_raw_text, o.entities)]).linkUser().linkHash()[0]; - o.retweeted_tweet_text = $([linkURLs(item.text, o.entities)]).linkUser().linkHash()[0]; - o.tweet_text_fancy = $([o.tweet_text]).makeHeart()[0]; - - o.avatar_size = s.avatar_size; - o.avatar_url = extract_avatar_url(o.retweet ? item.retweeted_status : item, (document.location.protocol === 'https:')); - o.avatar_screen_name = o.retweet ? o.retweeted_screen_name : o.screen_name; - o.avatar_profile_url = o.twitter_base+o.avatar_screen_name; - - // Default spans, and pre-formatted blocks for common layouts - o.user = t('{screen_name}', o); - o.join = s.join_text ? t('{join_text}', o) : ''; - o.avatar = o.avatar_size ? - t('{avatar_screen_name}\'s avatar', o) : ''; - o.time = t('{tweet_relative_time}', o); - o.text = t('{tweet_text_fancy}', o); - o.retweeted_text = t('{retweeted_tweet_text}', o); - o.reply_action = t('reply', o); - o.retweet_action = t('retweet', o); - o.favorite_action = t('favorite', o); - return o; - } - - function render_tweets(widget, tweets) { - var list = $('
      '); - list.append($.map(tweets, function(o) { return "
    • " + t(s.template, o) + "
      • "; }).join('')). - children('li:first').addClass('tweet_first').end(). - children('li:odd').addClass('tweet_even').end(). - children('li:even').addClass('tweet_odd'); - - $(widget).empty().append(list); - if (s.intro_text) list.before('

      '+s.intro_text+'

      '); - if (s.outro_text) list.after('

      '+s.outro_text+'

      '); - - $(widget).trigger("loaded").trigger((tweets.length === 0 ? "empty" : "full")); - if (s.refresh_interval) { - window.setTimeout(function() { $(widget).trigger("tweet:load"); }, 1000 * s.refresh_interval); - } - } - - function load(widget) { - var loading = $('

      '+s.loading_text+'

      '); - if (s.loading_text) $(widget).not(":has(.tweet_list)").empty().append(loading); - $.getJSON(build_api_url(), function(data){ - var tweets = $.map(data.results || data, extract_template_data); - tweets = $.grep(tweets, s.filter).sort(s.comparator).slice(0, s.count); - $(widget).trigger("tweet:retrieved", [tweets]); - }); - } - - return this.each(function(i, widget){ - if(s.username && typeof(s.username) == "string"){ - s.username = [s.username]; - } - - $(widget).unbind("tweet:render").unbind("tweet:retrieved").unbind("tweet:load"). - bind({ - "tweet:load": function() { load(widget); }, - "tweet:retrieved": function(ev, tweets) { - $(widget).trigger("tweet:render", [tweets]) - }, - "tweet:render": function(ev, tweets) { - render_tweets($(widget), tweets); - } - }).trigger("tweet:load"); - }); - }; -})); diff --git a/e107_web/js/zrssfeed/jquery.zrssfeed.min.js b/e107_web/js/zrssfeed/jquery.zrssfeed.min.js new file mode 100644 index 000000000..893b448a0 --- /dev/null +++ b/e107_web/js/zrssfeed/jquery.zrssfeed.min.js @@ -0,0 +1,8 @@ +(function(l){l.fn.rssfeed=function(b,h,w){h=l.extend({limit:10,offset:1,header:!0,titletag:"h4",date:!0,dateformat:"datetime",content:!0,snippet:!0,media:!0,showerror:!0,errormsg:"",key:null,ssl:!1,linktarget:"_self",linkredirect:"",linkcontent:!1,sort:"",sortasc:!0,historical:!1},h);return this.each(function(z,q){var u=l(q),f="";h.ssl&&(f="s");u.hasClass("rssFeed")||u.addClass("rssFeed");if(null==b)return!1;0'+b.title+"
    • ");m+='
      ';for(f=e.offset;fa?a="< 1 min":(3600>a?(a=Math.round(a/60)-1,c="min"):86400>a?(a=Math.round(a/3600)-1,c="hour"):604800>a?(a=Math.round(a/86400)-1,c="day"):(a=Math.round(a/604800)-1,c="week"),1'+g.title+"";e.date&&a&&(j[d].html+="
      "+a+"
      ");e.content&&(g=e.snippet&&""!=g.contentSnippet?g.contentSnippet:g.content,e.linkcontent&&(g=''+g+""),j[d].html+="

      "+g+"

      ");if(e.media&&0'+r.split("/").pop()+" ("+s+", ",s=Math.floor(Math.log(t)/Math.log(1024)),t=(t/Math.pow(1024,Math.floor(s))).toFixed(2)+" "+"bytes kb MB GB TB PB".split(" ")[s];c.html=y+(r+t+")")}j[d].html+="
    "}}e.sort&&j.sort(function(a,c){if(e.sortasc)var b= +a.sort,d=c.sort;else b=c.sort,d=a.sort;if("date"==e.sort)return new Date(b)-new Date(d);b=b.toLowerCase();d=d.toLowerCase();return bd?1:0});l.each(j,function(a){m+='
  • '+j[a].html+"
    • ";v="odd"==v?"even":"odd"});m+="";l(q).html(m);l("a",q).attr("target",e.linktarget)}l.isFunction(w)&&w.call(this,u)}else h.showerror&&(d=""!=h.errormsg?h.errormsg:b.responseDetails),l(q).html('

    '+d+"

    ")})})};var p=function(b){b+="";2>b.length&& +(b="0"+b);return b},x=function(b){return"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" ")[b]}})(jQuery); \ No newline at end of file