удалил заметки на проекте у событий

apps/conference/models.py

@@ -96,7 +96,6 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin):
     is_published = models.BooleanField(default=0, db_index=True)
 
     files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id')
-    note = generic.GenericRelation('note.Note', content_type_field='content_type', object_id_field='object_id')
     # statistic
     foundation_year = models.PositiveIntegerField(verbose_name=_(u'Год основания'), blank=True, null=True)
     visitors = models.PositiveIntegerField(verbose_name=_(u'Посетитеил'), blank=True, null=True)
@@ -188,19 +187,6 @@ class Conference(TranslatableModel, EventMixin, ExpoMixin):
             'events:event_visit', args=['conference', self.id]
         )
 
-    def get_note_url(self):
-        return reverse_lazy(
-            'conference_add_note',
-            args=[self.url]
-        )
-
-    def get_note_by_user(self, user_id):
-        note = self.note.filter(user__id=user_id)
-        try:
-            return note.get().text
-        except:
-            return ''
-
     def tags(self):
         return self.tag.language().all()
 

apps/conference/tests/test_models.py

@@ -5,7 +5,6 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.test import TestCase
 from expobanner.models import Paid, Banner
-from note.models import Note
 from service.models import Service
 from stats_collector.models import ObjectStats
 from theme.models import Tag, Theme
@@ -112,27 +111,6 @@ class ConferenceTest(TestCase):
             )
         )
 
-    def test_method_get_note_url(self):
-        self.assertEqual(
-            self.conference.get_note_url(),
-            reverse('conference_add_note', args=[self.conference.url])
-        )
-
-    def test_method_get_note_by_user(self):
-        user = User.objects.all()[0]
-
-        self.assertEqual(self.conference.get_note_by_user(user.id), '')
-
-        text = 'Great'
-        ct = ContentType.objects.get_for_model(self.conference)
-        object_id = self.conference.id
-        Note.objects.create(
-            content_type=ct, object_id=object_id,
-            user=user, text=text
-        )
-
-        self.assertEqual(self.conference.get_note_by_user(user.id), text)
-
     def test_method_tags(self):
         self.assertFalse(self.conference.tags())
 

apps/conference/urls.py

