Note button bugs

exposition/urls.py

@@ -11,8 +11,13 @@ from views import ExpoCountryCatalog, ExpoCityCatalog, ExpoThemeCatalog, ExpoTag
 
 
 urlpatterns = patterns('',
+    url(r'expo/add-note/(?P<slug>.*)/$', 'exposition.views.add_note'),
+    url(r'exposition-add-calendar/(?P<id>\d+)/$', 'exposition.views.exposition_add_calendar'),
+    url(r'exposition-visit/(?P<id>\d+)/$', 'exposition.views.exposition_visit'),
     # search
     url(r'expo/search/', ExpositionSearchView.as_view()),
+
+
     # country catalog
     url(r'expo/country/$', ExpositionByCountry.as_view()),
     url(r'expo/country/(?P<slug>.*)/(?P<year>\d+)/(?P<month>.*)/page/(?P<page>\d+)/$', ExpoCountryCatalog.as_view()),
@@ -65,7 +70,7 @@ urlpatterns = patterns('',
     url(r'expo/$', ExpoList.as_view()),
 
 
-    url(r'expo/add-note/(?P<slug>.*)/$', 'exposition.views.add_note'),
+
 
 
 
@@ -75,7 +80,6 @@ urlpatterns = patterns('',
 
     #url(r'expo/(?P<params>.*)/service/(?P<url>.*)/$', ExpositionServiceView.as_view()),
     #url(r'expo/(?P<params>.*)/statistic/$', ExpositionStatistic.as_view()),
-    url(r'exposition-add-calendar/(?P<id>\d+)/$', 'exposition.views.exposition_add_calendar'),
-    url(r'exposition-visit/(?P<id>\d+)/$', 'exposition.views.exposition_visit'),
+
 
 )

templates/client/includes/exposition/exposition_list.html

@@ -70,13 +70,14 @@
 
                     {% include 'client/includes/calendar_button.html'  with event=obj user=user %}
                     <div class="note-wrap">
-
-					    <a class="button green icon-note active note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
+                        {% with note=obj|note_by_user:request.user %}
+					    <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
                         <div class="note-overlay">
                             <form action="">
-                                <textarea name="note_text" class="note-text"> {{ obj|note_by_user:request.user }}</textarea>
+                                <textarea name="note_text" class="note-text"> {{ note }}</textarea>
                             </form>
                         </div>
+                        {% endwith %}
                     </div>
                     {% if request.user.is_admin %}
                         <div class="note-wrap">