мультизагрузка изображений в админке

apps/conference/admin.py

@@ -37,7 +37,7 @@ from functions.admin_views import (
     AdminListView,
     AdminView,
     stat_paginate_results,
-    upload_photo
+    # upload_photo
 )
 from functions.custom_views import delete_object, objects_list
 from functions.views_help import get_referer
@@ -45,6 +45,7 @@ from functions.admin import DefaultAdmin
 from haystack.query import SearchQuerySet
 from models import Conference, Statistic, TimeTable, Speaker
 from photologue.forms import PhotoForm
+from photologue.admin import upload_photo
 from theme.models import Tag
 
 
@@ -349,7 +350,6 @@ class ConferenceListView(AdminListView):
     model = Conference
 
 
-# FIXME: WTF?
 @csrf_exempt
 def upload_conference_photo(request, conf_id):
     return upload_photo(request, conf_id, Conference)

apps/exposition/admin.py

@@ -13,6 +13,7 @@ from django.forms.models import modelformset_factory
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.utils import translation
+from django.views.decorators.csrf import csrf_exempt
 from file.forms import FileForm, FileModelForm
 from file.models import FileModel, TmpFile
 from forms import (
@@ -26,13 +27,14 @@ from functions.admin_views import (
     AdminListView,
     AdminView,
     stat_paginate_results,
-    upload_photo
+    # upload_photo
 )
 from functions.custom_views import delete_object, objects_list
 from functions.views_help import get_referer
 from haystack.query import SearchQuerySet
 from models import Exposition, Statistic, TimeTable, TmpTimeTable
 from photologue.forms import PhotoForm
+from photologue.admin import upload_photo
 from theme.models import Tag
 
 
@@ -346,6 +348,8 @@ class ExpositionListView(AdminListView):
     form_class = ExpositionFilterForm
     model = Exposition
 
+
+@csrf_exempt
 def upload_exposition_photo(request, expo_id):
     return upload_photo(request, expo_id, Exposition)
 

apps/functions/admin_views.py

@@ -147,26 +147,24 @@ class AdminListView(FormView):
         return context
 
 
-
+# @csrf_exempt
-# FIXME: WTF?
+# def upload_photo(request, id, Model):
-@csrf_exempt
+#     """
-def upload_photo(request, id, Model):
+#     uploading photo to some instance of Model
-    """
+#     instance must have upload_photo method, which download photo
-    uploading photo to some instance of Model
+#
-    instance must have upload_photo method, which download photo
+#     """
-
+#     obj = get_object_or_404(Model, pk=id)
-    """
+#     if request.method == 'POST':
-    obj = get_object_or_404(Model, pk=id)
+#         response = {'success': False}
-    if request.method == 'POST':
+#         form = PhotoForm(request.POST, request.FILES)
-        response = {'success': False}
+#         if form.is_valid():
-        form = PhotoForm(request.POST, request.FILES)
+#             photo = form.save()
-        if form.is_valid():
+#             obj.upload_photo(photo)
-            photo = form.save()
+#             response['success'] = True
-            obj.upload_photo(photo)
+#         else:
-            response['success'] = True
+#             response.update({'errors': form.errors})
-        else:
+#
-            response.update({'errors': form.errors})
+#         return HttpResponse(json.dumps(response), content_type='application/json')
-
+#     else:
-        return HttpResponse(json.dumps(response), content_type='application/json')
+#         return HttpResponse('not post')
-    else:
-        return HttpResponse('not post')

apps/photologue/admin.py

@@ -1,26 +1,19 @@
 import json
-from django import forms
+
 from django.conf import settings
-from django.shortcuts import HttpResponse
+from django.shortcuts import HttpResponse, get_object_or_404
-from django.contrib import admin
+from django.views.generic import ListView, FormView
-from django.contrib.sites.models import Site
+from django.http import HttpResponseRedirect
-from django.contrib import messages
-from django.utils.translation import ungettext, ugettext_lazy as _
 
-from .models import Gallery, Photo, GalleryUpload, PhotoEffect, PhotoSize, \
+from .models import Gallery, Photo
-    Watermark
+from .forms import PhotoForm, GalleryForm
 
-MULTISITE = getattr(settings, 'PHOTOLOGUE_MULTISITE', False)
+from sorl.thumbnail import get_thumbnail
 
+MULTISITE = getattr(settings, 'PHOTOLOGUE_MULTISITE', False)
 ENABLE_TAGS = getattr(settings, 'PHOTOLOGUE_ENABLE_TAGS', False)
 
 
-#------------------EXPOMAP VIEWS----------------------------------------------
-from django.views.generic import ListView, FormView
-from forms import PhotoForm, GalleryForm
-from django.shortcuts import  render_to_response, get_object_or_404
-from django.http import HttpResponseRedirect
-
 class AdminViewObject(FormView):
     """
     need overwrite get_form method for every class
@@ -56,7 +49,6 @@ class AdminViewObject(FormView):
         return context
 
 
-
 class PhotoView(AdminViewObject):
     model = Photo
     form_class = PhotoForm
@@ -80,11 +72,11 @@ class PhotoView(AdminViewObject):
                 obj = Photo._meta.translations_model.objects.get(language_code=code, master__id=getattr(photo, 'id'))  # access to translated fields
                 data['title_%s' % code] = obj.title
                 data['caption_%s' % code] = obj.caption
-            #form.fields['tag'].widget.attrs['data-init-text'] = [item.name for item in article.tag.all()]
             return form_class(data)
         else:
             return form_class()
 
+
 class GalleryView(AdminViewObject):
     model = Gallery
     form_class = GalleryForm
@@ -106,7 +98,6 @@ class GalleryView(AdminViewObject):
                 obj = Gallery._meta.translations_model.objects.get(language_code=code, master__id=getattr(gallery, 'id'))  # access to translated fields
                 data['title_%s' % code] = obj.title
                 data['description_%s' % code] = obj.description
-            #form.fields['tag'].widget.attrs['data-init-text'] = [item.name for item in article.tag.all()]
             return form_class(data)
         else:
             return form_class()
@@ -124,6 +115,53 @@ class GalleryListView(ListView):
     template_name = 'c_admin/photogallery/admin_gallery_list.html'
 
 
+def upload_photo(request, id, Model):
+    """
+    uploading photo to some instance of Model
+    instance must have upload_photo method, which download photo
+    """
+    def get_images_list(obj):
+        """
+        :param obj: instance of Model
+        :return: images list
+        """
+        images = []
+        if obj.photogallery:
+            for img in obj.photogallery.photos.all():
+                im = get_thumbnail(
+                    img.image, '188x143', crop='center', quality=99
+                )
+                images.append({
+                    'name': img.title or img.image.name,
+                    'size': img.image.size,
+                    'file': im.url,
+                    'type': 'image',
+                    'remove_url': img.get_delete_url(),
+                    'detail_link': img.admin_url()
+                })
+        return images
+
+    data = {'success': False}
+    obj = get_object_or_404(Model, pk=id)
+
+    if request.is_ajax() and request.method == 'POST':
+        form = PhotoForm(request.POST, request.FILES)
+
+        if form.is_valid():
+            photo = form.save()
+            obj.upload_photo(photo)
+
+            data['success'] = True
+        else:
+            data['errors'] = form.errors
+
+    elif request.is_ajax() and request.method == 'GET':
+        data['success'] = True
+        data['images'] = get_images_list(obj)
+
+    return HttpResponse(json.dumps(data), content_type='application/json')
+
+
 def delete_photo(request, photo_id):
     photo = get_object_or_404(Photo, pk=photo_id)
     photo.delete()

apps/place_exposition/admin.py

@@ -11,11 +11,12 @@ from django.contrib.auth.decorators import login_required
 from django.forms.formsets import formset_factory
 from django.forms.models import modelformset_factory
 from django.utils.translation import get_language
+from django.views.decorators.csrf import csrf_exempt
 
 from haystack.query import SearchQuerySet
 from functions.custom_views import objects_list, delete_object
 from functions.views_help import get_referer
-from functions.admin_views import AdminView, AdminListView, upload_photo, FormView
+from functions.admin_views import AdminView, AdminListView  # , upload_photo, FormView
 from functions.http import JsonResponse
 
 from exposition.admin import get_by_lang
@@ -25,6 +26,7 @@ from city.models import City
 from file.models import FileModel, TmpFile
 from file.forms import FileModelForm, FileForm
 from photologue.forms import PhotoForm
+from photologue.admin import upload_photo
 from place_conference.models import PlaceConference
 from place_exposition.models import PlaceExposition
 
@@ -285,7 +287,7 @@ class PlaceExpositionListView(AdminListView):
     model = PlaceExposition
 
 
-
+@csrf_exempt
 def upload_place_photo(request, place_id):
     return upload_photo(request, place_id, PlaceExposition)
 

static/custom_js/main.js

@@ -235,7 +235,7 @@ $(document).ready(function(){
         return false;
     });
     //  end on-of events
-    if( $("#id_city" ).length ) {
+    if( $("#id_city" ).length && $("#id_city" ).is('select') ) {
         $('#id_city').select2({
             placeholder: "Город",
             width: 'element',
@@ -275,7 +275,7 @@ $(document).ready(function(){
         });
     }
 
-    if( $("#id_main_page_news" ).length ) {
+    if( $("#id_main_page_news" ).length && $("#id_main_page_news").is('select')) {
         $('#id_main_page_news').select2({
         placeholder: "Новости",
         multiple: true,
@@ -325,7 +325,7 @@ $(document).ready(function(){
 
     }
 
-    if( $("#id_tag" ).length ) {
+    if( $("#id_tag" ).length && $("#id_tag").is('select')) {
         $('#id_tag').select2({
         placeholder: "Теги",
         width: '550px',
@@ -490,13 +490,17 @@ $(document).ready(function(){
             }
         });
     });
-    if($('select').length){
-     $('select').select2({
-        width: 'element',
-        allowClear: true
 
-    });
+    /* FIXME: Проверить все select2 */
-    }
+    // if($('select').length){
+    //     try{
+    //         $('select').select2({
+    //             width: 'element',
+    //             allowClear: true
+    //
+    //         });
+    //     } catch (e){}
+    // }
 
 
 

static/custom_js/make_select.js

@@ -1,94 +0,0 @@
-//replace
-$(document).ready(function(){
-    //$('#id_city').attr('disabled', true)
-
-    $('select').select2({
-        width: 'element',
-        allowClear: true
-
-    });//end select
-
-
-
-    $('#id_city').select2({
-        placeholder: "Search city",
-        width: 'element',
-        ajax: {
-
-            url: "/admin/city/search/",
-            dataType: "json",
-            quietMillis: 200,
-
-            data: function(term, page, country){
-                var country = $('#id_country').val()
-                return {term: term,
-                        page: page,
-                        country: country};
-            },
-
-            results: function (data) {
-                var results = [];
-                $.each(data, function(index, item){
-                    results.push({
-                      id: item.id,
-                      text: item.label
-                    });
-                });
-                return {results: results};
-            }
-        },
-        initSelection : function(element, callback) {
-            var id=	$(element).val();
-            var text = $(element).attr('data-init-text');
-            callback({id: id, text:text});
-
-        }
-        
-    });
-
-    //
-    $('#id_tag').select2({
-        placeholder: "Search tag",
-        width: '550px',
-        multiple: true,
-        ajax: {
-
-            url: "/admin/theme/tag/search/",
-            dataType: "json",
-            quietMillis: 200,
-            multiple: true,
-
-            data: function(term, page, theme){
-                var theme = $('#id_theme').serialize();
-                return {term: term,
-                        page: page,
-                        theme: theme};
-            },
-
-            results: function (data) {
-                var results = [];
-                $.each(data, function(index, item){
-                    results.push({
-                      id: item.id,
-                      text: item.label
-                    });
-                });
-                return {results: results};
-            }
-        },
-        initSelection : function(element, callback) {
-            var data = [];
-            $(element.val().split(",")).each(function(i) {
-                var item = this.split(':');
-                data.push({
-                        id: item[0],
-                        text: item[1]
-                    });
-            });
-            callback(data);
-
-        }
-
-    });
-
-})//end ready

static/jQuery-filer/js/init.js

@@ -1,4 +1,11 @@
 function init_filer($target) {
+
+    $.get($target.data('upload-url'), function(response){
+        var files = [];
+        if (response['success']) {
+            files = response['images'];
+        }
+
         $target.find('.file_uploader').filer({
                 limit: null,
                 maxSize: null,
@@ -11,7 +18,7 @@ function init_filer($target) {
                 },
                 templates: {
                     box: '<ul class="jFiler-items-list jFiler-items-grid"></ul>',
-			item: '<li class="jFiler-item not_loaded">\
+                    item: '<li class="jFiler-item">\
                                 <div class="jFiler-item-container">\
                                     <div class="jFiler-item-inner">\
                                         <a href="javascript:void(0);" class="jFiler-item-thumb">\
@@ -88,14 +95,6 @@ function init_filer($target) {
                     synchron: true,
                     beforeSend: function() {},
                     success: function(data, itemEl, listEl, boxEl, newInputEl, inputEl, id){
-				console.log(data);
-				console.log(itemEl);
-				console.log(listEl);
-				console.log(boxEl);
-				console.log(newInputEl);
-				console.log(inputEl);
-				console.log(id);
-				console.log('----------------------------');
                         var parent = itemEl.find(".jFiler-jProgressBar").parent();
 
                         itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){
@@ -112,35 +111,7 @@ function init_filer($target) {
                     onProgress: null,
                     onComplete: null
                 },
-		files: [
+                files: files,
-			{
-				name: "appended_file.jpg",
-				size: 5453,
-				type: "image",
-				file: "http://127.0.0.1:8000/media/photologue/photos/cache/am_admin_thumbnail.jpg", // 188x143 crop="center"
-				url: "google.com.ua",
-				remove_url: '/remove-url/1/',
-				detail_link: '/detail_link/1/'
-			},
-			{
-				name: "appended_file_2.jpg",
-				size: 9453,
-				type: "image",
-				file: "http://127.0.0.1:8000/media/photologue/photos/cache/am_admin_thumbnail.jpg", // 188x143 crop="center"
-				url: "/qwerty/qwerty/",
-				remove_url: '/remove-url/2/',
-				detail_link: '/detail_link/1/'
-			},
-			{
-				name: "appended_file_2.jpg",
-				size: 9453,
-				type: "image",
-				file: "http://127.0.0.1:8000/media/photologue/photos/cache/am_admin_thumbnail.jpg", // 188x143 crop="center"
-				url: "/qwerty/qwerty/",
-				remove_url: '/remove-url/3/',
-				detail_link: '/detail_link/1/'
-			}
-		],
                 addMore: false,
                 allowDuplicates: true,
                 clipBoardPaste: true,
@@ -153,8 +124,9 @@ function init_filer($target) {
                 onRemove: function(itemEl, file, id, listEl, boxEl, newInputEl, inputEl){
                     var filerKit = inputEl.prop("jFiler"),
                         file_name = filerKit.files_list[id].name;
+                    console.log(itemEl);
 
-		    $.post('./php/ajax_remove_file.php', {file: file_name});
+                    $.get(itemEl.find('.jFiler-item-trash-action').attr('href'))
                 },
                 onEmpty: null,
                 options: null,
@@ -180,7 +152,7 @@ function init_filer($target) {
                     }
                 }
             });
-
+    });
 }
 
 

templates/c_admin/accounts/user_change.html

@@ -7,7 +7,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
 
     <script>
     $(document).ready(function(){

templates/c_admin/admin_list.html

@@ -5,6 +5,5 @@
        {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
 
 {% endblock %}

templates/c_admin/article/article_add.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/article/blog_form.html

@@ -9,7 +9,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/blog/blog_add.html

@@ -7,7 +7,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     {# ajax #}
     <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
     <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/city/city_add.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
 

templates/c_admin/company/company_add.html

@@ -14,7 +14,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
 
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>

templates/c_admin/conference/conference.html

@@ -574,7 +574,6 @@
 </form>
 
 
-{% include 'c_admin/includes/photo_form.html' with form=photo_form object=object %}
 {% include 'c_admin/includes/file_form.html' with file_form=file_form object=object %}
 {% include 'c_admin/includes/stat_form.html' with form=stat_form object=object %}
 {% endblock %}

templates/c_admin/conference/conference_add.html

@@ -9,7 +9,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# datetimepicker #}
         <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>

templates/c_admin/country/country_add.html

@@ -10,7 +10,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
 

templates/c_admin/exposition/exposition.html

@@ -492,54 +492,7 @@
                 </div>
             <a href="#stat_modal" id="stat_add" role="btn btn-success" class="btn btn-success" data-toggle="modal"><i class="icon-plus-sign icon-white"></i> Добавить год</a>
             </div>
-
-
-        {% else %}
         {% endif %}
-        {% comment %}
-        {% if formset_statistic.errors %}
-        <div class="alert alert-error">
-        {% for form in formset_statistic.forms %}
-
-            {% for key, value in form.errors.items %}
-                <p>{{ value }}</p>
-            {% endfor %}
-
-        {% endfor %}
-        </div>
-        {% endif %}
-
-        {# formset of stat #}
-        {{ formset_statistic.management_form }}
-
-        <div id="halls" style="padding-left: 160px;{% if object %} {% else %}display: none;{% endif %}">
-
-        <table class="table table-hover" style=" width: 100%;">
-            <thead>
-                <tr>
-                    <td>Год</td>
-                    <td>Посетители</td>
-                    <td>Участники</td>
-                    <td>Площадь</td>
-                    <td></td>
-                </tr>
-            </thead>
-            <tbody>
-            {% for form in formset_statistic.forms %}
-                <tr class="item" {% if object %}{% else %}style="display: NONE"{% endif %}>
-                    <td>{{ form.year }}</td>
-                    <td>{{ form.visitors }}</td>
-                    <td>{{ form.members }}</td>
-                    <td>{{ form.area }}</td>
-                    <td><a class="delete btn btn-danger" href="#"><i class="icon-trash icon-white"></i> Удалить</a></td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-        </div>
-        <p style=" padding-left: 20px"><a id="add" class="btn btn-success" href="#"><i class="icon-plus-sign icon-white"></i> Добавить год</a></p>
-        </div>
-        {% endcomment %}
     </div>
     <div class="box span8" id="file">
         <div class="box-header well">
@@ -661,7 +614,6 @@
     </div>
 
 </div>
-{% include 'c_admin/includes/photo_form.html' with form=photo_form object=object %}
 {% include 'c_admin/includes/file_form.html' with file_form=file_form object=object %}
 {% include 'c_admin/includes/stat_form.html' with form=stat_form object=object %}
 {% endblock %}

templates/c_admin/exposition/exposition_add.html

@@ -18,7 +18,6 @@
 {#          <script src="{% static 'js/datepicker/js/bootstrap-datepicker.js' %}"></script>  #}
 
 
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         <script src="{% static 'custom_js/formset_add.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>

templates/c_admin/import templates/export.html

@@ -5,7 +5,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     {# datetimepicker #}
     <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>

templates/c_admin/import templates/export_event.html

@@ -5,7 +5,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     {# datetimepicker #}
     <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>

templates/c_admin/includes/photogallery.html

@@ -6,62 +6,6 @@
 
     <div class="box-content">
         {% if object %}
-            <a class="btn btn-success" href="#photopopup" data-toggle="modal"><i class="icon-plus-sign icon-white"></i> Фото</a>
-            <a href="{{ object.photogallery.admin_url }}" role="button" class="btn btn-info" data-toggle="modal">Просмотреть галерею</a><br><br>
-        {% else %}
-                <p>Фото можна добавлять только после введения основных даных</p>
-        {% endif %}
-
-        {% with photos=object.photogallery.photos.all %}
-            <div class="clearfix">
-                {% for photo in photos %}
-
-                    <div class="photo" style="float: left;margin-right: 15px;">
-                        <div class="hover">
-                            <a href="{{ photo.get_delete_url }}" class="btn-small btn-danger delete-photo">удалить</a>
-                        </div>
-                        <div>
-                            <a href="/admin/photogallery/photo/{{ photo.slug }}/">
-                                <img src="{{ photo.get_admin_thumbnail_url }}" class="thumbnail" alt="{{ photo.title }}">
-                            </a>
-                        </div>
-                    </div>
-                {% endfor %}
-            </div>
-        {% endwith %}
-
-
-{#        <form  method="post" class="form-horizontal" id="photo_form" enctype="multipart/form-data" action="{{ object.upload_photo_url }}">#}
-{#            {% csrf_token %}#}
-
-{#            <div class="control-group{% if form.image.errors %}error{% endif %}">#}
-{#                <label class="control-label">{{ form.image.label }}:</label>#}
-{#                <div class="controls">#}
-{#                    {{ form.image }}#}
-{#                    <span class="help-inline">{{  form.image.errors }}</span>#}
-{#                </div>#}
-{#            </div>#}
-
-{#            <div class="control-group{% if form.sort.errors %}error{% endif %}">#}
-{#                <label class="control-label">{{ form.sort.label }}:</label>#}
-{#                <div class="controls">{{ form.sort }}#}
-{#                    <span class="help-inline">{{  form.sort.errors }}</span>#}
-{#                </div>#}
-{#            </div>#}
-
-{#            {% with field='caption' form=form languages=languages %}#}
-{#                {% include 'c_admin/forms/multilang.html' %}#}
-{#            {% endwith %}#}
-{##}
-{#            {% with field='title' form=form languages=languages %}#}
-{#                {% include 'c_admin/forms/multilang.html' %}#}
-{#            {% endwith %}#}
-{##}
-{#            <div class="controls">#}
-{#                <input class="btn btn-primary" type="submit" value="Добавить">#}
-{#            </div>#}
-{#        </form>#}
-
             <div class="file_upload_container"
                  data-upload-url="{{ object.upload_photo_url }}"
                  data-get-url="{{ object.upload_photo_url }}"
@@ -69,8 +13,6 @@
                  data-fields="title|caption">
 
                 <input type="file" name="image" class="file_uploader">
-
-            <a href="#" class="btn btn-success upload_loaded_files">Загрузить файлы</a>
             </div>
 
             <link rel="stylesheet" href="{% static 'jQuery-filer/css/jquery.filer.css' %}">
@@ -78,5 +20,8 @@
 
             <script src="{% static 'jQuery-filer/js/jquery.filer.js' %}"></script>
             <script src="{% static 'jQuery-filer/js/init.js' %}"></script>
+        {% else %}
+            <p>Изображения можно добавлять только после введения основных данных</p>
+        {% endif %}
     </div>
 </div>

templates/c_admin/meta/create_seo_text.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/meta/meta_setting.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/news/news_add.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# datetimepicker #}
         <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>

templates/c_admin/organiser/organiser_add.html

@@ -14,7 +14,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/place_city_ajax.js' %}"></script>

templates/c_admin/page/new_page.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/photogallery/admin_gallery.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/photogallery/admin_photo.html

@@ -9,7 +9,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>

templates/c_admin/photoreport/photoreport_add.html

@@ -7,7 +7,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
 {% endblock %}
 

templates/c_admin/place_conference/place_conference.html

@@ -22,7 +22,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     <script src="{% static 'custom_js/formset_add.js' %}"></script>
     {# ajax #}
 

templates/c_admin/place_conference/place_conference_add.html

@@ -2,25 +2,21 @@
 {% load static %}
 
 {% block scripts %}
-
     <script src="{% static 'ckeditor/ckeditor/ckeditor.js' %}"></script>
      {# google map не забыть скачать скрипты на локал #}
     <link href='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/themes/redmond/jquery-ui.css' rel="stylesheet"/>
     <script src='http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js'></script>
     <script src='http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js'></script>
     <script src='http://maps.google.com/maps/api/js?sensor=false'></script>
-    {# selects #}
-    <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
-    <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
-    <script src="{% static 'custom_js/formset_add.js' %}"></script>
     {# ajax #}
     <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
     <script src="{% static 'custom_js/place_city_ajax.js' %}"></script>
+{% endblock %}
 
-
+{% block select2 %}
-
+    <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
-
+    <script src="{% static 'js/select/select2.js' %}"></script>
+    <script src="{% static 'custom_js/formset_add.js' %}"></script>
 {% endblock %}
 
 {% block body %}
@@ -389,54 +385,54 @@
 </form>
 
     {# modal window #}
-<div class="modal hide fade" id="myModal" >
+{#<div class="modal hide fade" id="myModal" >#}
-     <div class="modal-header">
+{#     <div class="modal-header">#}
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" id="close">&times;</button>
+{#            <button type="button" class="close" data-dismiss="modal" aria-hidden="true" id="close">&times;</button>#}
-            <h3>Добавить файл</h3>
+{#            <h3>Добавить файл</h3>#}
-     </div>
+{#     </div>#}
-
+{##}
-     <div id="form_body">
+{#     <div id="form_body">#}
-     <div class="modal-body">
+{#     <div class="modal-body">#}
-            <form  method="post" class="form-horizontal"  enctype="multipart/form-data" name="file_form" id="file_form" > {% csrf_token %}
+{#            <form  method="post" class="form-horizontal"  enctype="multipart/form-data" name="file_form" id="file_form" > {% csrf_token %}#}
-
+{##}
             {# hidden inputs uses for comparing with Country form key#}
-            {{ file_form.key }}
+{#            {{ file_form.key }}#}
-            {{ file_form.model }}
+{#            {{ file_form.model }}#}
-            <input type="hidden" id="obj_id" value="{{ obj_id }}">
+{#            <input type="hidden" id="obj_id" value="{{ obj_id }}">#}
             {# file_path #}
-            <div class="control-group{% if file_form.file_path.errors %}error{% endif %}">
+{#            <div class="control-group{% if file_form.file_path.errors %}error{% endif %}">#}
-                <label class="control-label">{{ file_form.file_path.label }}:</label>
+{#                <label class="control-label">{{ file_form.file_path.label }}:</label>#}
-                    <div class="controls">{{ file_form.file_path }}
+{#                    <div class="controls">{{ file_form.file_path }}#}
-                        <span class="help-inline">{{  file_form.file_path.errors }}</span>
+{#                        <span class="help-inline">{{  file_form.file_path.errors }}</span>#}
-                    </div>
+{#                    </div>#}
-            </div>
+{#            </div>#}
             {# file purpose #}
-            <div class="control-group{% if file_form.purpose.errors %}error{% endif %}">
+{#            <div class="control-group{% if file_form.purpose.errors %}error{% endif %}">#}
-                <label class="control-label">{{ file_form.purpose.label }}:</label>
+{#                <label class="control-label">{{ file_form.purpose.label }}:</label>#}
-                    <div class="controls">{{ file_form.purpose }}
+{#                    <div class="controls">{{ file_form.purpose }}#}
-                        <span class="help-inline">{{  file_form.purpose.errors }}</span>
+{#                        <span class="help-inline">{{  file_form.purpose.errors }}</span>#}
-                    </div>
+{#                    </div>#}
-            </div>
+{#            </div>#}
             {# file_name #}
-            {% with field='file_name' form=file_form languages=languages %}
+{#            {% with field='file_name' form=file_form languages=languages %}#}
-                {% include 'c_admin/forms/multilang.html' %}
+{#                {% include 'c_admin/forms/multilang.html' %}#}
-            {% endwith %}
+{#            {% endwith %}#}
             {# file_description #}
-            {% with field='description' form=file_form languages=languages %}
+{#            {% with field='description' form=file_form languages=languages %}#}
-                {% include 'c_admin/forms/multilang.html' %}
+{#                {% include 'c_admin/forms/multilang.html' %}#}
-            {% endwith %}
+{#            {% endwith %}#}
-
+{##}
-     </div>
+{#     </div>#}
-
+{##}
-    <div class="modal-footer">
+{#    <div class="modal-footer">#}
-        <div class="controls">
+{#        <div class="controls">#}
-            <input class="btn btn-primary" type="submit" value="Добавить">
+{#            <input class="btn btn-primary" type="submit" value="Добавить">#}
-            <input type="reset" class="btn" value="Отменить" data-dismiss="modal">
+{#            <input type="reset" class="btn" value="Отменить" data-dismiss="modal">#}
-            </form>
+{#            </form>#}
-        </div>
+{#        </div>#}
-    </div>
+{#    </div>#}
-    </div>
+{#    </div>#}
-
+{##}
-</div>
+{#</div>#}
 
 {% endblock %}

templates/c_admin/place_exposition/hall.html

@@ -12,7 +12,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     <script src="{% static 'custom_js/formset_add.js' %}"></script>
     {# ajax #}
 

templates/c_admin/place_exposition/place_exposition.html

@@ -22,7 +22,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     <script src="{% static 'custom_js/formset_add.js' %}"></script>
     {# ajax #}
 

templates/c_admin/place_exposition/place_exposition_add.html

@@ -12,7 +12,6 @@
     {# selects #}
     <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
     <script src="{% static 'js/select/select2.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     <script src="{% static 'custom_js/formset_add.js' %}"></script>
     {# ajax #}
     <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>

templates/c_admin/seminar/seminar_add.html

@@ -14,7 +14,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# datetimepicker #}
         <link href="{% static 'js/datetimepicker/css/datetimepicker.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/datetimepicker/js/bootstrap-datetimepicker.js' %}"></script>

templates/c_admin/service/service_add.html

@@ -8,7 +8,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         <script src="{% static 'custom_js/service.js' %}"></script>
         <style>
             li{

templates/c_admin/settings/main_page.html

@@ -11,7 +11,6 @@
     <script src="{% static 'js/jquery-ui-1.12.0-rc.2/jquery-ui.min.js' %}"></script>
 
     <script src="{% static 'js/select/select2.sortable.js' %}"></script>
-    <script src="{% static 'custom_js/make_select.js' %}"></script>
     <script>
     $(function() {
         $('#id_exposition_themes, #id_conference_themes').select2('destroy');

templates/c_admin/theme/tag_add.html

@@ -7,7 +7,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
 
 
 

templates/c_admin/theme/theme_add.html

@@ -7,7 +7,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
 
 
 

templates/c_admin/translator/translator.html

@@ -9,7 +9,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         {# datetimepicker #}

templates/c_admin/translator/translator_add.html

@@ -9,7 +9,6 @@
         {# selects #}
         <link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
         <script src="{% static 'js/select/select2.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
         {# datetimepicker #}

templates/c_admin/webinar/webinar_add.html

@@ -12,7 +12,6 @@
         <script src="{% static 'custom_js/formset_add.js' %}"></script>
         {# ajax #}
         <script src="{% static 'custom_js/file_post_ajax.js' %}"></script>
-        <script src="{% static 'custom_js/make_select.js' %}"></script>
         <script src="{% static 'custom_js/select_tag.js' %}"></script>
 
         {# datetimepicker #}