diff options
| -rw-r--r-- | app/jrnl/migrations/0005_auto_20160514_2151.py | 20 | ||||
| -rw-r--r-- | app/notes/admin.py | 3 | ||||
| -rw-r--r-- | config/requirements.txt | 44 | ||||
| -rw-r--r-- | design/templates/admin/insert_images.html | 3 | ||||
| -rw-r--r-- | design/templates/admin/jrnl/change_form.html | 147 |
5 files changed, 215 insertions, 2 deletions
diff --git a/app/jrnl/migrations/0005_auto_20160514_2151.py b/app/jrnl/migrations/0005_auto_20160514_2151.py new file mode 100644 index 0000000..701c8c3 --- /dev/null +++ b/app/jrnl/migrations/0005_auto_20160514_2151.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-05-14 21:51 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('jrnl', '0004_auto_20160309_1031'), + ] + + operations = [ + migrations.AlterField( + model_name='entrytitlesong', + name='title', + field=models.CharField(blank=True, max_length=200), + ), + ] diff --git a/app/notes/admin.py b/app/notes/admin.py index dcd3576..0135820 100644 --- a/app/notes/admin.py +++ b/app/notes/admin.py @@ -8,14 +8,13 @@ from utils.widgets import LGEntryForm, OLAdminBase class SyndicatedInline(GenericTabularInline): model = SyndicatedItem - extra = 1 + extra = 0 max_num = 1 class LuxNoteAdmin(OLAdminBase): inlines = [ SyndicatedInline, - ] prepopulated_fields = {"slug": ('title',)} list_display = ('slug', 'pub_date', 'location') diff --git a/config/requirements.txt b/config/requirements.txt index 0efb8f4..f72de42 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -16,3 +16,47 @@ six==1.9.0 smartypants==1.8.6 twython==3.2.0 typogrify==2.0.7 +backports.shutil-get-terminal-size==1.0.0 +beautifulsoup4==4.4.0 +bleach==1.4.3 +decorator==4.0.10 +Django==1.9.7 +django-autocomplete-light==2.2.10 +django-bleach==0.3.0 +django-contrib-comments==1.7.1 +django-extensions==1.6.7 +django-gravatar2==1.4.0 +django-modeladmin-reorder==0.1.3 +django-paypal==0.2.7 +django-taggit==0.20.1 +EbookLib==0.15 +facebook-sdk==1.0.0 +flickrapi==2.1.2 +gunicorn==19.6.0 +html5lib==0.9999999 +ipython==4.2.0 +ipython-genutils==0.1.0 +Jinja2==2.8 +jsmin==2.2.1 +lxml==3.6.0 +Markdown==2.6.6 +MarkupSafe==0.23 +medium==0.3.0 +oauthlib==1.1.2 +paypal==1.2.5 +pexpect==4.1.0 +pickleshare==0.7.2 +Pillow==3.2.0 +psycopg2==2.6.1 +ptyprocess==0.5.1 +-e git://github.com/smarnach/pyexiftool.git@0d5ee2f590ad336426c239f47b2b0406c6f52620#egg=PyExifTool +python-resize-image==1.1.3 +requests==2.10.0 +requests-oauthlib==0.6.1 +requests-toolbelt==0.6.2 +simplegeneric==0.8.1 +six==1.10.0 +smartypants==1.8.6 +traitlets==4.2.1 +twython==3.4.0 +typogrify==2.0.7 diff --git a/design/templates/admin/insert_images.html b/design/templates/admin/insert_images.html index 7e39583..caaa790 100644 --- a/design/templates/admin/insert_images.html +++ b/design/templates/admin/insert_images.html @@ -85,6 +85,9 @@ $(function(){ </head> <body> <input type="button" value="Refresh" onClick="window.location.reload()"> + <button id="add_id_image" onClick="window.parent.open('/admin/photos/luximage/add/?_to_field=id&_popup=1')">Upload Image + <img src="/static/admin/img/icon-addlink.svg" alt="Add"> + </button> <div class="up-wrapper">{% for image in images %} <div class="item-wrapper"> <figure class="item" > diff --git a/design/templates/admin/jrnl/change_form.html b/design/templates/admin/jrnl/change_form.html new file mode 100644 index 0000000..13d3790 --- /dev/null +++ b/design/templates/admin/jrnl/change_form.html @@ -0,0 +1,147 @@ +{% 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 }} +<script> +if (!$) { + $ = django.jQuery; +} +$(function(){ + $('#id_body_markdown').each(function(){ + $(this).after('<iframe frameborder="0" style="border: #dddddd 1px solid;margin-left: 20px;width:330px; height:720px;" src="/luximages/insert/?textarea='+this.id+'"></iframe>'); + }); +}); +</script> + +{% 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 %} + <a class="btn" onclick="geoFindMe();" href="javascript:void(0);" class="historylink">Get Location</a> +<div id="content-main"> +{% block object-tools %} +{% if change %}{% if not is_popup %} + <ul class="object-tools"> + {% 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 %} + <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 %} +<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 %} |