Merge lp:~daker/loco-team-portal/fix.identica into lp:loco-team-portal

[Adnane Belmadiaf]

* Removed identi.ca from the feed

[Chris Johnston (cjohnston)]

I'm wondering if we should just drop twidenash in favor of the twitter scripts that are being used on summit.u.c and uds.u.c?

review: Needs Information

[Adnane Belmadiaf (daker)]

Yes we can but for now we need to fix what we have.

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:loco-team-portal failed due to conflicts:

text conflict in loco_directory/templates/base.html

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:loco-team-portal failed due to conflicts:

text conflict in loco_directory/templates/base.html

[lp:~daker/loco-team-portal/fix.identica]

530. By Adnane Belmadiaf on 2012-09-25

* Revert to fix merge conflicts

=== modified file 'loco_directory/templates/base.html'
=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html	2012-06-02 11:50:27 +0000
+++ loco_directory/templates/events/global_event_detail.html	2012-09-25 20:20:27 +0000
@@ -10,7 +10,11 @@
         <script type="text/javascript"> 
         //<![CDATA[
         $(function(){
-            $('.twidenash').twidenash();
+            $('.twidenash').twidenash({
+                sources: [
+                    'http://search.twitter.com/',
+                ]
+            });
             $('#venue-map').showLocations({markers_url:'{% url global-event-locations global_event_id=global_event_object.id %}',
                                            marker_icon: '{{ MEDIA_URL }}/img/marker.png'});
         });

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2012-06-18 22:31:29 +0000
+++ loco_directory/templates/index.html	2012-09-25 20:20:27 +0000
@@ -13,7 +13,11 @@
         <script type="text/javascript"> 
         //<![CDATA[
             $(function() {
-                $('.twidenash').twidenash();
+                $('.twidenash').twidenash( {
+                    sources: [
+                        'http://search.twitter.com/',
+                    ]
+                });
             });
         //]]>
         </script>

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2012-06-04 22:14:50 +0000
+++ loco_directory/templates/teams/team_detail.html	2012-09-25 20:20:27 +0000
@@ -42,7 +42,11 @@
 <script type="text/javascript"> 
 $(function() {
     var perPage = '16';
-    $('.twidenash').twidenash();
+    $('.twidenash').twidenash({
+        sources: [
+            'http://search.twitter.com/',
+        ]
+    });
 
     {% if team.flickr_id %}
         $('#flickr').flickr({ key: "{{ flickr_api_key }}", id: "{{ team.flickr_id }}", amount: 6 });