From 78741b1d2551942178fc4acbb5075b0b70650f0d Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 10 Nov 2012 10:29:20 +0530 Subject: [PATCH 1/6] hey new templates --- itf/static/css/modules/tabsinnerright.css | 6 +- itf/static/css/noel/main.css | 4 + .../test_static_templates/group-profiles.html | 339 ++++++++++++++++++ .../individual-profiles.html | 248 +++++++++++++ .../test_static_templates/productions.html | 0 .../test_static_templates/scriptarchive.html | 103 +++--- 6 files changed, 649 insertions(+), 51 deletions(-) create mode 100644 itf/templates/test_static_templates/group-profiles.html create mode 100644 itf/templates/test_static_templates/individual-profiles.html create mode 100644 itf/templates/test_static_templates/productions.html diff --git a/itf/static/css/modules/tabsinnerright.css b/itf/static/css/modules/tabsinnerright.css index 82e8650..61592be 100755 --- a/itf/static/css/modules/tabsinnerright.css +++ b/itf/static/css/modules/tabsinnerright.css @@ -111,7 +111,7 @@ margin-bottom:8px;} .tab_content h3 { font-size: 150%; -padding-bottom: 10px; +margin-bottom: 10px; } #about ul, #people ul, #production ul { @@ -181,6 +181,10 @@ margin-left: 10px; float: left; } +.borderYellow { + border-bottom: 1px solid #F7BD00; +} + /*toggleClass*/ .toggleLink { diff --git a/itf/static/css/noel/main.css b/itf/static/css/noel/main.css index 26a2cd1..791f5ea 100755 --- a/itf/static/css/noel/main.css +++ b/itf/static/css/noel/main.css @@ -32,6 +32,10 @@ left:4px; z-index:-1; } +.rightFloat { + float: right; +} + #logo span {font-size:36px;} diff --git a/itf/templates/test_static_templates/group-profiles.html b/itf/templates/test_static_templates/group-profiles.html new file mode 100644 index 0000000..40caaf3 --- /dev/null +++ b/itf/templates/test_static_templates/group-profiles.html @@ -0,0 +1,339 @@ + + + + +
+

GROUP NAME

+
Based in: Mumbai, Delhi
+
Founded: Year
+
Languages we work in: Hindi, Bengali
+ +
+ +
+

Some copy here that is a synopsis in a paragraph. Some copy here that is a synopsis in a paragraph. + Some copy here that is a synopsis in a paragraph. Some copy here that is a synopsis in a paragraph.

+
+ +

+91 (22) 12345678

+ +
www.website.com
+ +
+ Contact +
+ +
+ +
+
Awards
+
Name of award, year, link
+
Name of award, year, link
+
Name of award, year, link
+
Name of award, year, link
+
+ +
+ +
More about us
+ Link to article +

One line desc

+ + Link to article +

One line desc

+ + Link to article +

One line desc

+ +
+ +
+

Members

+
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Occupation/one-line desc
+
Relationship to group (eg: admin)
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Occupation/one-line desc
+
Relationship to group (eg: fan of)
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Occupation/one-line desc
+
Relationship to group (eg: member of)
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Occupation/one-line desc
+
Relationship to group
+
+
+ +
+ +
+ + More>> + +
+ +

Worked with

+
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Group +
Location
+
Relationship to Group (e.g. admin)
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Occupation/one-line desc
+
Location
+
+
+ +
+ + +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Occupation/one-line desc
+
Location
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Person +
Location
+
Relationship to Group (e.g. admin)
+
+
+ +
+ + More>> + + +
+ +
+ +
+ +
+

Productions

+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Production (2010) ICON
+
Group: Group Name
+
Title Credits:
+
No. of shows: 50
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Production (2010) ICON
+
Group: Group Name
+
Title Credits:
+
No. of shows: 50
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Production (2010) ICON
+
Group: Group Name
+
Title Credits:
+
No. of shows: 50
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Production (2010) ICON
+
Group: Group Name
+
Title Credits:
+
No. of shows: 50
+
+
+ +
+ + More>> + +
+ +

