diff --git a/src/papiez_ipsum/settings.py b/src/papiez_ipsum/settings.py index 4326e56..24e8bd6 100644 --- a/src/papiez_ipsum/settings.py +++ b/src/papiez_ipsum/settings.py @@ -164,3 +164,6 @@ try: from papiez_ipsum.settings_local import * except ImportError: pass + + +PAPIEZATOR_REDIS_TTL = 60*60*12 diff --git a/src/papiezator/papiezator_settings.py b/src/papiezator/papiezator_settings.py new file mode 100644 index 0000000..7c9f039 --- /dev/null +++ b/src/papiezator/papiezator_settings.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python +# -*- encoding: utf-8 -*- + +from django.conf import settings + +REDIS_TTL = getattr(settings, "PAPIEZATOR_REDIS_TTL", 60*60*12) diff --git a/src/papiezator/pope_utils.py b/src/papiezator/pope_utils.py index 9e72699..95f322a 100644 --- a/src/papiezator/pope_utils.py +++ b/src/papiezator/pope_utils.py @@ -1,7 +1,14 @@ -from papiezator.models import Pope, PopeImage, PerfectPope, DECIMAL_PLACES +from papiezator.models import PopeImage, PerfectPope, DECIMAL_PLACES from PIL import Image -from io import BytesIO # FIXME: +from io import BytesIO from django.core.exceptions import ObjectDoesNotExist +from papiezator.papiezator_settings import REDIS_TTL +try: + from redis import Redis + from redis.exceptions import ConnectionError as RedisConnectionError + redis = Redis() +except ImportError: + redis = None def select_best_pope(aspect_ratio, pope): """ (float, pope) -> PopeImage @@ -10,54 +17,76 @@ def select_best_pope(aspect_ratio, pope): pp = PerfectPope.objects.filter(aspect_ratio=aspect_ratio, pope=pope) if pp: return pp[0].image + # popes below and above this ratio lte = PopeImage.objects.filter(aspect_ratio__lte=aspect_ratio, pope=pope).order_by('-aspect_ratio')[0:1] gte = PopeImage.objects.filter(aspect_ratio__gte=aspect_ratio, pope=pope).order_by('aspect_ratio')[0:1] if gte and lte: - r_lte = abs(aspect_ratio - lte[0].aspect_ratio) # FIXME: - r_gte = abs(aspect_ratio - gte[0].aspect_ratio) + lte, gte = lte[0], gte[0] - if r_lte >= r_gte: - return_pope = habemus_papam(aspect_ratio, gte[0], pope) + lte_distance = abs(aspect_ratio - lte.aspect_ratio) + gte_distance = abs(aspect_ratio - gte.aspect_ratio) + + if lte_distance >= gte_distance: + return_image_path = gte else: - return_pope = habemus_papam(aspect_ratio, lte[0], pope) + return_image_path = lte + # if there are no popes above or below this ratio elif gte: - return_pope = gte[0] + return_image_path = gte[0] elif lte: - return_pope = lte[0] + return_image_path = lte[0] + # or even if there are no popes at all :c else: return None - return return_pope + return habemus_papam(aspect_ratio, image_path=return_image_path, pope=pope) -def habemus_papam(aspect_ratio, image, pope): - pp = PerfectPope(aspect_ratio=aspect_ratio, image=image, pope=pope) - pp.save() # FIXME: - return image +def habemus_papam(aspect_ratio, image_path, pope): + pp = PerfectPope(aspect_ratio=aspect_ratio, image=image_path, pope=pope) + pp.save() + return image_path def unpopable(width, height): if width == 0 or height == 0: return True - if (width+height) > 9000: + if (width+height) >= 9001: return True return False -def read_pope(width, height, pope): - """ (int, int, Pope) -> bytes - """ - im = Image.open(pope.path) +def read_pope_from_fs(width, height, pope_image): + im = Image.open(pope_image.path) im = im.resize((width, height)) f = BytesIO() # FIXME: ceriously. im.save(f, "jpeg") f.seek(0) return f.read() +def read_pope(width, height, pope_image): + """ (int, int, Pope) -> bytes + get pope and scale for display + """ + if redis: + try: + + im = redis.get((width,height)) + if not im: + im = read_pope_from_fs(width, height, pope_image) + redis.set((width,height), im) + redis.expire((width,height), REDIS_TTL) + + except RedisConnectionError: + im = read_pope_from_fs(width, height, pope_image) + + return im + + def parse_pope(path): diff --git a/src/papiez_ipsum/static/admin/css/base.css b/src/papiezator/static/admin/css/base.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/base.css rename to src/papiezator/static/admin/css/base.css diff --git a/src/papiez_ipsum/static/admin/css/changelists.css b/src/papiezator/static/admin/css/changelists.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/changelists.css rename to src/papiezator/static/admin/css/changelists.css diff --git a/src/papiez_ipsum/static/admin/css/dashboard.css b/src/papiezator/static/admin/css/dashboard.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/dashboard.css rename to src/papiezator/static/admin/css/dashboard.css diff --git a/src/papiez_ipsum/static/admin/css/forms.css b/src/papiezator/static/admin/css/forms.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/forms.css rename to src/papiezator/static/admin/css/forms.css diff --git a/src/papiez_ipsum/static/admin/css/ie.css b/src/papiezator/static/admin/css/ie.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/ie.css rename to src/papiezator/static/admin/css/ie.css diff --git a/src/papiez_ipsum/static/admin/css/login.css b/src/papiezator/static/admin/css/login.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/login.css rename to src/papiezator/static/admin/css/login.css diff --git a/src/papiez_ipsum/static/admin/css/rtl.css b/src/papiezator/static/admin/css/rtl.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/rtl.css rename to src/papiezator/static/admin/css/rtl.css diff --git a/src/papiez_ipsum/static/admin/css/widgets.css b/src/papiezator/static/admin/css/widgets.css similarity index 100% rename from src/papiez_ipsum/static/admin/css/widgets.css rename to src/papiezator/static/admin/css/widgets.css diff --git a/src/papiez_ipsum/static/admin/img/changelist-bg.gif b/src/papiezator/static/admin/img/changelist-bg.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/changelist-bg.gif rename to src/papiezator/static/admin/img/changelist-bg.gif diff --git a/src/papiez_ipsum/static/admin/img/changelist-bg_rtl.gif b/src/papiezator/static/admin/img/changelist-bg_rtl.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/changelist-bg_rtl.gif rename to src/papiezator/static/admin/img/changelist-bg_rtl.gif diff --git a/src/papiez_ipsum/static/admin/img/chooser-bg.gif b/src/papiezator/static/admin/img/chooser-bg.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/chooser-bg.gif rename to src/papiezator/static/admin/img/chooser-bg.gif diff --git a/src/papiez_ipsum/static/admin/img/chooser_stacked-bg.gif b/src/papiezator/static/admin/img/chooser_stacked-bg.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/chooser_stacked-bg.gif rename to src/papiezator/static/admin/img/chooser_stacked-bg.gif diff --git a/src/papiez_ipsum/static/admin/img/default-bg-reverse.gif b/src/papiezator/static/admin/img/default-bg-reverse.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/default-bg-reverse.gif rename to src/papiezator/static/admin/img/default-bg-reverse.gif diff --git a/src/papiez_ipsum/static/admin/img/default-bg.gif b/src/papiezator/static/admin/img/default-bg.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/default-bg.gif rename to src/papiezator/static/admin/img/default-bg.gif diff --git a/src/papiez_ipsum/static/admin/img/deleted-overlay.gif b/src/papiezator/static/admin/img/deleted-overlay.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/deleted-overlay.gif rename to src/papiezator/static/admin/img/deleted-overlay.gif diff --git a/src/papiez_ipsum/static/admin/img/gis/move_vertex_off.png b/src/papiezator/static/admin/img/gis/move_vertex_off.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/gis/move_vertex_off.png rename to src/papiezator/static/admin/img/gis/move_vertex_off.png diff --git a/src/papiez_ipsum/static/admin/img/gis/move_vertex_on.png b/src/papiezator/static/admin/img/gis/move_vertex_on.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/gis/move_vertex_on.png rename to src/papiezator/static/admin/img/gis/move_vertex_on.png diff --git a/src/papiez_ipsum/static/admin/img/icon-no.gif b/src/papiezator/static/admin/img/icon-no.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon-no.gif rename to src/papiezator/static/admin/img/icon-no.gif diff --git a/src/papiez_ipsum/static/admin/img/icon-unknown.gif b/src/papiezator/static/admin/img/icon-unknown.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon-unknown.gif rename to src/papiezator/static/admin/img/icon-unknown.gif diff --git a/src/papiez_ipsum/static/admin/img/icon-yes.gif b/src/papiezator/static/admin/img/icon-yes.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon-yes.gif rename to src/papiezator/static/admin/img/icon-yes.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_addlink.gif b/src/papiezator/static/admin/img/icon_addlink.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_addlink.gif rename to src/papiezator/static/admin/img/icon_addlink.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_alert.gif b/src/papiezator/static/admin/img/icon_alert.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_alert.gif rename to src/papiezator/static/admin/img/icon_alert.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_calendar.gif b/src/papiezator/static/admin/img/icon_calendar.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_calendar.gif rename to src/papiezator/static/admin/img/icon_calendar.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_changelink.gif b/src/papiezator/static/admin/img/icon_changelink.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_changelink.gif rename to src/papiezator/static/admin/img/icon_changelink.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_clock.gif b/src/papiezator/static/admin/img/icon_clock.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_clock.gif rename to src/papiezator/static/admin/img/icon_clock.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_deletelink.gif b/src/papiezator/static/admin/img/icon_deletelink.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_deletelink.gif rename to src/papiezator/static/admin/img/icon_deletelink.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_error.gif b/src/papiezator/static/admin/img/icon_error.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_error.gif rename to src/papiezator/static/admin/img/icon_error.gif diff --git a/src/papiez_ipsum/static/admin/img/icon_searchbox.png b/src/papiezator/static/admin/img/icon_searchbox.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_searchbox.png rename to src/papiezator/static/admin/img/icon_searchbox.png diff --git a/src/papiez_ipsum/static/admin/img/icon_success.gif b/src/papiezator/static/admin/img/icon_success.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/icon_success.gif rename to src/papiezator/static/admin/img/icon_success.gif diff --git a/src/papiez_ipsum/static/admin/img/inline-delete-8bit.png b/src/papiezator/static/admin/img/inline-delete-8bit.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/inline-delete-8bit.png rename to src/papiezator/static/admin/img/inline-delete-8bit.png diff --git a/src/papiez_ipsum/static/admin/img/inline-delete.png b/src/papiezator/static/admin/img/inline-delete.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/inline-delete.png rename to src/papiezator/static/admin/img/inline-delete.png diff --git a/src/papiez_ipsum/static/admin/img/inline-restore-8bit.png b/src/papiezator/static/admin/img/inline-restore-8bit.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/inline-restore-8bit.png rename to src/papiezator/static/admin/img/inline-restore-8bit.png diff --git a/src/papiez_ipsum/static/admin/img/inline-restore.png b/src/papiezator/static/admin/img/inline-restore.png similarity index 100% rename from src/papiez_ipsum/static/admin/img/inline-restore.png rename to src/papiezator/static/admin/img/inline-restore.png diff --git a/src/papiez_ipsum/static/admin/img/inline-splitter-bg.gif b/src/papiezator/static/admin/img/inline-splitter-bg.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/inline-splitter-bg.gif rename to src/papiezator/static/admin/img/inline-splitter-bg.gif diff --git a/src/papiez_ipsum/static/admin/img/nav-bg-grabber.gif b/src/papiezator/static/admin/img/nav-bg-grabber.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/nav-bg-grabber.gif rename to src/papiezator/static/admin/img/nav-bg-grabber.gif diff --git a/src/papiez_ipsum/static/admin/img/nav-bg-reverse.gif b/src/papiezator/static/admin/img/nav-bg-reverse.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/nav-bg-reverse.gif rename to src/papiezator/static/admin/img/nav-bg-reverse.gif diff --git a/src/papiez_ipsum/static/admin/img/nav-bg-selected.gif b/src/papiezator/static/admin/img/nav-bg-selected.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/nav-bg-selected.gif rename to src/papiezator/static/admin/img/nav-bg-selected.gif diff --git a/src/papiez_ipsum/static/admin/img/nav-bg.gif b/src/papiezator/static/admin/img/nav-bg.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/nav-bg.gif rename to src/papiezator/static/admin/img/nav-bg.gif diff --git a/src/papiez_ipsum/static/admin/img/selector-icons.gif b/src/papiezator/static/admin/img/selector-icons.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/selector-icons.gif rename to src/papiezator/static/admin/img/selector-icons.gif diff --git a/src/papiez_ipsum/static/admin/img/selector-search.gif b/src/papiezator/static/admin/img/selector-search.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/selector-search.gif rename to src/papiezator/static/admin/img/selector-search.gif diff --git a/src/papiez_ipsum/static/admin/img/sorting-icons.gif b/src/papiezator/static/admin/img/sorting-icons.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/sorting-icons.gif rename to src/papiezator/static/admin/img/sorting-icons.gif diff --git a/src/papiez_ipsum/static/admin/img/tool-left.gif b/src/papiezator/static/admin/img/tool-left.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tool-left.gif rename to src/papiezator/static/admin/img/tool-left.gif diff --git a/src/papiez_ipsum/static/admin/img/tool-left_over.gif b/src/papiezator/static/admin/img/tool-left_over.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tool-left_over.gif rename to src/papiezator/static/admin/img/tool-left_over.gif diff --git a/src/papiez_ipsum/static/admin/img/tool-right.gif b/src/papiezator/static/admin/img/tool-right.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tool-right.gif rename to src/papiezator/static/admin/img/tool-right.gif diff --git a/src/papiez_ipsum/static/admin/img/tool-right_over.gif b/src/papiezator/static/admin/img/tool-right_over.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tool-right_over.gif rename to src/papiezator/static/admin/img/tool-right_over.gif diff --git a/src/papiez_ipsum/static/admin/img/tooltag-add.gif b/src/papiezator/static/admin/img/tooltag-add.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tooltag-add.gif rename to src/papiezator/static/admin/img/tooltag-add.gif diff --git a/src/papiez_ipsum/static/admin/img/tooltag-add_over.gif b/src/papiezator/static/admin/img/tooltag-add_over.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tooltag-add_over.gif rename to src/papiezator/static/admin/img/tooltag-add_over.gif diff --git a/src/papiez_ipsum/static/admin/img/tooltag-arrowright.gif b/src/papiezator/static/admin/img/tooltag-arrowright.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tooltag-arrowright.gif rename to src/papiezator/static/admin/img/tooltag-arrowright.gif diff --git a/src/papiez_ipsum/static/admin/img/tooltag-arrowright_over.gif b/src/papiezator/static/admin/img/tooltag-arrowright_over.gif similarity index 100% rename from src/papiez_ipsum/static/admin/img/tooltag-arrowright_over.gif rename to src/papiezator/static/admin/img/tooltag-arrowright_over.gif diff --git a/src/papiez_ipsum/static/admin/js/LICENSE-JQUERY.txt b/src/papiezator/static/admin/js/LICENSE-JQUERY.txt similarity index 100% rename from src/papiez_ipsum/static/admin/js/LICENSE-JQUERY.txt rename to src/papiezator/static/admin/js/LICENSE-JQUERY.txt diff --git a/src/papiez_ipsum/static/admin/js/SelectBox.js b/src/papiezator/static/admin/js/SelectBox.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/SelectBox.js rename to src/papiezator/static/admin/js/SelectBox.js diff --git a/src/papiez_ipsum/static/admin/js/SelectFilter2.js b/src/papiezator/static/admin/js/SelectFilter2.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/SelectFilter2.js rename to src/papiezator/static/admin/js/SelectFilter2.js diff --git a/src/papiez_ipsum/static/admin/js/actions.js b/src/papiezator/static/admin/js/actions.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/actions.js rename to src/papiezator/static/admin/js/actions.js diff --git a/src/papiez_ipsum/static/admin/js/actions.min.js b/src/papiezator/static/admin/js/actions.min.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/actions.min.js rename to src/papiezator/static/admin/js/actions.min.js diff --git a/src/papiez_ipsum/static/admin/js/admin/DateTimeShortcuts.js b/src/papiezator/static/admin/js/admin/DateTimeShortcuts.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/admin/DateTimeShortcuts.js rename to src/papiezator/static/admin/js/admin/DateTimeShortcuts.js diff --git a/src/papiez_ipsum/static/admin/js/admin/RelatedObjectLookups.js b/src/papiezator/static/admin/js/admin/RelatedObjectLookups.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/admin/RelatedObjectLookups.js rename to src/papiezator/static/admin/js/admin/RelatedObjectLookups.js diff --git a/src/papiez_ipsum/static/admin/js/calendar.js b/src/papiezator/static/admin/js/calendar.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/calendar.js rename to src/papiezator/static/admin/js/calendar.js diff --git a/src/papiez_ipsum/static/admin/js/collapse.js b/src/papiezator/static/admin/js/collapse.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/collapse.js rename to src/papiezator/static/admin/js/collapse.js diff --git a/src/papiez_ipsum/static/admin/js/collapse.min.js b/src/papiezator/static/admin/js/collapse.min.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/collapse.min.js rename to src/papiezator/static/admin/js/collapse.min.js diff --git a/src/papiez_ipsum/static/admin/js/core.js b/src/papiezator/static/admin/js/core.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/core.js rename to src/papiezator/static/admin/js/core.js diff --git a/src/papiez_ipsum/static/admin/js/inlines.js b/src/papiezator/static/admin/js/inlines.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/inlines.js rename to src/papiezator/static/admin/js/inlines.js diff --git a/src/papiez_ipsum/static/admin/js/inlines.min.js b/src/papiezator/static/admin/js/inlines.min.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/inlines.min.js rename to src/papiezator/static/admin/js/inlines.min.js diff --git a/src/papiez_ipsum/static/admin/js/jquery.init.js b/src/papiezator/static/admin/js/jquery.init.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/jquery.init.js rename to src/papiezator/static/admin/js/jquery.init.js diff --git a/src/papiez_ipsum/static/admin/js/jquery.js b/src/papiezator/static/admin/js/jquery.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/jquery.js rename to src/papiezator/static/admin/js/jquery.js diff --git a/src/papiez_ipsum/static/admin/js/jquery.min.js b/src/papiezator/static/admin/js/jquery.min.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/jquery.min.js rename to src/papiezator/static/admin/js/jquery.min.js diff --git a/src/papiez_ipsum/static/admin/js/prepopulate.js b/src/papiezator/static/admin/js/prepopulate.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/prepopulate.js rename to src/papiezator/static/admin/js/prepopulate.js diff --git a/src/papiez_ipsum/static/admin/js/prepopulate.min.js b/src/papiezator/static/admin/js/prepopulate.min.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/prepopulate.min.js rename to src/papiezator/static/admin/js/prepopulate.min.js diff --git a/src/papiez_ipsum/static/admin/js/timeparse.js b/src/papiezator/static/admin/js/timeparse.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/timeparse.js rename to src/papiezator/static/admin/js/timeparse.js diff --git a/src/papiez_ipsum/static/admin/js/urlify.js b/src/papiezator/static/admin/js/urlify.js similarity index 100% rename from src/papiez_ipsum/static/admin/js/urlify.js rename to src/papiezator/static/admin/js/urlify.js diff --git a/src/papiez_ipsum/static/css/bootstrap-responsive.css b/src/papiezator/static/css/bootstrap-responsive.css similarity index 100% rename from src/papiez_ipsum/static/css/bootstrap-responsive.css rename to src/papiezator/static/css/bootstrap-responsive.css diff --git a/src/papiez_ipsum/static/css/bootstrap-responsive.min.css b/src/papiezator/static/css/bootstrap-responsive.min.css similarity index 100% rename from src/papiez_ipsum/static/css/bootstrap-responsive.min.css rename to src/papiezator/static/css/bootstrap-responsive.min.css diff --git a/src/papiez_ipsum/static/css/bootstrap.css b/src/papiezator/static/css/bootstrap.css similarity index 100% rename from src/papiez_ipsum/static/css/bootstrap.css rename to src/papiezator/static/css/bootstrap.css diff --git a/src/papiez_ipsum/static/css/bootstrap.min.css b/src/papiezator/static/css/bootstrap.min.css similarity index 100% rename from src/papiez_ipsum/static/css/bootstrap.min.css rename to src/papiezator/static/css/bootstrap.min.css diff --git a/src/papiezator/static/foo b/src/papiezator/static/foo new file mode 100644 index 0000000..e69de29 diff --git a/src/papiezator/static/img/forkme.png b/src/papiezator/static/img/forkme.png new file mode 100644 index 0000000..dd01df1 Binary files /dev/null and b/src/papiezator/static/img/forkme.png differ diff --git a/src/papiez_ipsum/static/img/glyphicons-halflings-white.png b/src/papiezator/static/img/glyphicons-halflings-white.png similarity index 100% rename from src/papiez_ipsum/static/img/glyphicons-halflings-white.png rename to src/papiezator/static/img/glyphicons-halflings-white.png diff --git a/src/papiez_ipsum/static/img/glyphicons-halflings.png b/src/papiezator/static/img/glyphicons-halflings.png similarity index 100% rename from src/papiez_ipsum/static/img/glyphicons-halflings.png rename to src/papiezator/static/img/glyphicons-halflings.png diff --git a/src/papiez_ipsum/static/js/bootstrap.js b/src/papiezator/static/js/bootstrap.js similarity index 100% rename from src/papiez_ipsum/static/js/bootstrap.js rename to src/papiezator/static/js/bootstrap.js diff --git a/src/papiez_ipsum/static/js/bootstrap.min.js b/src/papiezator/static/js/bootstrap.min.js similarity index 100% rename from src/papiez_ipsum/static/js/bootstrap.min.js rename to src/papiezator/static/js/bootstrap.min.js diff --git a/src/papiez_ipsum/static/js/jquery.js b/src/papiezator/static/js/jquery.js similarity index 100% rename from src/papiez_ipsum/static/js/jquery.js rename to src/papiezator/static/js/jquery.js diff --git a/src/papiezator/templates/papiezator/index.html b/src/papiezator/templates/papiezator/index.html index bc11d7f..27b5d35 100644 --- a/src/papiezator/templates/papiezator/index.html +++ b/src/papiezator/templates/papiezator/index.html @@ -1,5 +1,6 @@ +{% load staticfiles %} @@ -26,6 +27,8 @@ + Fork me on GitHub +