[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 40eea30f7b2f348463516006d543bbb9b86efadf

[Michal Čihař]

The branch, master has been updated
       via  40eea30f7b2f348463516006d543bbb9b86efadf (commit)
       via  ed376648dc131f6b40fb4c0bcc413594ec8ed56f (commit)
      from  5a7d80a5093cf79e6623daaeea4a54a17a85f152 (commit)


- Log -----------------------------------------------------------------
commit 40eea30f7b2f348463516006d543bbb9b86efadf
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri May 21 09:54:30 2010 +0200

    Fix feed URL.

commit ed376648dc131f6b40fb4c0bcc413594ec8ed56f
Author: Adnan <hiddenpearls at gmail.com>
Date:   Fri May 21 12:36:33 2010 +0500

    patch for planet twitter

-----------------------------------------------------------------------

Summary of changes:
 planet.ini            |    2 +-
 theme/index.html.tmpl |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/planet.ini b/planet.ini
index 7d93d81..bfaeb21 100644
--- a/planet.ini
+++ b/planet.ini
@@ -37,7 +37,7 @@ name = Martynas Mickevičius
 [http://lorilee1.wordpress.com/feed/]
 name = Lori Lee
 
-[http://www.imblog.info/feed/]
+[http://www.imblog.info/feed]
 name = Adnan Mughal
 
 [http://crackpl.eu/blog/feed/]
diff --git a/theme/index.html.tmpl b/theme/index.html.tmpl
index 087c9df..bcda699 100644
--- a/theme/index.html.tmpl
+++ b/theme/index.html.tmpl
@@ -115,6 +115,45 @@ Planet phpMyAdmin aggregates blogs of following phpMyAdmin contributors.
 </TMPL_LOOP>
 </ul>
 
+<p>
+<!--
+Twitter Search widget generated by Adnan  
+http://www.imblog.info
+-->
+<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'search',
+  search: 'pma-gsoc',
+  interval: 6000,
+  title: 'Developers at phpMyAdmin',
+  subject: 'PMA GSOC',
+  width: 250,
+  height: 300,
+  theme: {
+    shell: {
+      background: '#036',
+      color: '#ffffff'
+    },
+    tweets: {
+      background: '#ffffff',
+      color: '#444444',
+      links: '#1985b5'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: true,
+    live: true,
+    hashtags: true,
+    timestamp: true,
+    avatars: true,
+    behavior: 'default'
+  }
+}).render().start();
+</script>
+</p>
 <h3>Last updated</h3>
 <p>
 <TMPL_VAR date><br />


hooks/post-receive
-- 
Planet phpMyAdmin