Workshops

+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of workshops
+
One line desc
+
Current
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of workshops
+
One line desc
+
+
+ +
+ +
+ + More>> + +
+ + +

More

+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of activity (talk, whatever)
+
One line desc
+
Current
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of activity (talk, whatever)
+
One line desc
+
Current
+
+
+ +
+ +
+ +
+

Kindly refer to Gallery tab in Script Archive

+
+ +
+

Kindly refer to Resources tab in Script Archive

+
+ +
+

Kindly refer to notes tab in Script Archive

+
+ + diff --git a/itf/templates/test_static_templates/individual-profiles.html b/itf/templates/test_static_templates/individual-profiles.html new file mode 100644 index 0000000..676ad6e --- /dev/null +++ b/itf/templates/test_static_templates/individual-profiles.html @@ -0,0 +1,248 @@ + + + + +
+

Name of Individual

+

Director, Light Designer, Actor

+ +
+ bio bio bio bio bio bio bio bio bio
+ bio bio bio bio bio bio bio bio bio +
+ +
+ +
Based in: (City)
+
Languages I work in: Hindi, Malayalam
+
DOB:
+
Gender:
+ + Contact +
Some text
+
+
+ +
+
Training
+
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
+
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
+
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
+
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
+
+
+ +
+
Awards
+
Name of award, year, link
+
Name of award, year, link
+
Name of award, year, link
+
+
+
+
More
+ Link to article 1 +
One line description
+ + Link to article 2 +
One line description
+ + Link to article 1 +
One line description
+ +
+ +
+ +
+
Help text - to send them to script archive
+
+ Title +
One line description. Extra information goes here
+
+ + Title +
One line description. Extra information goes here
+
+ + Title +
One line description. Extra information goes here
+
+ +
+ +
+

A V Gopalakrishnan Theatre Enthusiast, Mumbai

+
+

Member of

+
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Group
+
Location
+
Relationship to Group
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Group
+
Location
+
Relationship to Group
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Group
+
Location
+
Relationship to Group
+
+
+ +
+ + More>> + +
+ +

Worked with

+
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Person
+
Occupation/one-line desc
+
Location
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Person
+
Occupation/one-line desc
+
Location
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+
Name of Person
+
Occupation/one-line desc
+
Location
+
+
+ +
+ + More>> + +
+ + +
+ +
+ + +
+ +
+ +

Productions

+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Production (2010) +
Group: Group Name
+
Years
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Production (2010) +
Group: Group Name
+
Years
+
+
+ +
+ +
+
+ /static/images/150x150.jpg +
+ +
+ Name of Production (2010) +
Group: Group Name
+
Years
+
+
+ +
+ + +
+ +
+

Kindly refer to Gallery tab in Script Archive

+
+ +
+

Kindly refer to Resources tab in Script Archive

+
+ + + diff --git a/itf/templates/test_static_templates/productions.html b/itf/templates/test_static_templates/productions.html new file mode 100644 index 0000000..e69de29 diff --git a/itf/templates/test_static_templates/scriptarchive.html b/itf/templates/test_static_templates/scriptarchive.html index f0ec06d..8706ac3 100644 --- a/itf/templates/test_static_templates/scriptarchive.html +++ b/itf/templates/test_static_templates/scriptarchive.html @@ -12,11 +12,12 @@

Script Name

-

Writer: Names of writers

-

Language(s): Hindi, Bengali

-

Approximate duration:

-

No of characters: 20; Female: 5, Male: 15

+
Writer: Names of writers
+
Language(s): Hindi, Bengali
+
Approximate duration:
+
No of characters: 20; Female: 5, Male: 15
+

Some copy here that is a synopsis in a paragraph. Some copy here that is a synopsis in a paragraph. @@ -57,11 +58,11 @@

-

Name of Production (2010)

-

Group: Group Name

-

Some copy here

-

No. of shows: 50

-

Current(icon) or Upcoming (icon)Should we have this just after the title? Karen