@@ -21,13 +21,6 @@ from .views import (
 )
 
 urlpatterns = patterns('',
-
-
-    url(
-        r'^conference/add-note/(?P<slug>[^/]*)/$',
-        'conference.views.add_note',
-        name='conference_add_note'
-    ),
     url(r'^conference-add-calendar/(?P<id>\d+)/$',
         'conference.views.conference_add_calendar',
         name='conference_add_calendar'

apps/conference/views.py

@@ -30,7 +30,6 @@ from city.models import City
 from country.models import Country
 from meta.views import MetadataMixin
 from models import Conference
-from note.models import Note
 from service.models import Service
 from service.order_forms import AdvertiseForm
 from service.views import order_forms, get_userlog_data
@@ -589,39 +588,6 @@ def conference_add_calendar(request, id):
 #     return HttpResponse(json.dumps(args), content_type='application/json')
 
 
-def add_note(request, slug):
-    args = {'success': False}
-
-    if request.user.is_authenticated():
-
-        if request.GET:
-            text = request.GET['note_text']
-            try:
-                conf = Conference.objects.get(url=slug)
-            except Conference.DoesNotExist:
-                raise Http404
-
-            ct = ContentType.objects.get_for_model(conf)
-            object_id = conf.id
-            user = User.objects.get(id=request.user.id)
-            if Note.objects.filter(user=user, content_type=ct, object_id=object_id).exists():
-                Note.objects.filter(user=user, content_type=ct, object_id=object_id).update(text=text)
-            else:
-                Note.objects.create(content_type=ct, object_id=object_id, user=user, text=text)
-
-            user.calendar.conferences.add(conf)
-
-
-            args['success'] = True
-            args['text'] = text
-
-    else:
-        args['not_authorized'] = True
-        args['success'] = True
-
-    return HttpResponse(json.dumps(args), content_type='application/json')
-
-
 def send_to_organiser(request, slug):
     exposition = get_object_or_404(Conference, url=slug)
     mail_send = 'evm@expomap.ru'

apps/exposition/models.py

@@ -115,7 +115,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
     )
 
     files = generic.GenericRelation('file.FileModel', content_type_field='content_type', object_id_field='object_id')
-    note = generic.GenericRelation('note.Note', content_type_field='content_type', object_id_field='object_id')
 
     #about
     periodic = models.FloatField(verbose_name=_(u'Переодичность'), blank=True, null=True)
@@ -203,13 +202,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
         tags = ' '.join([' '.join(tag.get_all_names()) for tag in self.tag.all()])
         return names + ' ' + titles + ' ' + themes + ' ' + tags
 
-    def get_note_by_user(self, user_id):
-        note = self.note.filter(user__id=user_id)
-        try:
-            return note.get().text
-        except:
-            return ''
-
     def upload_photo_url(self):
         return '/admin/exposition/upload-photo/%s/' % self.id
 
@@ -240,9 +232,6 @@ class Exposition(TranslatableModel, EventMixin, ExpoMixin):
     def get_visit_url(self):
         return '/exposition-visit/%s/'%self.id
 
-    def get_note_url(self):
-        return '/expo/add-note/%s/'%self.url
-
     def get_timetables_days(self):
         tables = list(self.business_program.all())
         days = []

apps/exposition/urls.py

@@ -24,7 +24,6 @@ from .views import (
 )
 
 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

apps/exposition/views.py

@@ -29,7 +29,6 @@ from functions.views_help import get_side_items
 
 from meta.views import MetadataMixin
 from models import Exposition
-from note.models import Note
 from service.models import Service
 from service.order_forms import AdvertiseForm
 from service.views import order_forms, get_userlog_data
@@ -648,38 +647,6 @@ class ExpoPhotoView(MetadataMixin, ListView):
         return context
 
 
-def add_note(request, slug):
-    args = {'success': False}
-
-    if request.user.is_authenticated():
-
-        if request.GET:
-            text = request.GET['note_text']
-            try:
-                e = Exposition.objects.get(url=slug)
-            except Exposition.DoesNotExist:
-                raise Http404
-
-            ct = ContentType.objects.get_for_model(e)
-            object_id = e.id
-            user = User.objects.get(id=request.user.id)
-            if Note.objects.filter(user=user, content_type=ct, object_id=object_id).exists():
-                Note.objects.filter(user=user, content_type=ct, object_id=object_id).update(text=text)
-            else:
-                Note.objects.create(content_type=ct, object_id=object_id, user=user, text=text)
-
-            user.calendar.expositions.add(e)
-
-
-            args['success'] = True
-            args['text'] = text
-
-    else:
-        args['not_authorized'] = True
-        args['success'] = True
-
-    return HttpResponse(json.dumps(args), content_type='application/json')
-
 def send_to_organiser(request, slug):
     exposition = get_object_or_404(Exposition, url=slug)
     mail_send = 'evm@expomap.ru'

apps/note/models.py

@@ -1,13 +0,0 @@
-from django.db import models
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
-
-
-class Note(models.Model):
-    content_type = models.ForeignKey(ContentType, null=True)
-    object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_pk")
-    user = models.ForeignKey('accounts.User')
-    text = models.TextField(verbose_name='Note')
-
-

apps/note/tests.py

@@ -1,16 +0,0 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)

apps/note/views.py

@@ -1 +0,0 @@
-# Create your views here.

apps/settings/templatetags/template_filters.py

@@ -237,13 +237,6 @@ def without_page(value):
         result = '/'.join(l[:l.index('page')])+'/'
         return result
 
-@register.filter
-def note_by_user(obj, user):
-
-    if obj and user.is_authenticated():
-
-        return obj.get_note_by_user(user.id)
-    return ''
 
 @register.filter
 def isdigit(value):
@@ -360,4 +353,4 @@ def str_to_int(value):
     try:
         return int(value)
     except ValueError:
-        return value
+        return value

proj/settings.py

