From 6a2393e6819ea09aeb559354a69746750aa8cbdf Mon Sep 17 00:00:00 2001 From: luxagraf Date: Sat, 7 Jul 2018 20:41:09 -0400 Subject: added campsite model, refactored some code to avoid circular imports, reorganized some auxilary functions and fixed broken build JS. --- app/utils/widgets.py | 79 ++++------------------------------------------------ 1 file changed, 5 insertions(+), 74 deletions(-) (limited to 'app/utils/widgets.py') diff --git a/app/utils/widgets.py b/app/utils/widgets.py index 2b76f6b..c038252 100644 --- a/app/utils/widgets.py +++ b/app/utils/widgets.py @@ -5,24 +5,15 @@ from django.contrib.admin.widgets import AdminFileWidget from django.contrib.gis.admin import OSMGeoAdmin from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ +from django.template.loader import render_to_string +from django.template import Context from django.forms.widgets import SelectMultiple from django.conf import settings -import markdown +import markdown -def markdown_to_html(txt): - md = markdown.Markdown( - extensions=[ - 'markdown.extensions.fenced_code', - 'markdown.extensions.codehilite(css_class=highlight,linenums=False)', - 'markdown.extensions.attr_list', - 'footnotes', - 'extra' - ], - output_format='html5', - safe_mode=False - ) - return md.convert(txt) +from bs4 import BeautifulSoup +from django.utils.module_loading import import_string class CustomSelectMultiple(SelectMultiple): @@ -152,63 +143,3 @@ class OLAdminBase(OSMGeoAdmin): openlayers_url = '/static/admin/js/OpenLayers.js' -from bs4 import BeautifulSoup -from photos.models import LuxImage -from django.template.loader import render_to_string -from django.template import Context - - -def parse_image(s): - soup = BeautifulSoup(s.group(), "lxml") - for img in soup.find_all('img'): - cl = img['class'] - if cl[0] == 'postpic' or cl[0] == 'postpicright': - s = str(img).replace('[[base_url]]', settings.IMAGES_URL) - return s - else: - image_id = img['id'].split("image-")[1] - i = LuxImage.objects.get(pk=image_id) - caption = False - exif = False - cluster_class = None - extra = None - if cl[0] == 'cluster': - css_class = cl[0] - cluster_class = cl[1] - try: - if cl[2] == 'caption': - caption = True - elif cl[2] == 'exif': - exif = True - else: - extra = cl[2] - - if len(cl) > 3: - if cl[3] == 'exif': - exif = True - except: - pass - elif cl[0] != 'cluster' and len(cl) > 1: - css_class = cl[0] - if cl[1] == 'caption': - caption = True - if cl[1] == 'exif': - exif = True - elif cl[0] != 'cluster' and len(cl) > 2: - css_class = cl[0] - if cl[1] == 'caption': - caption = True - if cl[2] == 'exif': - exif = True - print('caption'+str(caption)) - else: - css_class = cl[0] - return render_to_string("lib/img_%s.html" % css_class, {'image': i, 'caption': caption, 'exif': exif, 'cluster_class': cluster_class, 'extra':extra}) - - -def parse_video(s): - soup = BeautifulSoup(s, "lxml") - if soup.find('video'): - return True - return False - -- cgit v1.2.3-70-g09d2