+
Name of Production (2010)
+
Group: Group Name
+
Some copy here
+
No. of shows: 50
+

Current(icon) or Upcoming (icon)Please provide icon- I'll place it after title - Karen

@@ -73,10 +74,10 @@
-

Name of Production (2010)

-

Group: Group Name

-

Some copy here

-

No. of shows: 50

+
Name of Production (2010)
+
Group: Group Name
+
Some copy here
+
No. of shows: 50
@@ -87,10 +88,10 @@
-

Name of Production (2010)

-

Group: Group Name

-

Some copy here

-

No. of shows: 50

+
Name of Production (2010)
+
Group: Group Name
+
Some copy here
+
No. of shows: 50
@@ -105,11 +106,11 @@
-

Name of Production (2010)

-

Group: Group Name

-

Some copy here

-

No. of shows: 50

-

Current(icon) or Upcoming (icon)/p> +

Name of Production (2010)
+
Group: Group Name
+
Some copy here
+
No. of shows: 50
+
Current(icon) or Upcoming (icon)
@@ -120,11 +121,11 @@
-

Name of Production (2010)

-

Group: Group Name

-

Some copy here

-

No. of shows: 50

-

Current(icon) or Upcoming (icon)/p> +

Name of Production (2010)
+
Group: Group Name
+
Some copy here
+
No. of shows: 50
+
Current(icon) or Upcoming (icon)
@@ -141,9 +142,10 @@
Name of Person -

Writer: Some script

-

Translation of script by playwright

-

From language to language

+
Writer: Some script
+
Translation of script by playwright
+
From language to language
+ Synopsis
Lorem ipsum
@@ -158,9 +160,10 @@
Name of Person -

Writer: Some script

-

Translation of script by playwright

-

From language to language

+
Writer: Some script
+
Translation of script by playwright
+
From language to language
+ Synopsis
Lorem ipsum
@@ -174,11 +177,11 @@
- Name of Person - -

Writer: Some script

-

Translation of script by playwright

-

From language to language

+ Name of Person +
Writer: Some script
+
Translation of script by playwright
+
From language to language
+ Synopsis
Lorem ipsum
@@ -229,9 +232,9 @@
-

Title

-

One line description

-

Url

+
Title
+
One line description
+
Url
Download
@@ -243,9 +246,9 @@
-

Title

-

One line description

-

Url

+
Title
+
One line description
+
Url
Download
@@ -257,9 +260,9 @@
-

Title

-

One line description

-

Url

+
Title
+
One line description
+ Download
@@ -271,9 +274,9 @@
-

Title

-

One line description

-

Url

+
Title
+
One line description
+ Download
From 28e30723851fc98041c39309e1b688fdbb79e2d3 Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 10 Nov 2012 20:24:52 +0530 Subject: [PATCH 2/6] made changes --- itf/static/css/modules/tabsinnerright.css | 1 + itf/static/css/noel/main.css | 4 ++++ .../individual-profiles.html | 16 ++++++++-------- .../test_static_templates/scriptarchive.html | 12 ++++++------ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/itf/static/css/modules/tabsinnerright.css b/itf/static/css/modules/tabsinnerright.css index 61592be..d0c81f8 100755 --- a/itf/static/css/modules/tabsinnerright.css +++ b/itf/static/css/modules/tabsinnerright.css @@ -144,6 +144,7 @@ margin-left: 10px; background: #ccc; min-height: 110px; width: 150px; + margin-top: 4px; } .productionEachText { diff --git a/itf/static/css/noel/main.css b/itf/static/css/noel/main.css index 791f5ea..5e63a7e 100755 --- a/itf/static/css/noel/main.css +++ b/itf/static/css/noel/main.css @@ -54,6 +54,10 @@ margin-bottom:8px; font-weight:bold; } +.padding { + padding: 8px 0; +} + .tabHeader {font-size:24px; color:#ffb400; diff --git a/itf/templates/test_static_templates/individual-profiles.html b/itf/templates/test_static_templates/individual-profiles.html index 676ad6e..326b054 100644 --- a/itf/templates/test_static_templates/individual-profiles.html +++ b/itf/templates/test_static_templates/individual-profiles.html @@ -10,10 +10,10 @@
-