@@ -363,7 +363,6 @@ INSTALLED_APPS = (
     'file',
     'import_xls',
     'news',
-    'note',
     'organiser',
     'place_conference',
     'place_exposition',

proj/urls.py

@@ -9,6 +9,7 @@ from core.simple_index_view import (
 from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
+from django.contrib import admin
 from django.contrib.sitemaps import views
 
 from django.views.generic.base import TemplateView
@@ -68,6 +69,7 @@ urlpatterns += solid_i18n_patterns('',
     url(r'^rss/', include('core.urls')),
     url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}),
     url(r'^admin/', include('proj.admin_urls')),
+    url(r'^djadmin/', include(admin.site.urls)),
 
     url(r'^sitemap\.xml$', views.index, {'sitemaps': sitemaps}),
     url(r'^sitemap-(?P<section>.+)\.xml$', views.sitemap, {'sitemaps': sitemaps}),

static/client/html-cut/paid_exposition.html

@@ -1877,18 +1877,6 @@
                                         <a class="button blue icon-calendar addcalendar " href="/exposition-add-calendar/3391/">В расписание</a>
 
 
-                                        <div class="note-wrap">
-
-                                            <a class="button green icon-note  note-button" href="/expo/add-note//">заметка</a>
-                                            <div class="note-overlay">
-                                                <form action="">
-                                                    <textarea name="note_text" class="note-text"> </textarea>
-                                                </form>
-                                            </div>
-
-                                        </div>
-
-
 
                                     </div>
 

static/client/html-cut/subscribe.html

@@ -442,14 +442,6 @@
 										<a class="button icon-check visit" href="">Я планирую посетить</a>
 										<a style="display:none;" class="button icon-check unvisit" href="">Не планирую посещать</a>
 										<a class="button blue icon-calendar addcalendar " href="/conference-add-calendar/498/">В расписание</a>
-										<div class="note-wrap-disabled">
-											<a class="button green icon-note  note-button" href="/expo/add-note//">заметка</a>
-											<div class="note-overlay">
-												<form action="">
-													<textarea name="note_text" class="note-text"> </textarea>
-												</form>
-											</div>
-										</div>
 									</div>
 									<div class="ib-add"><a class="button blue2 icon-find" href="http://www.booking.com/searchresults.html?aid=333667&city=-2960561">Найти отель</a></div>
 								</div>

templates/client/includes/conference/conference_list.html

@@ -77,17 +77,6 @@
                             {% include 'client/includes/exposition/services.html' with obj=obj %}
                             {% include 'client/includes/calendar_button.html'  with obj=obj%}
 
-                            <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                                {% with note=obj|note_by_user:request.user %}
-                                <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
-                                <div class="note-overlay">
-                                    <form action="">
-                                        <textarea name="note_text" class="note-text"> {{ note }}</textarea>
-                                    </form>
-                                </div>
-                                {% endwith %}
-                            </div>
-
                             {% if request.user.is_admin %}
                                 <div class="note-wrap">
                                     <a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a>

templates/client/includes/conference/conference_object.html

@@ -79,16 +79,6 @@
 							{% include 'client/includes/visit_button.html' %}
 						{% endwith %}
 						{% include 'client/includes/calendar_button.html'  with obj=object %}
-						<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-							{% with note=object|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"> {{ note }}</textarea>
-								</form>
-							</div>
-							{% endwith %}
-						</div>
 						{% if request.user.is_admin %}
 						<a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
 						{% endif %}

templates/client/includes/conference/conference_paid.html

@@ -87,16 +87,6 @@
                             {% include 'client/includes/visit_button.html' %}
                         {% endwith %}
                         {% include 'client/includes/calendar_button.html'  with obj=object %}
-                        <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                            {% with note=object|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"> {{ note }}</textarea>
-                                </form>
-                            </div>
-                            {% endwith %}
-                        </div>
                         {% if request.user.is_admin %}
                         <a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
                         {% endif %}

templates/client/includes/conference/conference_partner.html

@@ -102,17 +102,6 @@
 
                 {% include 'client/includes/calendar_button.html'  with obj=object %}
 
-                <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                    {% with note=object|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"> {{ note }}</textarea>
-                        </form>
-                    </div>
-                    {% endwith %}
-                </div>
-
                 {% if request.user.is_admin %}
                     <a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
                 {% endif %}
@@ -121,8 +110,6 @@
                     <a class="button blue icon-photo" href="{{ event.get_permanent_url }}photo/">{% trans 'фото' %}</a>
                 {% endif %}
             </div>
-
-            <div class="ib-add"><a target="_blank" class="button blue2 icon-find" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ object.city.id }}">{% trans 'Найти отель' %}</a></div>
         </div>
 
         <hr />

templates/client/includes/event_steps.html

@@ -34,38 +34,32 @@
 {% else %}
     {# Непроплаченая конференция #}
     <div class="i-steps">
-            <div class="is-title">{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}</div>
+        <div class="is-title">{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}</div>
-            <ul>
+        <ul>
-                <li class="s1">
+            <li class="s1">
-                    <div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
+                <div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
-              {% if event.partner %}
+                {% if event.partner %}
-                  <a class="step" href="{{ event.link }}" target="_blank">{% trans 'Регистрация' %}</a>
+                    <a class="step" href="{{ event.link }}" target="_blank">{% trans 'Регистрация' %}</a>
-              {% elif event.catalog == '/conference/' and not event.services.tickets.is_set %}
+                {% elif event.catalog == '/conference/' and not event.services.tickets.is_set %}
-                <span class="step">{% trans 'Регистрация' %}</span>
+                    <span class="step">{% trans 'Регистрация' %}</span>
-              {% else %}
+                {% else %}
-                <a class="step"
+                    <a class="step"
                        href="{% if event.registration_link %}{{ registration_link }}{% else %}{{ event.get_permanent_url }}{% if event.catalog == '/expo/' %}service/participation/{% else %}service/tickets/{% endif %}{% endif %}"
                        target="_blank">
                         {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %}
                     </a>
-              {% endif %}
+                {% endif %}
-                </li>
+            </li>
 
-                <li class="s2">
+            <li class="s2">
-                    <div class="label">{% trans 'Забронируйте отель по лучшей цене' %}</div>
+                <div class="label">{% trans 'Закажите отель по лучшей цене' %}</div>
-                    <a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a>
+                <a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a>
-                </li>
+            </li>
 
-          <li class="s3">
+            <li class="s3">
-            <div class="label">{% trans 'Устраните языковые барьеры' %}</div>
+                <div class="label">{% trans 'Устраните языковые барьеры' %}</div>
-            <a class="step" href="{{ event.get_permanent_url }}service/translator/" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a>
+                <a class="step" href="{{ event.get_permanent_url }}service/translator/" target="_blank"><b>{% trans "ПЕРЕВОДЧИК" %}</b></a>
-          </li>
+            </li>
-          {% comment %}
+        </ul>
-          <li class="s3">
-            <div class="label">{% trans 'Купите авиабилеты по лучшему тарифу' %}</div>
-            <a class="step" href="http://www.aviasales.ru/?marker=29868" target="_blank"><b>aviasales</b>.ru</a>
-          </li>
-          {% endcomment %}
-          </ul>
     </div>
 {% endif %}

templates/client/includes/events/filter_result.html

@@ -82,18 +82,6 @@
 				<div class="cli-m-buttons">
 					{% include 'client/includes/exposition/services.html' with obj=result.object %}
 					{% include 'client/includes/calendar_button.html'  with obj=result.object %}
-					<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-
-						{% with note=result.object|note_by_user:request.user %}
-							<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ result.object.url }}/">{% trans 'заметка' %}</a>
-							<div class="note-overlay">
-								<form action="">
-									<textarea name="note_text" class="note-text"> {{ note }}</textarea>
-								</form>
-							</div>
-						{% endwith %}
-
-					</div>
 				</div>
 				<div class="cli-s-buttons">
 					{% include 'client/buttons/booking_button.html' with object=result.object %}

templates/client/includes/exposition/expo_list_paid.html

@@ -56,16 +56,6 @@
 				<div class="cli-m-buttons">
 					{% include 'client/includes/exposition/services.html' with obj=obj %}
 					{% include 'client/includes/calendar_button.html'  with obj=obj%}
-					<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-						{% 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"> {{ note }}</textarea>
-							</form>
-						</div>
-						{% endwith %}
-					</div>
 					{% if request.user.is_admin %}
 						<div class="note-wrap">
 							<a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>

templates/client/includes/exposition/expo_paid.html

@@ -91,16 +91,6 @@
                             {% include 'client/includes/visit_button.html' %}
                         {% endwith %}
                         {% include 'client/includes/calendar_button.html'  with obj=object %}
-                        <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                            {% with note=object|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"> {{ note }}</textarea>
-                                </form>
-                            </div>
-                            {% endwith %}
-                        </div>
                         {% if request.user.is_admin %}
                         <a class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a>
                         {% endif %}

templates/client/includes/exposition/expo_top.html

@@ -61,16 +61,6 @@
 				<div class="cli-m-buttons">
 					{% include 'client/includes/exposition/services.html' with obj=obj %}
 					{% include 'client/includes/calendar_button.html'  with obj=obj%}
-					<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-						{% 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"> {{ note }}</textarea>
-							</form>
-						</div>
-						{% endwith %}
-					</div>
 					{% if request.user.is_admin %}
 						<div class="note-wrap">
 							<a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>

templates/client/includes/exposition/exposition_list.html

@@ -79,17 +79,6 @@
                             <div class="cli-m-buttons">
                                 {% include 'client/includes/exposition/services.html' with obj=obj %}
                                 {% include 'client/includes/calendar_button.html'  with obj=obj%}
-                                <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                                    {% 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"> {{ note }}</textarea>
-                                            </form>
-                                        </div>
-                                    {% endwith %}
-                                </div>
-
                                 {% if request.user.is_admin %}
                                     <div class="note-wrap">
                                         <a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>

templates/client/includes/exposition/exposition_object.html

@@ -104,17 +104,6 @@
                         {% endwith %}
 
                         {% include 'client/includes/calendar_button.html'  with obj=object %}
-
-                        <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-                            {% with note=object|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"> {{ note }}</textarea>
-                                </form>
-                            </div>
-                            {% endwith %}
-                        </div>
                         {% if request.user.is_admin %}
                             <a target="_blank" class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a>
                         {% endif %}

templates/client/includes/exposition/search_result.html

@@ -67,18 +67,6 @@
 				<div class="cli-m-buttons">
 					{% include 'client/includes/exposition/services.html' with obj=result.object %}
 					{% include 'client/includes/calendar_button.html'  with obj=result.object %}
-					<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
-
-						{% with note=result.object|note_by_user:request.user %}
-							<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ result.object.url }}/">{% trans 'заметка' %}</a>
-							<div class="note-overlay">
-								<form action="">
-									<textarea name="note_text" class="note-text"> {{ note }}</textarea>
-								</form>
-							</div>
-						{% endwith %}
-
-					</div>
 				</div>
 				<div class="cli-s-buttons">
 					{% include 'client/buttons/booking_button.html' with object=result.object %}

templates/client/includes/exposition/services.html

@@ -1,6 +1,8 @@
 {% load i18n %}
 
-<div class="cli-services">
+<a class="button icon-sm" target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{% trans 'подробнее' %}</a>
+{# Временно комментируем https://trello.com/c/ioPIxPlS/91-%D1%83%D0%BB%D1%83%D1%87%D1%88%D0%B5%D0%BD%D0%B8%D0%B5-%D0%BF%D1%80%D0%B8%D0%BE%D1%80%D0%B8%D1%82%D0%B5%D1%82-8-%D1%83%D0%B1%D1%80%D0%B0%D1%82%D1%8C-%D1%81%D1%81%D1%8B%D0%BB%D0%BA%D0%B8-%D0%BD%D0%B0-%D1%83%D1%81%D0%BB%D1%83%D0%B3%D0%B8-%D0%B8%D0%B7-%D1%80%D1%83%D0%B1%D1%80%D0%B8%D0%BA%D0%B0%D1%82%D0%BE%D1%80%D0%BE%D0%B2-%D0%B8%D0%B7-%D0%BC%D0%B5%D0%BD%D1%8E-%D1%81%D0%BE-%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86-%D0%B2%D1%8B%D1%81%D1%82%D0%B0%D0%B2%D0%BE%D0%BA-%D0%B8-%D1%81%D0%BE-%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86-%D0%BA%D0%BE%D0%BD%D1%84%D0%B5%D1%80%D0%B5%D0%BD%D1%86%D0%B8%D0%B9 #}
+{% comment %}<div class="cli-services">
     <a class="button icon-sm" href="#">{% trans 'услуги' %}</a>
     <div class="cli-services-sm">
         <ul>
@@ -22,4 +24,4 @@
         {% endif %}
         </ul>
     </div>
-</div>
+</div>{% endcomment %}

templates/client/includes/services.html

@@ -1,12 +1,10 @@
 {% load i18n %}
 <div class="mps-sect">
-	<header>{% trans 'Наши услуги' %}</header>
+    <header>{% trans 'Наши услуги' %}</header>
-	<nav>
+    <nav>
-		<ul>
+        <ul>
-			<li><a href="/service/participation/">{% trans 'Участие в выставках' %}</a></li>
+            <li><a href="/advertising/">{% trans 'Продвижение событий' %}</a></li>
-      <li><a href="/service/translator/">{% trans 'Переводчики' %}</a></li>
+            <li><a href="/service/participation/">{% trans 'Участие в выставках' %}</a></li>
-      {% comment %}<li><a href="/service/tickets/">{% trans 'Билеты на выставки' %}</a></li>{% endcomment %}
+        </ul>
-      <li><a href="/service/remote/">{% trans 'Заочное посещение' %}</a></li>
+    </nav>
-		</ul>
-	</nav>
 </div>

templates/client/index.html

@@ -58,14 +58,6 @@
                                 <footer>
                                     <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="{{ event.get_note_url }}">{% trans 'заметка' %}</a>
-                                            <div class="note-overlay">
-                                                <form action="">
-                                                    <textarea name="note_text" class="note-text"> {{ note }}</textarea>
-                                                </form>
-                                            </div>
-                                        </div>
                                     </div>
                                     <div class="re-tags">
                                     {% with tags=event.tags %}

templates/client/robots.txt

@@ -16,11 +16,9 @@ Disallow: /members/search/
 Disallow: /members/search/
 Disallow: /admin/
 Disallow: /theme/
-Disallow: /expo/add-note/
 Disallow: /exposition-add-calendar/
 Disallow: /exposition-visit/
 Disallow: /conference/search/
-Disallow: /conference/add-note/
 Disallow: /conference-add-calendar/
 Disallow: /conference-visit/
 Disallow: /seminar/
@@ -121,11 +119,9 @@ Disallow: /members/search/
 Disallow: /members/search/
 Disallow: /admin/
 Disallow: /theme/
-Disallow: /expo/add-note/
 Disallow: /exposition-add-calendar/
 Disallow: /exposition-visit/
 Disallow: /conference/search/
-Disallow: /conference/add-note/
 Disallow: /conference-add-calendar/
 Disallow: /conference-visit/
 Disallow: /seminar/
@@ -227,10 +223,8 @@ Disallow: /members/search/
 Disallow: /admin/
 Disallow: /theme/
 Disallow: /conference/search/
-Disallow: /expo/add-note/
 Disallow: /exposition-add-calendar/
 Disallow: /exposition-visit/
-Disallow: /conference/add-note/
 Disallow: /conference-add-calendar/
 Disallow: /conference-visit/
 Disallow: /seminar/
@@ -312,4 +306,4 @@ Disallow: /*/serv-catalogs-info.php
 Disallow: /expo-b/
 Disallow: /newsletters/
 Host: https://expomap.ru
-Sitemap: https://expomap.ru/sitemap.xml
+Sitemap: https://expomap.ru/sitemap.xml