From a7d571a509aeecc22c1390c6201bb8780bd368c8 Mon Sep 17 00:00:00 2001 From: Isaac Bythewood Date: Sat, 23 Feb 2013 02:23:58 +0000 Subject: [PATCH] Remove a bunch of old vender files, refactor locations of static and template files, force api limit on calls --- pinry/core/context_processors.py | 3 +- pinry/core/static/core/img/background.png | Bin 13497 -> 0 bytes pinry/settings/__init__.py | 33 +- .../static/core => static}/css/pinry.css | 0 .../static/core => static}/img/loader.gif | Bin .../static/core => static}/js/messages.js | 0 .../{core/static/core => static}/js/pinry.js | 2 +- pinry/{core => }/templates/404.html | 0 pinry/{core => }/templates/500.html | 0 pinry/{core => }/templates/core/base.html | 32 +- pinry/{core => }/templates/core/login.html | 0 pinry/{core => }/templates/core/private.html | 0 pinry/{core => }/templates/core/register.html | 0 .../core/templatetags/bootstrap_field.html | 0 pinry/{pins => }/templates/pins/new_pin.html | 0 .../templates/pins/recent_pins.html | 2 +- .../templates/pins/templatetags/new_pin.html | 0 pinry/vendor/__init__.py | 0 .../2.0.3/css/bootstrap-responsive.css | 808 --- .../2.0.3/css/bootstrap-responsive.min.css | 9 - .../vendor/bootstrap/2.0.3/css/bootstrap.css | 4960 ----------------- .../bootstrap/2.0.3/css/bootstrap.min.css | 9 - .../2.0.3/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../2.0.3/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes .../vendor/bootstrap/2.0.3/js/bootstrap.js | 1824 ------ .../bootstrap/2.0.3/js/bootstrap.min.js | 6 - .../static/vendor/fancybox/2.0.6/blank.gif | Bin 43 -> 0 bytes .../fancybox/2.0.6/fancybox_loading.gif | Bin 3866 -> 0 bytes .../vendor/fancybox/2.0.6/fancybox_sprite.png | Bin 2277 -> 0 bytes .../2.0.6/helpers/fancybox_buttons.png | Bin 2396 -> 0 bytes .../2.0.6/helpers/jquery.fancybox-buttons.css | 85 - .../2.0.6/helpers/jquery.fancybox-buttons.js | 115 - .../2.0.6/helpers/jquery.fancybox-media.js | 85 - .../2.0.6/helpers/jquery.fancybox-thumbs.css | 54 - .../2.0.6/helpers/jquery.fancybox-thumbs.js | 157 - .../vendor/fancybox/2.0.6/jquery.fancybox.css | 234 - .../vendor/fancybox/2.0.6/jquery.fancybox.js | 1463 ----- .../fancybox/2.0.6/jquery.fancybox.pack.js | 35 - .../vendor/handlebars/1.0.0/handlebars.js | 2201 -------- 39 files changed, 38 insertions(+), 12079 deletions(-) delete mode 100644 pinry/core/static/core/img/background.png rename pinry/{core/static/core => static}/css/pinry.css (100%) rename pinry/{core/static/core => static}/img/loader.gif (100%) rename pinry/{core/static/core => static}/js/messages.js (100%) rename pinry/{core/static/core => static}/js/pinry.js (98%) rename pinry/{core => }/templates/404.html (100%) rename pinry/{core => }/templates/500.html (100%) rename pinry/{core => }/templates/core/base.html (62%) rename pinry/{core => }/templates/core/login.html (100%) rename pinry/{core => }/templates/core/private.html (100%) rename pinry/{core => }/templates/core/register.html (100%) rename pinry/{core => }/templates/core/templatetags/bootstrap_field.html (100%) rename pinry/{pins => }/templates/pins/new_pin.html (100%) rename pinry/{pins => }/templates/pins/recent_pins.html (95%) rename pinry/{pins => }/templates/pins/templatetags/new_pin.html (100%) delete mode 100644 pinry/vendor/__init__.py delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/css/bootstrap-responsive.css delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/css/bootstrap-responsive.min.css delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/css/bootstrap.css delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/css/bootstrap.min.css delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/js/bootstrap.js delete mode 100644 pinry/vendor/static/vendor/bootstrap/2.0.3/js/bootstrap.min.js delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/blank.gif delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/fancybox_loading.gif delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/fancybox_sprite.png delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/helpers/fancybox_buttons.png delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/helpers/jquery.fancybox-buttons.css delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/helpers/jquery.fancybox-buttons.js delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/helpers/jquery.fancybox-media.js delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/helpers/jquery.fancybox-thumbs.css delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/helpers/jquery.fancybox-thumbs.js delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/jquery.fancybox.css delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/jquery.fancybox.js delete mode 100644 pinry/vendor/static/vendor/fancybox/2.0.6/jquery.fancybox.pack.js delete mode 100644 pinry/vendor/static/vendor/handlebars/1.0.0/handlebars.js diff --git a/pinry/core/context_processors.py b/pinry/core/context_processors.py index e48b060..ab3726e 100644 --- a/pinry/core/context_processors.py +++ b/pinry/core/context_processors.py @@ -3,6 +3,7 @@ from django.conf import settings def template_settings(request): return { - 'site_name': settings.SITE_NAME, + 'SITE_NAME': settings.SITE_NAME, + 'API_LIMIT_PER_PAGE': settings.API_LIMIT_PER_PAGE, } diff --git a/pinry/core/static/core/img/background.png b/pinry/core/static/core/img/background.png deleted file mode 100644 index b10ad70fa99ba9726c4078583fa13e944959ad77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13497 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 diff --git a/pinry/settings/__init__.py b/pinry/settings/__init__.py index d6fac46..82bc9a7 100644 --- a/pinry/settings/__init__.py +++ b/pinry/settings/__init__.py @@ -21,10 +21,14 @@ USE_I18N = True USE_L10N = True USE_TZ = True -MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/') + MEDIA_URL = '/media/' -STATIC_ROOT = os.path.join(SITE_ROOT, 'static/') STATIC_URL = '/static/' +MEDIA_ROOT = os.path.join(SITE_ROOT, 'media') +STATIC_ROOT = os.path.join(SITE_ROOT, 'static') +TEMPLATE_DIRS = [os.path.join(SITE_ROOT, 'pinry/templates')] +STATICFILES_DIRS = [os.path.join(SITE_ROOT, 'pinry/static')] + STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', @@ -43,15 +47,20 @@ MIDDLEWARE_CLASSES = ( 'pinry.core.middleware.Public', ) TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.core.context_processors.request", - "django.contrib.messages.context_processors.messages", - "pinry.core.context_processors.template_settings", + 'django.contrib.auth.context_processors.auth', + 'django.core.context_processors.debug', + 'django.core.context_processors.i18n', + 'django.core.context_processors.media', + 'django.core.context_processors.static', + 'django.core.context_processors.request', + 'django.contrib.messages.context_processors.messages', + 'pinry.core.context_processors.template_settings', ) +AUTHENTICATION_BACKENDS = ( + 'pinry.core.auth.backends.CombinedAuthBackend', + 'django.contrib.auth.backends.ModelBackend', +) + COMPRESS_CSS_FILTERS = ['compressor.filters.cssmin.CSSMinFilter'] ROOT_URLCONF = 'pinry.urls' @@ -65,6 +74,7 @@ MESSAGE_TAGS = { } API_LIMIT_PER_PAGE = 30 + INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', @@ -74,10 +84,7 @@ INSTALLED_APPS = ( 'south', 'compressor', 'taggit', - 'pinry.vendor', 'pinry.core', 'pinry.pins', 'pinry.api', ) - -AUTHENTICATION_BACKENDS = ('pinry.core.auth.backends.CombinedAuthBackend', 'django.contrib.auth.backends.ModelBackend',) \ No newline at end of file diff --git a/pinry/core/static/core/css/pinry.css b/pinry/static/css/pinry.css similarity index 100% rename from pinry/core/static/core/css/pinry.css rename to pinry/static/css/pinry.css diff --git a/pinry/core/static/core/img/loader.gif b/pinry/static/img/loader.gif similarity index 100% rename from pinry/core/static/core/img/loader.gif rename to pinry/static/img/loader.gif diff --git a/pinry/core/static/core/js/messages.js b/pinry/static/js/messages.js similarity index 100% rename from pinry/core/static/core/js/messages.js rename to pinry/static/js/messages.js diff --git a/pinry/core/static/core/js/pinry.js b/pinry/static/js/pinry.js similarity index 98% rename from pinry/core/static/core/js/pinry.js rename to pinry/static/js/pinry.js index 8244db6..67c0a32 100644 --- a/pinry/core/static/core/js/pinry.js +++ b/pinry/static/js/pinry.js @@ -87,7 +87,7 @@ $(window).load(function() { }); // Up our offset, it's currently defined as 30 in our settings - offset += 30; + offset += apiLimitPerPage; }); } diff --git a/pinry/core/templates/404.html b/pinry/templates/404.html similarity index 100% rename from pinry/core/templates/404.html rename to pinry/templates/404.html diff --git a/pinry/core/templates/500.html b/pinry/templates/500.html similarity index 100% rename from pinry/core/templates/500.html rename to pinry/templates/500.html diff --git a/pinry/core/templates/core/base.html b/pinry/templates/core/base.html similarity index 62% rename from pinry/core/templates/core/base.html rename to pinry/templates/core/base.html index 4d7e14b..d900381 100644 --- a/pinry/core/templates/core/base.html +++ b/pinry/templates/core/base.html @@ -1,25 +1,21 @@ {% spaceless %} -{% load new_pin %} -{% load compress %} +{% load compress new_pin %} - {{ site_name }} - {% block title %}{% endblock %} + {{ SITE_NAME }} - {% block title %}{% endblock %} + {% compress css %} - - - - + {% endcompress %} -