Name of Individual

-

Director, Light Designer, Actor

+

Name of Individual

+

Director, Light Designer, Actor

-
+
bio bio bio bio bio bio bio bio bio
bio bio bio bio bio bio bio bio bio
@@ -23,15 +23,15 @@
Based in: (City)
Languages I work in: Hindi, Malayalam
DOB:
-
Gender:
+
Gender:
Contact
Some text
-
+


-
Training
+
Training
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
@@ -40,14 +40,14 @@
-
Awards
+
Awards
Name of award, year, link
Name of award, year, link
Name of award, year, link

-
More
+
More
Link to article 1
One line description
diff --git a/itf/templates/test_static_templates/scriptarchive.html b/itf/templates/test_static_templates/scriptarchive.html index a49cebb..b497780 100644 --- a/itf/templates/test_static_templates/scriptarchive.html +++ b/itf/templates/test_static_templates/scriptarchive.html @@ -24,7 +24,7 @@ $(function() {
Writer: Names of writers
Language(s): Hindi, Bengali
Approximate duration:
-
No of characters: 20; Female: 5, Male: 15
+
No of characters: 20 - Female: 5, Male: 15

@@ -72,7 +72,7 @@ $(function() {
-
Name of Production (2010)
+ Name of Production (2010)
Group: Group Name
Some copy here
No. of shows: 50
@@ -88,7 +88,7 @@ $(function() {
-
Name of Production (2010)
+ Name of Production (2010)
Group: Group Name
Some copy here
No. of shows: 50
@@ -102,7 +102,7 @@ $(function() {
-
Name of Production (2010)
+ Name of Production (2010)
Group: Group Name
Some copy here
No. of shows: 50
@@ -120,7 +120,7 @@ $(function() {
-
Name of Production (2010)
+ Name of Production (2010)
Group: Group Name
Some copy here
No. of shows: 50
@@ -135,7 +135,7 @@ $(function() {
-
Name of Production (2010)
+ Name of Production (2010)
Group: Group Name
Some copy here
No. of shows: 50
From f19ed0e53e338b26b6f25eb8f7238002590c5e88 Mon Sep 17 00:00:00 2001 From: Karen Date: Sun, 11 Nov 2012 08:42:08 +0530 Subject: [PATCH 3/6] itf changes --- itf/static/css/modules/tabsinnerright.css | 5 +++++ itf/static/css/noel/main.css | 4 ++++ .../test_static_templates/group-profiles.html | 21 ++++++++++++------- .../individual-profiles.html | 12 ++++++----- .../test_static_templates/scriptarchive.html | 15 +++++++++---- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/itf/static/css/modules/tabsinnerright.css b/itf/static/css/modules/tabsinnerright.css index d0c81f8..26d74f2 100755 --- a/itf/static/css/modules/tabsinnerright.css +++ b/itf/static/css/modules/tabsinnerright.css @@ -114,6 +114,10 @@ font-size: 150%; margin-bottom: 10px; } +.tab_content h5 { + font-size: 120%; +} + #about ul, #people ul, #production ul { margin-left: 10px; } @@ -180,6 +184,7 @@ margin-left: 10px; .resourcesEach { padding: 0 20px 20px 0; float: left; + width: 350px; } .borderYellow { diff --git a/itf/static/css/noel/main.css b/itf/static/css/noel/main.css index 5e63a7e..f19c454 100755 --- a/itf/static/css/noel/main.css +++ b/itf/static/css/noel/main.css @@ -58,6 +58,10 @@ font-weight:bold; padding: 8px 0; } +.paddingBottom { + padding-bottom: 8px; +} + .tabHeader {font-size:24px; color:#ffb400; diff --git a/itf/templates/test_static_templates/group-profiles.html b/itf/templates/test_static_templates/group-profiles.html index 40caaf3..f2aa337 100644 --- a/itf/templates/test_static_templates/group-profiles.html +++ b/itf/templates/test_static_templates/group-profiles.html @@ -10,10 +10,13 @@
-

GROUP NAME

+

GROUP NAME

Based in: Mumbai, Delhi
Founded: Year
-
Languages we work in: Hindi, Bengali
+
Languages we work in: Hindi, Bengali + +

+

@@ -28,21 +31,23 @@
Contact -
+

+

-
Awards
+
Awards
Name of award, year, link
Name of award, year, link
Name of award, year, link
Name of award, year, link
-
+
+

-
More about us
+
More about us
Link to article

One line desc

@@ -55,7 +60,7 @@
-

Members

+
Members

@@ -120,7 +125,7 @@
-

Worked with

+
Worked with

diff --git a/itf/templates/test_static_templates/individual-profiles.html b/itf/templates/test_static_templates/individual-profiles.html index 326b054..2958044 100644 --- a/itf/templates/test_static_templates/individual-profiles.html +++ b/itf/templates/test_static_templates/individual-profiles.html @@ -31,23 +31,25 @@
-
Training
+
Training
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
Area of Training, Name of Conductor, Name of Theatre Group, Location, Year
+

-
Awards
+
Awards
Name of award, year, link
Name of award, year, link
Name of award, year, link
+

-
More
+
More
Link to article 1
One line description
@@ -81,7 +83,7 @@

A V Gopalakrishnan Theatre Enthusiast, Mumbai

-

Member of

+
Member of

@@ -130,7 +132,7 @@
-

Worked with

+
Worked with

diff --git a/itf/templates/test_static_templates/scriptarchive.html b/itf/templates/test_static_templates/scriptarchive.html index b497780..98969e6 100644 --- a/itf/templates/test_static_templates/scriptarchive.html +++ b/itf/templates/test_static_templates/scriptarchive.html @@ -1,5 +1,12 @@ + + " % (str(instance.id), instance.get_title())) + invitation = PersonInvitation( + invitee=invitee, + invite_code=User.objects.make_random_password(30), + is_validated=False, + inviter=Person.objects.get(user=request.user), + sent_date=datetime.now() + ) + invitation.save() + invitation.send_mail() + #return HttpResponse("This person will be Invited!") + #return HttpResponse("" % (str(instance.id), instance.get_title())) else: form = PersonForm() context = RequestContext(request, { diff --git a/itf/settings.py b/itf/settings.py index 34a2371..bb5760f 100755 --- a/itf/settings.py +++ b/itf/settings.py @@ -231,8 +231,14 @@ INSTALLED_APPS = ( 'allauth.socialaccount.providers.facebook', 'allauth.socialaccount.providers.github', 'emailconfirmation', + 'django_comments_xtd', ) +#j comments-xtd +COMMENTS_APP = "django_comments_xtd" +COMMENTS_XTD_CONFIRM_EMAIL = True +COMMENTS_XTD_MAX_THREAD_LEVEL = 0 # no threading + # jj all auth + email settings LOGIN_REDIRECT_URL = '/edit_profile' diff --git a/itf/templates/comments/form.html b/itf/templates/comments/form.html new file mode 100644 index 0000000..2a9ad55 --- /dev/null +++ b/itf/templates/comments/form.html @@ -0,0 +1,20 @@ +{% load comments i18n %} +
{% csrf_token %} + {% if next %}
{% endif %} + {% for field in form %} + {% if field.is_hidden %} +
{{ field }}
+ {% else %} + {% if field.errors %}{{ field.errors }}{% endif %} + + {% endif %} + {% endfor %} +

+ + +

+
diff --git a/itf/templates/comments/list.html b/itf/templates/comments/list.html new file mode 100644 index 0000000..3d4ec1e --- /dev/null +++ b/itf/templates/comments/list.html @@ -0,0 +1,10 @@ +
+ {% for comment in comment_list %} +
+ {{ comment.submit_date }} - {{ comment.name }} +
+
+

{{ comment.comment }}

+
+ {% endfor %} +
diff --git a/itf/templates/comments/posted.html b/itf/templates/comments/posted.html new file mode 100644 index 0000000..76f7f6d --- /dev/null +++ b/itf/templates/comments/posted.html @@ -0,0 +1,8 @@ +{% extends "comments/base.html" %} +{% load i18n %} + +{% block title %}{% trans "Thanks for commenting" %}.{% endblock %} + +{% block content %} +

{% trans "Thank you for your comment" %}.

+{% endblock %} diff --git a/itf/templates/comments/preview.html b/itf/templates/comments/preview.html new file mode 100644 index 0000000..b1607b9 --- /dev/null +++ b/itf/templates/comments/preview.html @@ -0,0 +1,36 @@ +{% extends "comments/base.html" %} +{% load i18n %} + +{% block title %}{% trans "Preview your comment" %}{% endblock %} + +{% block content %} + {% load comments %} +
{% csrf_token %} + {% if next %}
{% endif %} + {% if form.errors %} +

{% blocktrans count form.errors|length as counter %}Please correct the error below{% plural %}Please correct the errors below{% endblocktrans %}

+ {% else %} +

{% trans "Preview your comment" %}

+
{{ comment|linebreaks }}
+

+ {% trans "and" %} {% trans "or make changes" %}: +

+ {% endif %} + {% for field in form %} + {% if field.is_hidden %} +
{{ field }}
+ {% else %} + {% if field.errors %}{{ field.errors }}{% endif %} + + {% endif %} + {% endfor %} +

+ + +

+
+{% endblock %} diff --git a/itf/templates/modules/itfprofiles/theatregroup.html b/itf/templates/modules/itfprofiles/theatregroup.html index 9d5bcc8..cb4268a 100644 --- a/itf/templates/modules/itfprofiles/theatregroup.html +++ b/itf/templates/modules/itfprofiles/theatregroup.html @@ -202,6 +202,32 @@
+{% load comments %} + +
+ {% get_comment_count for obj as comment_count %} + {% if comment_count %} +

{{ comment_count }} comment{{ comment_count|pluralize }}

+ {% endif %} +
+ {% render_comment_list for obj %} +
+ {% if obj.allow_comments and user.is_authenticated %} +

your comment

+
+ {% render_comment_form for obj %} +
+ {% else %} + {% if user.is_authenticated %} +

Comments are disabled for this article

+ {% else %} +

+ {% endif %} + {% endif %} +
+ + + {% if awards %}
Awards: diff --git a/itf/urls.py b/itf/urls.py index cb414ba..303d853 100755 --- a/itf/urls.py +++ b/itf/urls.py @@ -24,7 +24,8 @@ urlpatterns = patterns('', (r'^contact/$', 'frontpage.views.contact'), (r'^emailer/issue/(?P\d+)/$', 'emailer.views.show_emailer'), # ('m/(?P.*)', 'insidepages.views.main'), - (r'^comments/', include('django.contrib.comments.urls')), + #(r'^comments/', include('django.contrib.comments.urls')), + url(r'^comments/', include('django_comments_xtd.urls')), # (r'^ckeditor/', include('ckeditor.urls')), (r'^robots.txt$', direct_to_template, {'template': 'robots.txt', 'mimetype': 'text/plain'}), # (r'^erang/', include('erang_organised.urls')), diff --git a/migrations/sqldiff12_11_1.sql b/migrations/sqldiff12_11_1.sql new file mode 100644 index 0000000..5f6a111 --- /dev/null +++ b/migrations/sqldiff12_11_1.sql @@ -0,0 +1,2 @@ +ALTER TABLE `itfprofiles_theatregroup` + ADD `allow_comments` bool; diff --git a/requirements.txt b/requirements.txt index ce4cf6b..acb57a5 100755 --- a/requirements.txt +++ b/requirements.txt @@ -22,5 +22,6 @@ django-markitup twitter -e git+git://github.com/pennersr/django-allauth.git#egg=django-allauth -e git+git://github.com/pythonforfacebook/facebook-sdk.git#egg=facebook-sdk +django-comments-xtd django-avatar imagestore