1453: Этап №5: Админка баги - Визуальный редактор

meta/views.py

@@ -154,9 +154,7 @@ class MetadataMixin(object):
 
         context = super(MetadataMixin, self).get_context_data(**kwargs)
 
-        meta_id = self.kwargs.get('meta_id')
-        if not meta_id:
-            meta_id = kwargs.get('meta_id')
+        meta_id = self.kwargs.get('meta_id') or kwargs.get('meta_id')
 
         if meta_id:
             try:

templates/admin/base.html

@@ -58,6 +58,11 @@
         .dropdown-menu{
             margin-bottom: 20px;
         }
+        textarea.cke_source{
+
+            white-space: pre-line;
+        }
+
         {% block styles %}
         {% endblock %}
     </style>

templates/admin/meta/meta_setting.html

@@ -19,6 +19,14 @@
 <form method="post" class="form-horizontal" name="form2" id="form2"enctype="multipart/form-data"> {% csrf_token %}
     <fieldset>
         <legend><i class="icon-edit"></i>{% if article %} Изменить {% else %} Добавить {% endif %}настройку{% if article %}(<a href="{{ article.get_permanent_url }}" target="_blank">на сайте</a>){% endif %}</legend>
+        <div class="span8">
+            Доступные параметры:
+            <br>{object_name} - название события (выставки/конференции)
+            <br>{object_title} - краткое описание события (выставки/конференции)/ заголовок новости или статьи
+            <br>{city} - город
+            <br>{country} - страна
+        </div>
+
 
         <div class="box span8">
             <div class="box-header well">
@@ -57,4 +65,4 @@
     </fieldset>
 </form>
 
-{% endblock %}
+{% endblock %}

templates/client/includes/company/company_object.html

@@ -344,4 +344,4 @@
 
 		});
 	</script>
-{% endblock %}
+{% endblock %}

templates/client/includes/conference/conference_object.html

@@ -146,7 +146,7 @@
 	<div class="i-event-description">
 		<h2 class="ied-title">{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}</h2>
         {% if event.description %}
-            <div class="ied-text">{{ event.description|safe|linebreaks }}</div>
+            <div class="ied-text">{{ event.description|safe }}</div>
         {% else %}
             {% include "client/includes/conference/default_description.html" with conf=event %}
     	{% endif %}

templates/client/includes/conference/conference_paid.html

@@ -187,7 +187,7 @@
 	<div class="i-event-description">
 		<h2 class="ied-title">{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}</h2>
         {% if event.description %}
-            <div class="ied-text">{{ event.description|safe|linebreaks }}</div>
+            <div class="ied-text">{{ event.description|safe }}</div>
         {% else %}
             {% include "client/includes/conference/default_description.html" with conf=event %}
     	{% endif %}

templates/client/includes/exposition/expo_paid.html

@@ -172,7 +172,7 @@
         {% if exposition.description %}
         <div class="i-event-description">
             <h2 class="ied-title">{% trans 'О выставке' %} {{ exposition.name|safe }}</h2>
-            <div class="ied-text">{{ exposition.description|safe|linebreaks }}</div>
+            <div class="ied-text">{{ exposition.description|safe }}</div>
         </div>
         <hr />
         {% endif %}

templates/client/includes/exposition/exposition_object.html

@@ -150,7 +150,7 @@
 	<div class="i-event-description">
 		<h2 class="ied-title">{% trans 'О выставке' %} {{ exposition.name|safe }}</h2>
         {% if exposition.description %}
-		    <div class="ied-text">{{ exposition.description|safe|linebreaks }}</div>
+		    <div class="ied-text">{{ exposition.description|safe }}</div>
         {%else %}
             {% include "client/includes/exposition/default_description.html" with expo=exposition %}
         {% endif %}