From 98f0013d8b74381606cde5a8a30e8ce47f2dbbf6 Mon Sep 17 00:00:00 2001
From: sanj <sanj@sanj>
Date: Sun, 29 Aug 2010 22:38:07 +0530
Subject: [PATCH] changed titles to India Theatre Forum from ITF, and added
 link to erang

---
 itf/itfcore/admin.py            | 6 +++---
 itf/itfcore/models.py           | 3 ++-
 itf/templates/erang.html        | 4 +++-
 itf/templates/home.html         | 2 +-
 itf/templates/meeting.html      | 2 +-
 itf/templates/meetings.html     | 2 +-
 itf/templates/people.html       | 2 +-
 itf/templates/project.html      | 2 +-
 itf/templates/projects.html     | 2 +-
 itf/templates/publications.html | 2 +-
 itf/templates/resources.html    | 2 +-
 itf/templates/surveys.html      | 2 +-
 12 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/itf/itfcore/admin.py b/itf/itfcore/admin.py
index 7f0535f..786ae6a 100755
--- a/itf/itfcore/admin.py
+++ b/itf/itfcore/admin.py
@@ -1,7 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth.models import User
 from models import *
-
+'''
 #class NicknameInline(admin.StackedInline):
 #  model = Nickname
 #  extra = 3
@@ -14,7 +14,7 @@ from models import *
 #  extra = 3
 
 class ProfileInline(admin.StackedInline):
-  model = Profile
+  model = Person
   extra = 1
 
 class PerformanceAdmin(admin.ModelAdmin):
@@ -64,4 +64,4 @@ admin.site.register(Nickname)
 admin.site.register(TheatreGroup, TheatreGroupAdmin) 
 admin.site.register(Venue, VenueAdmin) 
 admin.site.register(Profile, ProfileAdmin) 
-
+'''
diff --git a/itf/itfcore/models.py b/itf/itfcore/models.py
index c23d923..19b6b9e 100644
--- a/itf/itfcore/models.py
+++ b/itf/itfcore/models.py
@@ -7,6 +7,7 @@ from oxdjango.fields import DictField
 GENDER_CHOICES = (
   ('M', 'Male'),
   ('F', 'Female'),
+  ('O', 'Other'),
 )
 
 class Person(models.Model):
@@ -55,7 +56,7 @@ class PhotoAlbum(models.Model):
 class Photo(models.Model):
   image = models.ImageField(upload_to='photos/') # PLEASE CHANGE UPLOAD_TO TO A FUNCTION THAT RETURNS A SANE FOLDER NAME AND CREATES IT.
   caption = models.TextField(blank=True)
-  exif = DictField(blank=True)
+  exif = models.TextField(blank=True)
   album = models.ForeignKey("PhotoAlbum")
 
 class Occupation(models.Model):
diff --git a/itf/templates/erang.html b/itf/templates/erang.html
index fd13680..05f15ea 100644
--- a/itf/templates/erang.html
+++ b/itf/templates/erang.html
@@ -1,6 +1,6 @@
 {% extends 'festival_wireframe.html' %}
 {% block title %}
-  ITF - eRang
+  India Theatre Forum - eRang
 {% endblock %}
           {% block leftCol %}
             <ul id="leftNav">
@@ -25,6 +25,8 @@
 <p>There are a large number of people who are deeply interested in Indian theatre, but who are starved of regular news and discussion about it. Bringing out a hard copy journal is a costly affair, and is not easy to sustain. Therefore, as part of the Forum website, it was felt that it would be useful to bring out an internet-based fortnightly journal. The coordinator of this project, Sudhanva Deshpande, has some experience of bringing out a journal of this kind, since he co-edited e-STQ. It was decided that he would put together a team that would bring out the new e-journal, tentatively christened e-Rang.</p>
 
 <p>e-Rang will be sent out free to readers.</p>
