diff options
| -rw-r--r-- | app/jrnl/admin.py | 2 | ||||
| -rw-r--r-- | app/photos/admin.py | 3 | ||||
| -rw-r--r-- | app/photos/urls.py | 5 | ||||
| -rw-r--r-- | app/photos/views.py | 8 | ||||
| -rw-r--r-- | design/templates/admin/daily/change_form.html | 15 | ||||
| -rw-r--r-- | design/templates/admin/jrnl/change_form.html | 127 | ||||
| -rw-r--r-- | design/templates/admin/photos/luximage/change_form.html | 135 |
7 files changed, 16 insertions, 279 deletions
diff --git a/app/jrnl/admin.py b/app/jrnl/admin.py index 1f0a14b..5fcdc89 100644 --- a/app/jrnl/admin.py +++ b/app/jrnl/admin.py @@ -64,7 +64,7 @@ class EntryAdmin(OSMGeoAdmin): openlayers_url = '/static/admin/js/OpenLayers.js' class Media: - js = ('image-loader.js',) + js = ('image-loader.js','next-prev-links.js') @admin.register(HomepageCurrator) class HomepageCurratorAdmin(admin.ModelAdmin): diff --git a/app/photos/admin.py b/app/photos/admin.py index b69897a..d0f28d7 100644 --- a/app/photos/admin.py +++ b/app/photos/admin.py @@ -51,6 +51,9 @@ class LuxImageAdmin(OSMGeoAdmin): }), ) + class Media: + js = ('image-preview.js','next-prev-links.js') + admin.site.register(LuxImage, LuxImageAdmin) diff --git a/app/photos/urls.py b/app/photos/urls.py index 5978107..7be732d 100644 --- a/app/photos/urls.py +++ b/app/photos/urls.py @@ -11,6 +11,11 @@ urlpatterns = [ views.photo_json ), url( + r'data/admin/preview/(?P<pk>\d+)/$', + views.photo_preview_json, + name="admin_image_preview" + ), + url( r'galleries/private/(?P<slug>[-\w]+)$', views.PrivateGallery.as_view(), name="private" diff --git a/app/photos/views.py b/app/photos/views.py index bb94fbe..0a7e256 100644 --- a/app/photos/views.py +++ b/app/photos/views.py @@ -3,7 +3,7 @@ from django.template import RequestContext from django.http import Http404, HttpResponse from django.core import serializers -from photos.models import Photo, PhotoGallery, LuxGallery +from .models import Photo, PhotoGallery, LuxGallery, LuxImage from locations.models import Country, Region from utils.views import PaginatedListView @@ -70,6 +70,12 @@ def photo_json(request, slug): return HttpResponse(serializers.serialize('json', p), mimetype='application/json') +def photo_preview_json(request, pk): + p = LuxImage.objects.get(pk=pk) + url = p.get_admin_image() + return HttpResponse(url) + + def gallery_list_by_area(request, slug, page): """Grabs entries by region or country""" request.page_url = '/photos/' + slug + '/%d/' diff --git a/design/templates/admin/daily/change_form.html b/design/templates/admin/daily/change_form.html deleted file mode 100644 index 23c2fb6..0000000 --- a/design/templates/admin/daily/change_form.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "admin/change_form.html" %} -{% load i18n admin_urls %} -{% block object-tools-items %} - <li> - <a onclick="geoFindMe();" href="javascript:void(0);" class="historylink">Get Location</a> - </li> - <li> - <a href="{% url opts|admin_urlname:'history' original.pk|admin_urlquote %}" class="historylink">{% trans "History" %}</a> - </li> - {% if has_absolute_url %} - <li> - <a href="{% url 'admin:view_on_site' content_type_id original.pk %}" class="viewsitelink">{% trans "View on site" %}</a> - </li> - {% endif %} -{% endblock %} diff --git a/design/templates/admin/jrnl/change_form.html b/design/templates/admin/jrnl/change_form.html deleted file mode 100644 index 06f2d9d..0000000 --- a/design/templates/admin/jrnl/change_form.html +++ /dev/null @@ -1,127 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load i18n admin_urls admin_static admin_modify %} - -{% block extrahead %}{{ block.super }} -<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> -{{ media }} -{% endblock %} - -{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %} - -{% block coltype %}colM{% endblock %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} - -{% if not is_popup %} -{% block breadcrumbs %} -<div class="breadcrumbs"> -<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> -› <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a> -› {% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} -› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} -</div> -{% endblock %} -{% endif %} - -{% block content %} -<div id="content-main"> -{% block object-tools %} -{% if change %}{% if not is_popup %} - <ul class="object-tools"> - {% block object-tools-items %} - <li> - {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %} - <a href="{% add_preserved_filters history_url %}" class="historylink">{% trans "History" %}</a> - </li> - {% if has_absolute_url %}<li><a href="{{ absolute_url }}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif %} - {% endblock %} - </ul> -{% endif %}{% endif %} -{% endblock %} -<ul style="padding-left: 0;"> - {%if original.get_previous_admin_url %}<li style="display: inline-block;"><a href="{{original.get_previous_admin_url}}">« prev</a></li>{%endif%} | - {%if original.get_next_admin_url %}<li style="display: inline-block;"><a href="{{original.get_next_admin_url}}">next »</a></li>{%endif%} -</ul> -<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>{% csrf_token %}{% block form_top %}{% endblock %} -<div> -{% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %} -{% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %} -{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} -{% if errors %} - <p class="errornote"> - {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} - </p> - {{ adminform.form.non_field_errors }} -{% endif %} - -{% block field_sets %} -{% for fieldset in adminform %} - {% include "admin/includes/fieldset.html" %} -{% endfor %} -{% endblock %} - -{% block after_field_sets %}{% endblock %} - -{% block inline_field_sets %} -{% for inline_admin_formset in inline_admin_formsets %} - {% include inline_admin_formset.opts.template %} -{% endfor %} -{% endblock %} - -{% block after_related_objects %}{% endblock %} - -{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} - -{% block admin_change_form_document_ready %} - <script type="text/javascript"> - (function($) { - $(document).ready(function() { - $('.add-another').click(function(e) { - e.preventDefault(); - var event = $.Event('django:add-another-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showAddAnotherPopup(this); - } - }); - $('.related-lookup').click(function(e) { - e.preventDefault(); - var event = $.Event('django:lookup-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectLookupPopup(this); - } - }); - $('body').on('click', '.related-widget-wrapper-link', function(e) { - e.preventDefault(); - if (this.href) { - var event = $.Event('django:show-related', {href: this.href}); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectPopup(this); - } - } - }); - $('body').on('change', '.related-widget-wrapper select', function(e) { - var event = $.Event('django:update-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - updateRelatedObjectLinks(this); - } - }); - $('.related-widget-wrapper select').trigger('change'); - - {% if adminform and add %} - $('form#{{ opts.model_name }}_form :input:visible:enabled:first').focus() - {% endif %} - }); - })(django.jQuery); - </script> -{% endblock %} - -{# JavaScript for prepopulated fields #} -{% prepopulated_fields_js %} - -</div> -</form></div> -{% endblock %} diff --git a/design/templates/admin/photos/luximage/change_form.html b/design/templates/admin/photos/luximage/change_form.html deleted file mode 100644 index a6222af..0000000 --- a/design/templates/admin/photos/luximage/change_form.html +++ /dev/null @@ -1,135 +0,0 @@ -{% extends "admin/base_site.html" %} -{% load get_image_by_size %} -{% load i18n admin_urls admin_static admin_modify %} - -{% block extrahead %}{{ block.super }} -<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> -{{ media }} -{% endblock %} - -{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />{% endblock %} - -{% block coltype %}colM{% endblock %} - -{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-form{% endblock %} - -{% if not is_popup %} -{% block breadcrumbs %} -<div class="breadcrumbs"> -<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a> -› <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a> -› {% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} -› {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %} -</div> -{% endblock %} -{% endif %} - -{% block content %}<div id="content-main"> -{% block object-tools %} -{% if change %}{% if not is_popup %} - <ul class="object-tools"> - {% block object-tools-items %} - <li> - {% url opts|admin_urlname:'history' original.pk|admin_urlquote as history_url %} - <a href="{% add_preserved_filters history_url %}" class="historylink">{% trans "History" %}</a> - </li> - {% if has_absolute_url %}<li><a href="{{ absolute_url }}" class="viewsitelink">{% trans "View on site" %}</a></li>{% endif %} - {% endblock %} - </ul> -{% endif %}{% endif %} -{% endblock %} -<ul style="padding-left: 0;"> - {%if original.get_previous_admin_url %}<li style="display: inline-block;"><a href="{{original.get_previous_admin_url}}">« prev</a></li>{%endif%} | - {%if original.get_next_admin_url %}<li style="display: inline-block;"><a href="{{original.get_next_admin_url}}">next »</a></li>{%endif%} -</ul> -<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>{% csrf_token %}{% block form_top %}{% endblock %} -<div> -{% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1" />{% endif %} -{% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}" />{% endif %} -{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %} -{% if errors %} - <p class="errornote"> - {% if errors|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %} - </p> - {{ adminform.form.non_field_errors }} -{% endif %} - -{% block field_sets %} - -<div class="form-row field-image"> -<div> -<label for="">Image:</label> -<p class="file-upload"><img src="{{original.get_admin_image}}" /></p> -</div> -</div> - -{% for fieldset in adminform %} - {% include "admin/includes/fieldset.html" %} -{% endfor %} -{% endblock %} - -{% block after_field_sets %}{% endblock %} - -{% block inline_field_sets %} -{% for inline_admin_formset in inline_admin_formsets %} - {% include inline_admin_formset.opts.template %} -{% endfor %} -{% endblock %} - -{% block after_related_objects %}{% endblock %} - -{% block submit_buttons_bottom %}{% submit_row %}{% endblock %} - -{% block admin_change_form_document_ready %} - <script type="text/javascript"> - (function($) { - $(document).ready(function() { - $('.add-another').click(function(e) { - e.preventDefault(); - var event = $.Event('django:add-another-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showAddAnotherPopup(this); - } - }); - $('.related-lookup').click(function(e) { - e.preventDefault(); - var event = $.Event('django:lookup-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectLookupPopup(this); - } - }); - $('body').on('click', '.related-widget-wrapper-link', function(e) { - e.preventDefault(); - if (this.href) { - var event = $.Event('django:show-related', {href: this.href}); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectPopup(this); - } - } - }); - $('body').on('change', '.related-widget-wrapper select', function(e) { - var event = $.Event('django:update-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - updateRelatedObjectLinks(this); - } - }); - $('.related-widget-wrapper select').trigger('change'); - - {% if adminform and add %} - $('form#{{ opts.model_name }}_form :input:visible:enabled:first').focus() - {% endif %} - }); - })(django.jQuery); - </script> -{% endblock %} - -{# JavaScript for prepopulated fields #} -{% prepopulated_fields_js %} - -</div> -</form></div> -{% endblock %} |