From f4614a7f5f82eec4d49685650e2fd5eb38e50c1c Mon Sep 17 00:00:00 2001
From: ands <ands@andspad.(none)>
Date: Mon, 6 Dec 2010 00:26:29 +0100
Subject: [PATCH] =?UTF-8?q?links=20aus=20der=20TwitterWall=20gel=C3=B6scht?=
=?UTF-8?q?,=20css=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
webroot/css/widget_light.css | 16 +++++++
webroot/widgets/TwitterWall/TwitterWall.php | 2 +-
webroot/widgets/TwitterWall/jquery.tweet.js | 48 +++------------------
3 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/webroot/css/widget_light.css b/webroot/css/widget_light.css
index 0436fb0..c4f2e13 100644
--- a/webroot/css/widget_light.css
+++ b/webroot/css/widget_light.css
@@ -14,6 +14,20 @@
font-family: inherit;
font-size: 1.0em;
}
+.widget_light h2 {
+ margin: 0;
+ padding: 0;
+ font-family: inherit;
+ font-size: 0.8em;
+ color: #111111;
+}
+.widget_light h3 {
+ margin: 0;
+ padding: 0;
+ font-family: inherit;
+ font-size: 0.6em;
+ color: #222222;
+}
.widget_light ul {
background-color:#95897E;
margin: 10;
@@ -27,6 +41,8 @@
border-bottom: 1px dashed #F2EFE5;
border-left: 1px dashed #F2EFE5;
border-right: 1px dashed #F2EFE5;
+ width: 100%;
+ color: #333333;
}
.widget_light li img {
padding: 4;
diff --git a/webroot/widgets/TwitterWall/TwitterWall.php b/webroot/widgets/TwitterWall/TwitterWall.php
index 693ae06..3576143 100644
--- a/webroot/widgets/TwitterWall/TwitterWall.php
+++ b/webroot/widgets/TwitterWall/TwitterWall.php
@@ -21,7 +21,7 @@ class TwitterWall implements iWidget
if (TwitterMail_everyFive == 5) {
TwitterMail_everyFive = 0;
$(".tweet").tweet({
- avatar_size: 64,
+ avatar_size: 48,
count: 5,
loading_text: "loading tweets...",
query: "#warpzone"
diff --git a/webroot/widgets/TwitterWall/jquery.tweet.js b/webroot/widgets/TwitterWall/jquery.tweet.js
index fa2009c..7efe4cf 100644
--- a/webroot/widgets/TwitterWall/jquery.tweet.js
+++ b/webroot/widgets/TwitterWall/jquery.tweet.js
@@ -22,44 +22,6 @@
if(o) $.extend(s, o);
$.fn.extend({
- linkUrl: function() {
- var returning = [];
- var regexp = /((ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
- this.each(function() {
- returning.push(this.replace(regexp,"<a href=\"$1\">$1</a>"));
- });
- return $(returning);
- },
- linkUser: function() {
- var returning = [];
- var regexp = /[\@]+([A-Za-z0-9-_]+)/gi;
- this.each(function() {
- returning.push(this.replace(regexp,"<a href=\"http://twitter.com/$1\">@$1</a>"));
- });
- return $(returning);
- },
- linkHash: function() {
- var returning = [];
- var regexp = /(?:^| )[\#]+([A-Za-z0-9-_]+)/gi;
- this.each(function() {
- returning.push(this.replace(regexp, ' <a href="http://search.twitter.com/search?q=&tag=$1&lang=all&from='+s.username.join("%2BOR%2B")+'">#$1</a>'));
- });
- return $(returning);
- },
- capAwesome: function() {
- var returning = [];
- this.each(function() {
- returning.push(this.replace(/\b(awesome)\b/gi, '<span class="awesome">$1</span>'));
- });
- return $(returning);
- },
- capEpic: function() {
- var returning = [];
- this.each(function() {
- returning.push(this.replace(/\b(epic)\b/gi, '<span class="epic">$1</span>'));
- });
- return $(returning);
- },
makeHeart: function() {
var returning = [];
this.each(function() {
@@ -146,17 +108,17 @@
var join_text = s.join_text;
};
- var from_user = item.from_user || item.user.screen_name;
+ var from_user = '<h2>'+(item.from_user || item.user.screen_name)+': </h2>';
var profile_image_url = item.profile_image_url || item.user.profile_image_url;
var join_template = '<span class="tweet_join"> '+join_text+' </span>';
var join = ((s.join_text) ? join_template : ' ');
- var avatar_template = '<a class="tweet_avatar" href="http://twitter.com/'+from_user+'"><img src="'+profile_image_url+'" height="'+s.avatar_size+'" width="'+s.avatar_size+'" alt="'+from_user+'\'s avatar" title="'+from_user+'\'s avatar" border="0"/></a>';
+ var avatar_template = '<img src="'+profile_image_url+'" height="'+s.avatar_size+'" width="'+s.avatar_size+'" alt="'+from_user+'\'s avatar" title="'+from_user+'\'s avatar" border="0"/>';
var avatar = (s.avatar_size ? avatar_template : '');
- var date = '<span class="tweet_time"><a href="http://twitter.com/'+from_user+'/statuses/'+item.id_str+'" title="view tweet on twitter">'+relative_time(item.created_at)+'</a></span>';
- var text = '<span class="tweet_text">' +$([item.text]).linkUrl().linkUser().linkHash().makeHeart().capAwesome().capEpic()[0]+ '</span>';
+ var date = '<h3 class="tweet_time">'+relative_time(item.created_at)+'</h3>';
+ var text = '<span class="tweet_text">'+$([item.text]).makeHeart()[0]+ '</span>';
// until we create a template option, arrange the items below to alter a tweet's display.
- list.append('<li>' + avatar + from_user + ': ' + date + join + text + '</li>');
+ list.append('<li>' + avatar + from_user + date + join + text + '</li>');
list.children('li:first').addClass('tweet_first');
list.children('li:odd').addClass('tweet_even');
--
GitLab