From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Fri, 8 Jul 2011 22:13:18 +0000 (-0400)
Subject: Merge branch 'embed-widget' of git://github.com/lapilofu/philo into develop
X-Git-Tag: philo-0.9.1^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/6dc154ec98d58159b3e75447ce7b7fe5642acec4?hp=6dc154ec98d58159b3e75447ce7b7fe5642acec4

Merge branch 'embed-widget' of git://github.com/lapilofu/philo into develop

* 'embed-widget' of git://github.com/lapilofu/philo:
  Updated the grappelli styles to override the default styles.
  Updated styles to work in the original admin. Updated the javascript to overload the dismissAddAnotherPopup function as well.
  Made the embed widget javascript work by overloading the dismissRelatedLookupPopup function.
  Made the embed widget automatically generate URLs based on the ADMIN_URL global, which is provided by Grappelli. Unfortunately, this introduces a dependency on Grappelli. I'll return to this branch at a later date when my thinking is clearer.
  Initial work on a widget for TemplateFields that allows javascript selection of an object to embed.
---