remove dont used templates, templatetags, optimize imports, enable ru…

…ssian locale

ajax/tests.py

@@ -1,8 +1,8 @@
-from bugurtach.models import Bugurt, Comments
-from django.contrib.auth.models import User
-from django.test.client import Client
-from django.test import TestCase
 from datetime import datetime
+from django.test import TestCase
+from django.test.client import Client
+from django.contrib.auth.models import User
+from bugurtach.models import Bugurt, Comments
 
 class TestAjaxForms(TestCase):
 
@@ -80,9 +80,9 @@ def test_delete_tag(self):
         self.client.post("/login/", {"username": "root1", "password": "root"})
         self.client.post("/ajax/add_tag/",{"bugurt": 1, "tag": "tag1"},
                                 **{'HTTP_X_REQUESTED_WITH':'XMLHttpRequest'})
-        print self.client.post("/ajax/delete_tag/", {"bugurt": 1, "tag": "tag1"},
-                                   **{'HTTP_X_REQUESTED_WITH':'XMLHttpRequest'})
-        #self.assertEqual(request, "null")
+        request = self.client.post("/ajax/delete_tag/",{"bugurt": 1, "tag": "tag1"},
+                                           **{'HTTP_X_REQUESTED_WITH':'XMLHttpRequest'})
+        self.assertContains(request, text="null")
 
     def test_add_proof(self):
         self.client.post("/login/", {"username": "root1", "password": "root"})
@@ -108,7 +108,7 @@ def test_delete_proof(self):
                                 **{'HTTP_X_REQUESTED_WITH':'XMLHttpRequest'})
         request = self.client.post("/ajax/delete_proof/",{"bugurt": 1, "proof": "proof1"},
                                    **{'HTTP_X_REQUESTED_WITH':'XMLHttpRequest'})
-        self.assertEqual(request.content, "null")
+        self.assertContains(request, text="null")
 
     def test_autocomplite(self):
         self.client.post("/login/", {"username": "root1", "password": "root"})

ajax/views.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from bugurtach.models import Bugurt, Comments, BugurtTags, Tag, Proof, BugurtProofs
-from decorators import render_json, check_ajax
 from django.http import HttpResponse
 from django.utils.html import escape
+from decorators import render_json, check_ajax
+from bugurtach.models import Bugurt, Comments, BugurtTags, Tag, Proof, BugurtProofs
 
 def reply(request):
     random_reply = Comments.objects.order_by('?')[0].text

bugurtach/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.auth.models import Group
-from bugurtach.models import *
+from bugurtach.models import Bugurt, CustomUser, Like, Tag, Proof, BugurtTags, BugurtProofs, Comments
 
 class CustomUserAdmin(admin.ModelAdmin):
     list_display = ("user", )

bugurtach/tests.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-from django.core.exceptions import ValidationError
 from django.test import TestCase
-from bugurtach.models import Tag, Proof, CustomUser, Bugurt, BugurtTags, Like, Comments, BugurtProofs
-from django.contrib.auth.models import User
 from django.test.client import Client
+from django.contrib.auth.models import User
+from bugurtach.models import Tag, Proof, CustomUser, Bugurt, BugurtTags, Like, Comments, BugurtProofs
 from ajax.tests import TestAjaxForms
 
 class TestModels(TestCase):

bugurtach/views.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-from bugurtach.models import Tag, Comments, Bugurt
 from django.contrib.auth.forms import UserCreationForm, PasswordChangeForm
-from bugurtach.forms import EditBugurt, AddTag, AddProof, AddBugurt
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth import authenticate, login
 from django.http import HttpResponseRedirect, Http404
+from bugurtach.models import Tag, Comments, Bugurt
+from bugurtach.forms import EditBugurt, AddTag, AddProof, AddBugurt
 from decorators import render_to
 
 

decorators.py

@@ -3,8 +3,8 @@
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-#from django.views.decorators.cache import cache_control
 from django.utils.simplejson import dumps
+#from django.views.decorators.cache import cache_control
 
 def render_to(template):
     """

public/templates/bugurts/view.html

@@ -14,6 +14,22 @@ <h3>{{ bugurt.name }} :: {{ bugurt.date|date:'' }} {% ifequal bugurt.author.id u
             <a href="{{ tag.get_absolute_url }}">{{ tag.title }}</a>
           {% endfor %}</div>
         </div>{% endif %}
-      </div>{% include 'includes/commentaries.html' %}{% else %}Not bugurts
+      </div>
+    <div id="commentaries">
+      <h3>Комментарии:</h3>
+      <ul id="comments">
+        {% if bugurt.bugurtcomments %}{% for comment in bugurt.bugurtcomments.all %}<li id="comment{{ comment.id }}" class="reply">
+          <div>#{{ comment.id }} {{ comment.author }} {{ comment.date|date:"d.m.y, H:m" }}</div>{{ comment.text }}
+        </li>{% endfor %}
+      {% else %}Комметариев нет{% endif %}</ul>
+        {% if user.is_authenticated %}
+                <form action="/ajax/post_comment/" method="post">
+                  {% csrf_token %}
+                  <input type="hidden" id="bugurt" value="{{ bugurt.id }}">
+                  <p><label for="text">Комментарий</label><br /><textarea id="text" rows="10" cols="60"></textarea></p>
+                </form>
+                <button id="add_post">Ответить</button>
+              {% endif %}</div>
+    {% else %}Not bugurt
     {% endif %}
     {% endblock %}

settings.py

@@ -46,11 +46,11 @@
 
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
-USE_I18N = False
+USE_I18N = True
 
 # If you set this to False, Django will not format dates, numbers and
 # calendars according to the current locale
-USE_L10N = False
+USE_L10N = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"

urls.py

@@ -1,9 +1,9 @@
 from django.conf.urls.defaults import patterns, include, url
-from ajax.views import like, add_comment, add_tag, delete_tag, add_proof, delete_proof, reply, autocomplite
-from bugurtach.views import homepage, user_settings, registration, add_bugurt, edit_bugurt, view_bugurt, all_bugurts, \
-    delete_bugurt, view_user, view_tags, view_all_tags, top_bugurts
 from django.contrib import admin
 from django.contrib.auth.views import login, logout
+from ajax.views import like, add_comment, add_tag, delete_tag, add_proof, delete_proof, reply, autocomplite
+from bugurtach.views import homepage, user_settings, registration, add_bugurt, edit_bugurt, view_bugurt, all_bugurts,\
+    delete_bugurt, view_user, view_tags, view_all_tags, top_bugurts
 
 import settings