Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

templates/client/includes/exposition/exposition_object.html

@@ -80,7 +80,7 @@
                         <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
 
 
-                            <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note{{ obj.url }}/">{% trans 'заметка' %}</a>
+                            <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ object.url }}/">{% trans 'заметка' %}</a>
                             <div class="note-overlay">
                                 <form action="">
                                     <textarea name="note_text" class="note-text"> {{ note }}</textarea>

templates/client/index.html

@@ -48,7 +48,7 @@
 										<div class="re-buttons">
 											<a class="button blue icon-calendar {% if event|in_calendar:request.user %}removecalendar {% else %}addcalendar {% endif %}" href="{{ event.get_calendar_url }}">{% if event|in_calendar:request.user %}{% trans 'Убрать из календаря' %}{% else %}{% trans 'добавить в календарь' %}{% endif %}</a>
 											<div class="main-page {% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-												<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note{{ obj.url }}/">{% trans 'заметка' %}</a>
+												<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ event.url }}/">{% trans 'заметка' %}</a>
 												<div class="note-overlay">
 													<form action="">
 														<textarea name="note_text" class="note-text"> {{ note }}</textarea>