+
+<p><b>Update:</b> e-Rang sent out it's first issue on July 15th, 2010. You can subscribe and view current and past issues at <a href="http://theatreforum.in/erang/">http://theatreforum.in/erang/</a></p>
                 </div>
             </div>
           {% endblock %}
diff --git a/itf/templates/home.html b/itf/templates/home.html
index 55c7094..48c44f4 100644
--- a/itf/templates/home.html
+++ b/itf/templates/home.html
@@ -1,7 +1,7 @@
 {% extends 'festival_wireframe.html' %}
 
 {% block title %}
-ITF - Home
+India Theatre Forum - Home
 {% endblock %}
 
           {% block leftCol %}
diff --git a/itf/templates/meeting.html b/itf/templates/meeting.html
index a8fc677..15d9a09 100644
--- a/itf/templates/meeting.html
+++ b/itf/templates/meeting.html
@@ -1,6 +1,6 @@
 {% extends 'festival_wireframe.html' %}
 {% block title %}
-ITF - {{data.meeting.title}}
+India Theatre Forum - {{data.meeting.title}}
 {% endblock %}
 
 {% block extra_head %}
diff --git a/itf/templates/meetings.html b/itf/templates/meetings.html
index 5499777..0f067ff 100644
--- a/itf/templates/meetings.html
+++ b/itf/templates/meetings.html
@@ -1,7 +1,7 @@
 {% extends 'festival_wireframe.html' %}
 
 {% block title %}
-ITF - Activities
+India Theatre Forum - Activities
 {% endblock %}
 
   {% block extra_head %}
diff --git a/itf/templates/people.html b/itf/templates/people.html
index 8d99909..4100c3f 100644
--- a/itf/templates/people.html
+++ b/itf/templates/people.html
@@ -14,7 +14,7 @@
 
 
 {% block title %}
-  ITF - People
+  India Theatre Forum - People
 {% endblock %}
 
 
diff --git a/itf/templates/project.html b/itf/templates/project.html
index 70f0bd5..f9ec91e 100644
--- a/itf/templates/project.html
+++ b/itf/templates/project.html
@@ -1,6 +1,6 @@
 {% extends 'festival_wireframe.html' %}
 {% block title %}
-ITF - {{ project.title }}
+India Theatre Forum - {{ project.title }}
 {% endblock %}
 
 {% block centerCol %}
diff --git a/itf/templates/projects.html b/itf/templates/projects.html
index 81078c8..b51459d 100644
--- a/itf/templates/projects.html
+++ b/itf/templates/projects.html
@@ -1,7 +1,7 @@
 {% extends 'festival_wireframe.html' %}
 
 {% block title %}
-ITF - Projects
+India Theatre Forum - Projects
 {% endblock %}
 
           {% block leftCol %}
diff --git a/itf/templates/publications.html b/itf/templates/publications.html
index d07f0e4..72f0c8f 100644
--- a/itf/templates/publications.html
+++ b/itf/templates/publications.html
@@ -1,7 +1,7 @@
 {% extends 'festival_wireframe.html' %}
 
 {% block title %}
-ITF - Publications
+India Theatre Forum - Publications
 {% endblock %}
 
 {% block extra_head %}
diff --git a/itf/templates/resources.html b/itf/templates/resources.html
index 821c3d7..bff63bd 100644
--- a/itf/templates/resources.html
+++ b/itf/templates/resources.html
@@ -1,6 +1,6 @@
 {% extends 'festival_wireframe.html' %}
 {% block title %}
-  ITF - Resources
+  India Theatre Forum - Resources
 {% endblock %}
 
 
diff --git a/itf/templates/surveys.html b/itf/templates/surveys.html
index 5ddfb00..1973f1b 100644
--- a/itf/templates/surveys.html
+++ b/itf/templates/surveys.html
@@ -1,6 +1,6 @@
 {% extends 'festival_wireframe.html' %}
 {% block title %}
-  ITF - Surveys
+  India Theatre Forum - Surveys
 {% endblock %}
           {% block leftCol %}
             <ul id="leftNav">