From 795a90559695596628a0a7833ba24dc92f249bf4 Mon Sep 17 00:00:00 2001 From: Isaac Bythewood Date: Tue, 24 Sep 2013 19:24:12 +0000 Subject: [PATCH] Added Original URL and Pin URL to lightbox of items. --- pinry/core/urls.py | 2 ++ pinry/static/css/lightbox.css | 4 ++++ pinry/static/css/pinry.css | 2 +- pinry/static/js/lightbox.js | 10 ++++++++++ pinry/templates/base.html | 1 + pinry/templates/includes/lightbox.html | 4 ++++ 6 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pinry/core/urls.py b/pinry/core/urls.py index 338c139..1cc9f7a 100644 --- a/pinry/core/urls.py +++ b/pinry/core/urls.py @@ -30,6 +30,8 @@ urlpatterns = patterns('', name='tag-pins'), url(r'^pins/user/(?P(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'), name='user-pins'), + url(r'^(?P\d+)/$', TemplateView.as_view(template_name='core/pins.html'), + name='recent-pins'), url(r'^$', TemplateView.as_view(template_name='core/pins.html'), name='recent-pins'), ) diff --git a/pinry/static/css/lightbox.css b/pinry/static/css/lightbox.css index 2249998..1075ab5 100644 --- a/pinry/static/css/lightbox.css +++ b/pinry/static/css/lightbox.css @@ -56,3 +56,7 @@ color: #999; font-size: 14px; } + +.lightbox-data .extra { + padding: 8px 6px; +} diff --git a/pinry/static/css/pinry.css b/pinry/static/css/pinry.css index 6527a66..ba2177e 100644 --- a/pinry/static/css/pinry.css +++ b/pinry/static/css/pinry.css @@ -190,7 +190,7 @@ textarea { border-top-right-radius: 3px; cursor: -webkit-zoom-in; cursor: -moz-zoom-in; - display: none; + display: block; margin: 0; padding: 0; width: 240px; diff --git a/pinry/static/js/lightbox.js b/pinry/static/js/lightbox.js index 2d8f849..d52a3d0 100644 --- a/pinry/static/js/lightbox.js +++ b/pinry/static/js/lightbox.js @@ -77,6 +77,15 @@ $(window).load(function() { // Start Global Init Function window.lightbox = function() { var links = $('body').find('.lightbox'); + if (pinFilter) { + var promise = getPinData(pinFilter); + promise.success(function(pin) { + createBox(pin); + }); + promise.error(function() { + message('Problem problem fetching pin data.', 'alert alert-error'); + }); + } return links.each(function() { $(this).off('click'); $(this).click(function(e) { @@ -91,5 +100,6 @@ $(window).load(function() { }); }); } + // End Global Init Function }); diff --git a/pinry/templates/base.html b/pinry/templates/base.html index 945534a..f8ea218 100644 --- a/pinry/templates/base.html +++ b/pinry/templates/base.html @@ -55,6 +55,7 @@ username: "{{ user.username }}", gravatar: "{{ user.gravatar }}" }, + pinFilter = "{{ request.resolver_match.kwargs.pin }}", tagFilter = "{{ request.resolver_match.kwargs.tag }}", userFilter = "{{ request.resolver_match.kwargs.user }}"; diff --git a/pinry/templates/includes/lightbox.html b/pinry/templates/includes/lightbox.html index a73d14a..821b0e3 100644 --- a/pinry/templates/includes/lightbox.html +++ b/pinry/templates/includes/lightbox.html @@ -23,6 +23,10 @@ {{/each}} {{/if}} +