From 27b74e73bf0182d661ccc1db2991d83667513580 Mon Sep 17 00:00:00 2001 From: Sanj Date: Fri, 1 Jun 2012 14:02:15 +0530 Subject: [PATCH 1/5] try fb fix --- itf/static/css/noel/inner.css | 4 ++++ itf/templates/noel/render_object.html | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css index 9fc7b95..983fe74 100755 --- a/itf/static/css/noel/inner.css +++ b/itf/static/css/noel/inner.css @@ -424,6 +424,10 @@ clear:both;} padding:0 1px; } +#fb85cd57c { + width: 48px !important; +} + .fb_edge_widget_with_comment { width:48px; } diff --git a/itf/templates/noel/render_object.html b/itf/templates/noel/render_object.html index f85f93d..676a44b 100755 --- a/itf/templates/noel/render_object.html +++ b/itf/templates/noel/render_object.html @@ -192,7 +192,7 @@
- twitter + twitter
@@ -211,7 +211,6 @@ - permalink
From b1bbb1fed27e3fe22279ba7989015457bc9f767f Mon Sep 17 00:00:00 2001 From: Sanj Date: Fri, 1 Jun 2012 15:25:53 +0530 Subject: [PATCH 2/5] um, absolute links --- itf/templates/noel/render_object.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/itf/templates/noel/render_object.html b/itf/templates/noel/render_object.html index 6a1d494..dec27c8 100755 --- a/itf/templates/noel/render_object.html +++ b/itf/templates/noel/render_object.html @@ -192,7 +192,7 @@ + permalink + +
From 06d51e722ec10c8a45cafb68ecae4e52bef95c67 Mon Sep 17 00:00:00 2001 From: Sanj Date: Fri, 1 Jun 2012 20:28:52 +0530 Subject: [PATCH 4/5] social icons align, title size smaller --- itf/static/css/noel/inner.css | 3 ++- itf/templates/noel/render_object.html | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css index a351848..e5bbf9f 100755 --- a/itf/static/css/noel/inner.css +++ b/itf/static/css/noel/inner.css @@ -407,7 +407,8 @@ z-index:50;} height:159px; overflow:hidden; color:#f7bd00; -font-size:50px; +word-wrap: break-word; +font-size:28px; text-align:right; padding-top:20px; padding-right:14px; diff --git a/itf/templates/noel/render_object.html b/itf/templates/noel/render_object.html index 979998d..6d1f5d9 100755 --- a/itf/templates/noel/render_object.html +++ b/itf/templates/noel/render_object.html @@ -212,12 +212,12 @@
- permalink +
- +
{{ item_data.html|safe }} From 4a3b27b2ac575e03b07a0a16f7e67cfb5eb06a09 Mon Sep 17 00:00:00 2001 From: Sanj Date: Sat, 2 Jun 2012 00:10:07 +0530 Subject: [PATCH 5/5] redirect old /itf/ urls --- itf/festival/urls.py | 1 - itf/festival/views.py | 34 ++++++++++++++++++++++++++- itf/templates/noel/render_object.html | 2 +- itf/templates/search/search.html | 2 +- itf/urls.py | 2 +- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/itf/festival/urls.py b/itf/festival/urls.py index 2053595..209f2c8 100755 --- a/itf/festival/urls.py +++ b/itf/festival/urls.py @@ -1,7 +1,6 @@ from django.conf.urls.defaults import * urlpatterns = patterns('', - (r'^$', 'festival.views.home'), (r'^wireframe', 'festival.views.wireframe'), (r'^projects', 'festival.views.projects'), diff --git a/itf/festival/views.py b/itf/festival/views.py index 198af27..053379e 100755 --- a/itf/festival/views.py +++ b/itf/festival/views.py @@ -1,6 +1,6 @@ # Create your views here. from django.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse +from django.http import HttpResponse, HttpResponseRedirect from festival.models import * from bestpractices.models import * from utils import validateEmail @@ -14,6 +14,38 @@ from django.core.mail import send_mail from settings import ERANG_SUBSCRIBE_URL import urllib2 + +def redirect(request, old_url): + REDIRECT_MAPPING = { + 'people': '/m/itf-core/?tab=people', + 'meeting': '/m/itf-core/?tab=meetings', + 'meetings': '/m/itf-core/?tab=meetings', + 'project': '/m/itf-core/?tab=projects', + 'projects': '/m/itf-core/?tab=projects', + 'resources': '/m/bibliography/?tab=documents', + 'bestpractices/story': '/m/bestpractices/?tab=cases', + 'erang': '/m/e-rang/?tab=issues' + } + components = old_url.split("/") + if len(components) > 2 and components[0].startswith('bestpractices'): + part_one = "/".join(components[:-1]) + else: + part_one = components[0] + if part_one in REDIRECT_MAPPING.keys(): + url = REDIRECT_MAPPING[part_one] + if len(components) > 1: + no = components[-1] + try: + object_id = int(no) + if object_id > 0: + url += "&object_id=%d" % object_id + except: + pass + else: + url = "/" + return HttpResponseRedirect(url) + + def index(request): index_data = {} new_meetings = MeetingDay.objects.all().order_by('-meeting_date')[:5] # get 5 latest meetings diff --git a/itf/templates/noel/render_object.html b/itf/templates/noel/render_object.html index 6d1f5d9..dd2b593 100755 --- a/itf/templates/noel/render_object.html +++ b/itf/templates/noel/render_object.html @@ -6,7 +6,7 @@ - +