Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 15 commits
  • 213 files changed
  • 0 commit comments
  • 5 contributors
Showing with 96 additions and 13 deletions.
  1. +1 −0 ella/core/conf.py
  2. +27 −9 ella/core/feeds.py
  3. +1 −1 ella/newman/conf.py
  4. +1 −0 ella/newman/media
  5. +2 −1 ella/newman/options.py
  6. 0 ella/newman/{media → static}/css/base.css
  7. 0 ella/newman/{media → static}/css/dashboard.css
  8. 0 ella/newman/{media → static}/css/datetime.css
  9. 0 ella/newman/{media → static}/css/editor-preview.css
  10. 0 ella/newman/{media → static}/css/editor.css
  11. 0 ella/newman/{media → static}/css/frontend-tools.css
  12. 0 ella/newman/{media → static}/css/generic.suggest.css
  13. 0 ella/newman/{media → static}/css/related_lookup.css
  14. 0 ella/newman/{media → static}/css/top-navi.css
  15. 0 ella/newman/{media → static}/ico/10/icon-no.gif
  16. 0 ella/newman/{media → static}/ico/10/icon-yes.gif
  17. 0 ella/newman/{media → static}/ico/10/icon_addlink.gif
  18. 0 ella/newman/{media → static}/ico/10/icon_changelink.gif
  19. 0 ella/newman/{media → static}/ico/10/icon_deletelink.gif
  20. 0 ella/newman/{media → static}/ico/15/loading.gif
  21. 0 ella/newman/{media → static}/ico/16/14_layer_lowerlayer.png
  22. 0 ella/newman/{media → static}/ico/16/14_layer_novisible.png
  23. 0 ella/newman/{media → static}/ico/16/14_layer_raiselayer.png
  24. 0 ella/newman/{media → static}/ico/16/14_layer_visible.png
  25. 0 ella/newman/{media → static}/ico/16/1day.png
  26. 0 ella/newman/{media → static}/ico/16/7days.png
  27. 0 ella/newman/{media → static}/ico/16/bookmark_add.png
  28. 0 ella/newman/{media → static}/ico/16/cal.png
  29. 0 ella/newman/{media → static}/ico/16/cancel.png
  30. 0 ella/newman/{media → static}/ico/16/configure.png
  31. 0 ella/newman/{media → static}/ico/16/contexthelp.png
  32. 0 ella/newman/{media → static}/ico/16/edit.png
  33. 0 ella/newman/{media → static}/ico/16/edit_add.png
  34. 0 ella/newman/{media → static}/ico/16/edit_remove.png
  35. 0 ella/newman/{media → static}/ico/16/editclear.png
  36. 0 ella/newman/{media → static}/ico/16/editcopy.png
  37. 0 ella/newman/{media → static}/ico/16/editdelete.png
  38. 0 ella/newman/{media → static}/ico/16/edittrash.png
  39. 0 ella/newman/{media → static}/ico/16/filesave.png
  40. 0 ella/newman/{media → static}/ico/16/filesaveas.png
  41. 0 ella/newman/{media → static}/ico/16/filter.png
  42. 0 ella/newman/{media → static}/ico/16/gohome.png
  43. 0 ella/newman/{media → static}/ico/16/help.png
  44. 0 ella/newman/{media → static}/ico/16/history.png
  45. 0 ella/newman/{media → static}/ico/16/idea.png
  46. 0 ella/newman/{media → static}/ico/16/info.png
  47. 0 ella/newman/{media → static}/ico/16/logout.png
  48. 0 ella/newman/{media → static}/ico/16/messagebox_warning.png
  49. 0 ella/newman/{media → static}/ico/16/na.png
  50. 0 ella/newman/{media → static}/ico/16/ok.png
  51. 0 ella/newman/{media → static}/ico/16/recur.png
  52. 0 ella/newman/{media → static}/ico/16/save_all.png
  53. 0 ella/newman/{media → static}/ico/16/search.png
  54. 0 ella/newman/{media → static}/ico/16/vcalendar.png
  55. 0 ella/newman/{media → static}/ico/16/web.png
  56. 0 ella/newman/{media → static}/ico/64/application-exit.png
  57. 0 ella/newman/{media → static}/ico/64/kfm_home.png
  58. 0 ella/newman/{media → static}/ico/ct/16/article.png
  59. 0 ella/newman/{media → static}/ico/ct/16/contest.png
  60. 0 ella/newman/{media → static}/ico/ct/16/gallery.png
  61. 0 ella/newman/{media → static}/ico/ct/16/interview.png
  62. 0 ella/newman/{media → static}/ico/ct/16/photo.png
  63. 0 ella/newman/{media → static}/ico/ct/16/quiz.png
  64. 0 ella/newman/{media → static}/ico/ct/16/video.png
  65. 0 ella/newman/{media → static}/ico/ct/64/article.png
  66. 0 ella/newman/{media → static}/ico/ct/64/author.png
  67. 0 ella/newman/{media → static}/ico/ct/64/category.png
  68. 0 ella/newman/{media → static}/ico/ct/64/contest.png
  69. 0 ella/newman/{media → static}/ico/ct/64/dbtemplate.png
  70. 0 ella/newman/{media → static}/ico/ct/64/gallery.png
  71. 0 ella/newman/{media → static}/ico/ct/64/interview.png
  72. 0 ella/newman/{media → static}/ico/ct/64/photo.png
  73. 0 ella/newman/{media → static}/ico/ct/64/placement.png
  74. 0 ella/newman/{media → static}/ico/ct/64/poll.png
  75. 0 ella/newman/{media → static}/ico/ct/64/position.png
  76. 0 ella/newman/{media → static}/ico/ct/64/publishable.png
  77. 0 ella/newman/{media → static}/ico/ct/64/quiz.png
  78. 0 ella/newman/{media → static}/ico/ct/64/recipe.png
  79. 0 ella/newman/{media → static}/ico/ct/64/serie.png
  80. 0 ella/newman/{media → static}/ico/ct/64/survey.png
  81. 0 ella/newman/{media → static}/ico/ct/64/unknown.png
  82. 0 ella/newman/{media → static}/ico/ct/64/video.png
  83. 0 ella/newman/{media → static}/ico/favicon.ico
  84. 0 ella/newman/{media → static}/ico/favs/article.png
  85. 0 ella/newman/{media → static}/ico/favs/gear.png
  86. 0 ella/newman/{media → static}/img/bg-favs.png
  87. 0 ella/newman/{media → static}/img/horst1.jpg
  88. 0 ella/newman/{media → static}/img/nav-bg-reverse.gif
  89. 0 ella/newman/{media → static}/img/nav-bg.gif
  90. 0 ella/newman/{media → static}/img/newman.jpg
  91. 0 ella/newman/{media → static}/img/triangle-left.png
  92. 0 ella/newman/{media → static}/jquery/images/alerts/help.gif
  93. 0 ella/newman/{media → static}/jquery/images/alerts/important.gif
  94. 0 ella/newman/{media → static}/jquery/images/alerts/info.gif
  95. 0 ella/newman/{media → static}/jquery/images/alerts/title.gif
  96. 0 ella/newman/{media → static}/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
  97. 0 ella/newman/{media → static}/jquery/images/ui-bg_flat_75_ffffff_40x100.png
  98. 0 ella/newman/{media → static}/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
  99. 0 ella/newman/{media → static}/jquery/images/ui-bg_glass_65_ffffff_1x400.png
  100. 0 ella/newman/{media → static}/jquery/images/ui-bg_glass_75_dadada_1x400.png
  101. 0 ella/newman/{media → static}/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
  102. 0 ella/newman/{media → static}/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
  103. 0 ella/newman/{media → static}/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  104. 0 ella/newman/{media → static}/jquery/images/ui-icons_222222_256x240.png
  105. 0 ella/newman/{media → static}/jquery/images/ui-icons_2e83ff_256x240.png
  106. 0 ella/newman/{media → static}/jquery/images/ui-icons_454545_256x240.png
  107. 0 ella/newman/{media → static}/jquery/images/ui-icons_888888_256x240.png
  108. 0 ella/newman/{media → static}/jquery/images/ui-icons_cd0a0a_256x240.png
  109. 0 ella/newman/{media → static}/jquery/jquery-1.3.2.js
  110. 0 ella/newman/{media → static}/jquery/jquery-1.4.2.js
  111. 0 ella/newman/{media → static}/jquery/jquery-1.4.3.js
  112. 0 ella/newman/{media → static}/jquery/jquery-fieldselection.js
  113. 0 ella/newman/{media → static}/jquery/jquery-mousewheel.js
  114. 0 ella/newman/{media → static}/jquery/jquery-ui-smoothness.css
  115. 0 ella/newman/{media → static}/jquery/jquery-ui.js
  116. 0 ella/newman/{media → static}/jquery/jquery-urldecode-encode.js
  117. 0 ella/newman/{media → static}/jquery/jquery.alerts.css
  118. 0 ella/newman/{media → static}/jquery/jquery.alerts.js
  119. 0 ella/newman/{media → static}/jquery/jquery.autogrow.js
  120. 0 ella/newman/{media → static}/jquery/thickbox/loadingAnimation.gif
  121. 0 ella/newman/{media → static}/jquery/thickbox/thickbox.css
  122. 0 ella/newman/{media → static}/jquery/thickbox/thickbox.js
  123. 0 ella/newman/{media → static}/js/base64.js
  124. 0 ella/newman/{media → static}/js/datetime.js
  125. 0 ella/newman/{media → static}/js/flash_image.js
  126. 0 ella/newman/{media → static}/js/fuckitup.js
  127. 0 ella/newman/{media → static}/js/fuckitup_install.js
  128. 0 ella/newman/{media → static}/js/generic.suggest.js
  129. 0 ella/newman/{media → static}/js/inheritance.js
  130. 0 ella/newman/{media → static}/js/inlines.js
  131. 0 ella/newman/{media → static}/js/json2-min.js
  132. 0 ella/newman/{media → static}/js/kobayashi.js
  133. 0 ella/newman/{media → static}/js/markitup/jquery.markitup.js
  134. 0 ella/newman/{media → static}/js/markitup/jquery.markitup.pack.js
  135. 0 ella/newman/{media → static}/js/markitup/readme.txt
  136. 0 ...an/{media/js/markitup/skins/markitup → static/js/markitup/sets/czechtile}/images/bg-container.png
  137. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/images/bg-editor-ctta.png
  138. 0 ...ewman/{media/js/markitup/skins/markitup → static/js/markitup/sets/czechtile}/images/bg-editor.png
  139. 0 ella/newman/{media/js/markitup/sets/markdown → static/js/markitup/sets/czechtile}/images/bold.png
  140. 0 ella/newman/{media/js/markitup/sets/markdown → static/js/markitup/sets/czechtile}/images/box.png
  141. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/images/enumlist.png
  142. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/images/h1.png
  143. 0 ella/newman/{media/js/markitup/skins/simple → static/js/markitup/sets/czechtile}/images/handle.png
  144. 0 ella/newman/{media/js/markitup/sets/markdown → static/js/markitup/sets/czechtile}/images/italic.png
  145. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/images/kuser.png
  146. 0 ella/newman/{media/js/markitup/sets/markdown → static/js/markitup/sets/czechtile}/images/link.png
  147. 0 ella/newman/{media/js/markitup/skins/simple → static/js/markitup/sets/czechtile}/images/menu.png
  148. 0 ella/newman/{media/js/markitup/sets/markdown → static/js/markitup/sets/czechtile}/images/picture.png
  149. 0 ella/newman/{media/js/markitup/sets/markdown → static/js/markitup/sets/czechtile}/images/preview.png
  150. 0 ella/newman/{media/js/markitup/skins/simple → static/js/markitup/sets/czechtile}/images/submenu.png
  151. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/images/unorderedlist.png
  152. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/set.js
  153. 0 ella/newman/{media → static}/js/markitup/sets/czechtile/style.css
  154. 0 ella/newman/{media → static}/js/markitup/sets/default/images/bold.png
  155. 0 ella/newman/{media → static}/js/markitup/sets/default/images/clean.png
  156. 0 ella/newman/{media → static}/js/markitup/sets/default/images/image.png
  157. 0 ella/newman/{media → static}/js/markitup/sets/default/images/italic.png
  158. 0 ella/newman/{media → static}/js/markitup/sets/default/images/link.png
  159. 0 ella/newman/{media → static}/js/markitup/sets/default/images/picture.png
  160. 0 ella/newman/{media → static}/js/markitup/sets/default/images/preview.png
  161. 0 ella/newman/{media → static}/js/markitup/sets/default/images/stroke.png
  162. 0 ella/newman/{media → static}/js/markitup/sets/default/set.js
  163. 0 ella/newman/{media → static}/js/markitup/sets/default/style.css
  164. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/sets/markdown}/images/bold.png
  165. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/sets/markdown}/images/box.png
  166. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/code.png
  167. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/h1.png
  168. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/h2.png
  169. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/h3.png
  170. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/h4.png
  171. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/h5.png
  172. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/h6.png
  173. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/sets/markdown}/images/italic.png
  174. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/sets/markdown}/images/link.png
  175. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/list-bullet.png
  176. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/list-numeric.png
  177. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/sets/markdown}/images/picture.png
  178. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/sets/markdown}/images/preview.png
  179. 0 ella/newman/{media → static}/js/markitup/sets/markdown/images/quotes.png
  180. 0 ella/newman/{media → static}/js/markitup/sets/markdown/readme.txt
  181. 0 ella/newman/{media → static}/js/markitup/sets/markdown/set.js
  182. 0 ella/newman/{media → static}/js/markitup/sets/markdown/style.css
  183. 0 ...an/{media/js/markitup/sets/czechtile → static/js/markitup/skins/markitup}/images/bg-container.png
  184. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-bbcode.png
  185. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-dotclear.png
  186. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-html.png
  187. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-json.png
  188. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-markdown.png
  189. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-textile.png
  190. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-wiki.png
  191. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/bg-editor-xml.png
  192. 0 ...ewman/{media/js/markitup/sets/czechtile → static/js/markitup/skins/markitup}/images/bg-editor.png
  193. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/handle.png
  194. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/menu.png
  195. 0 ella/newman/{media → static}/js/markitup/skins/markitup/images/submenu.png
  196. 0 ella/newman/{media → static}/js/markitup/skins/markitup/style.css
  197. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/skins/simple}/images/handle.png
  198. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/skins/simple}/images/menu.png
  199. 0 ella/newman/{media/js/markitup/sets/czechtile → static/js/markitup/skins/simple}/images/submenu.png
  200. 0 ella/newman/{media → static}/js/markitup/skins/simple/style.css
  201. 0 ella/newman/{media → static}/js/markitup/templates/preview.css
  202. 0 ella/newman/{media → static}/js/markitup/templates/preview.html
  203. 0 ella/newman/{media → static}/js/newman.js
  204. 0 ella/newman/{media → static}/js/polls.js
  205. 0 ella/newman/{media → static}/js/positions.js
  206. 0 ella/newman/{media → static}/js/related_lookup.js
  207. 0 ella/newman/{media → static}/js/utils.js
  208. 0 ella/newman/{media → static}/swf/PhotoUploader.swf
  209. 0 ella/newman/{media → static}/swf/lang/cs.xml
  210. 0 ella/newman/{media → static}/swf/lang/en.xml
  211. 0 ella/newman/{media → static}/swf/playerProductInstall.swf
  212. +1 −1 requirements.txt
  213. +63 −1 tests/unit_project/test_core/test_feeds.py
View
1 ella/core/conf.py
@@ -23,6 +23,7 @@
SERVER_INFO = {}
RSS_NUM_IN_FEED = 10
+RSS_ENCLOSURE_PHOTO_FORMAT = None
# middlewares
ECACHE_INFO = 'ella.core.middleware.ECACHE_INFO'
View
36 ella/core/feeds.py
@@ -1,5 +1,4 @@
from django.contrib.syndication.feeds import Feed
-from django.contrib.contenttypes.models import ContentType
from django.utils.feedgenerator import Atom1Feed
from django.utils.translation import ugettext_lazy as _
from django.http import Http404
@@ -9,7 +8,7 @@
from ella.core.views import get_content_type
from ella.core.cache.utils import get_cached_object, get_cached_object_or_404
from ella.core.conf import core_settings
-
+from ella.photos.models import Format
class RSSTopCategoryListings(Feed):
def get_object(self, bits):
@@ -78,20 +77,39 @@ def description(self, obj):
def item_pubdate(self, item):
return item.publish_from
+
+ def get_enclosure_image(self, item, enc_format=core_settings.RSS_ENCLOSURE_PHOTO_FORMAT):
+ if getattr(item.target, 'photo'):
+ if enc_format is not None:
+ try:
+ formated_photo = item.target.photo.get_formated_photo(enc_format)
+ if formated_photo is not None:
+ return formated_photo.image
+ except Format.DoesNotExist:
+ pass
+ return item.target.photo.image
+
+ def get_enclosure_image_attr(self, item, attr):
+ image = self.get_enclosure_image(item)
+ if image is not None:
+ return getattr(image, attr)
+ return None
def item_enclosure_url(self, item):
- if getattr(item.target, 'photo'):
- return item.target.photo.image.url
+ return self.get_enclosure_image_attr(item, 'url')
def item_enclosure_length(self, item):
- if getattr(item.target, 'photo'):
- return item.target.photo.image.size
+ try:
+ return self.get_enclosure_image_attr(item, 'size')
+ except OSError:
+ pass
def item_enclosure_mime_type(self, item):
- if getattr(item.target, 'photo'):
- if item.target.photo.image.name.endswith('.jpg'):
+ image = self.get_enclosure_image(item)
+ if image is not None:
+ if image.name.endswith('.jpg'):
return 'image/jpeg'
- elif item.target.photo.image.name.endswith('.png'):
+ elif image.name.endswith('.png'):
return 'image/png'
return 'image/gif'
View
2 ella/newman/conf.py
@@ -90,7 +90,7 @@
EDITOR_PREVIEW_TEMPLATE = None
# Widgets
-MEDIA_PREFIX = getattr(settings, 'MEDIA_URL') + 'newman_media/'
+MEDIA_PREFIX = getattr(settings, 'STATIC_URL')
# tagging
MAX_TAGS_INLINE = 3
View
1 ella/newman/media
View
3 ella/newman/options.py
@@ -6,6 +6,7 @@
from django.contrib.contenttypes.models import ContentType
from django.contrib.admin.options import InlineModelAdmin, IncorrectLookupParameters, FORMFIELD_FOR_DBFIELD_DEFAULTS
from django.contrib.admin.util import unquote
+from django.contrib import messages
from django.forms.models import BaseInlineFormSet
from django import template
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden
@@ -864,7 +865,7 @@ def add_json_view(self, request, form_url='', extra_context=None):
context.update(extra_context or {})
if 'object_added' in context:
obj = context['object']
- msg = request.user.message_set.all()[0].message
+ msg = unicode(list(messages.get_messages(request))[0])
if request.FILES and not request.is_ajax():
return_url = '%s#/%s/%s/' % (reverse('newman:index'), obj._meta.app_label, obj._meta.module_name)
View
0 ella/newman/media/css/base.css → ella/newman/static/css/base.css
File renamed without changes.
View
0 ella/newman/media/css/dashboard.css → ella/newman/static/css/dashboard.css
File renamed without changes.
View
0 ella/newman/media/css/datetime.css → ella/newman/static/css/datetime.css
File renamed without changes.
View
0 ella/newman/media/css/editor-preview.css → ella/newman/static/css/editor-preview.css
File renamed without changes.
View
0 ella/newman/media/css/editor.css → ella/newman/static/css/editor.css
File renamed without changes.
View
0 ella/newman/media/css/frontend-tools.css → ella/newman/static/css/frontend-tools.css
File renamed without changes.
View
0 ella/newman/media/css/generic.suggest.css → ella/newman/static/css/generic.suggest.css
File renamed without changes.
View
0 ella/newman/media/css/related_lookup.css → ella/newman/static/css/related_lookup.css
File renamed without changes.
View
0 ella/newman/media/css/top-navi.css → ella/newman/static/css/top-navi.css
File renamed without changes.
View
0 ella/newman/media/ico/10/icon-no.gif → ella/newman/static/ico/10/icon-no.gif
File renamed without changes
View
0 ella/newman/media/ico/10/icon-yes.gif → ella/newman/static/ico/10/icon-yes.gif
File renamed without changes
View
0 ella/newman/media/ico/10/icon_addlink.gif → ella/newman/static/ico/10/icon_addlink.gif
File renamed without changes
View
0 ella/newman/media/ico/10/icon_changelink.gif → .../newman/static/ico/10/icon_changelink.gif
File renamed without changes
View
0 ella/newman/media/ico/10/icon_deletelink.gif → .../newman/static/ico/10/icon_deletelink.gif
File renamed without changes
View
0 ella/newman/media/ico/15/loading.gif → ella/newman/static/ico/15/loading.gif
File renamed without changes
View
0 ...wman/media/ico/16/14_layer_lowerlayer.png → ...man/static/ico/16/14_layer_lowerlayer.png
File renamed without changes
View
0 ...ewman/media/ico/16/14_layer_novisible.png → ...wman/static/ico/16/14_layer_novisible.png
File renamed without changes
View
0 ...wman/media/ico/16/14_layer_raiselayer.png → ...man/static/ico/16/14_layer_raiselayer.png
File renamed without changes
View
0 .../newman/media/ico/16/14_layer_visible.png → ...newman/static/ico/16/14_layer_visible.png
File renamed without changes
View
0 ella/newman/media/ico/16/1day.png → ella/newman/static/ico/16/1day.png
File renamed without changes
View
0 ella/newman/media/ico/16/7days.png → ella/newman/static/ico/16/7days.png
File renamed without changes
View
0 ella/newman/media/ico/16/bookmark_add.png → ella/newman/static/ico/16/bookmark_add.png
File renamed without changes
View
0 ella/newman/media/ico/16/cal.png → ella/newman/static/ico/16/cal.png
File renamed without changes
View
0 ella/newman/media/ico/16/cancel.png → ella/newman/static/ico/16/cancel.png
File renamed without changes
View
0 ella/newman/media/ico/16/configure.png → ella/newman/static/ico/16/configure.png
File renamed without changes
View
0 ella/newman/media/ico/16/contexthelp.png → ella/newman/static/ico/16/contexthelp.png
File renamed without changes
View
0 ella/newman/media/ico/16/edit.png → ella/newman/static/ico/16/edit.png
File renamed without changes
View
0 ella/newman/media/ico/16/edit_add.png → ella/newman/static/ico/16/edit_add.png
File renamed without changes
View
0 ella/newman/media/ico/16/edit_remove.png → ella/newman/static/ico/16/edit_remove.png
File renamed without changes
View
0 ella/newman/media/ico/16/editclear.png → ella/newman/static/ico/16/editclear.png
File renamed without changes
View
0 ella/newman/media/ico/16/editcopy.png → ella/newman/static/ico/16/editcopy.png
File renamed without changes
View
0 ella/newman/media/ico/16/editdelete.png → ella/newman/static/ico/16/editdelete.png
File renamed without changes
View
0 ella/newman/media/ico/16/edittrash.png → ella/newman/static/ico/16/edittrash.png
File renamed without changes
View
0 ella/newman/media/ico/16/filesave.png → ella/newman/static/ico/16/filesave.png
File renamed without changes
View
0 ella/newman/media/ico/16/filesaveas.png → ella/newman/static/ico/16/filesaveas.png
Diff not rendered.
View
0 ella/newman/media/ico/16/filter.png → ella/newman/static/ico/16/filter.png
Diff not rendered.
View
0 ella/newman/media/ico/16/gohome.png → ella/newman/static/ico/16/gohome.png
Diff not rendered.
View
0 ella/newman/media/ico/16/help.png → ella/newman/static/ico/16/help.png
Diff not rendered.
View
0 ella/newman/media/ico/16/history.png → ella/newman/static/ico/16/history.png
Diff not rendered.
View
0 ella/newman/media/ico/16/idea.png → ella/newman/static/ico/16/idea.png
Diff not rendered.
View
0 ella/newman/media/ico/16/info.png → ella/newman/static/ico/16/info.png
Diff not rendered.
View
0 ella/newman/media/ico/16/logout.png → ella/newman/static/ico/16/logout.png
Diff not rendered.
View
0 ...ewman/media/ico/16/messagebox_warning.png → ...wman/static/ico/16/messagebox_warning.png
Diff not rendered.
View
0 ella/newman/media/ico/16/na.png → ella/newman/static/ico/16/na.png
Diff not rendered.
View
0 ella/newman/media/ico/16/ok.png → ella/newman/static/ico/16/ok.png
Diff not rendered.
View
0 ella/newman/media/ico/16/recur.png → ella/newman/static/ico/16/recur.png
Diff not rendered.
View
0 ella/newman/media/ico/16/save_all.png → ella/newman/static/ico/16/save_all.png
Diff not rendered.
View
0 ella/newman/media/ico/16/search.png → ella/newman/static/ico/16/search.png
Diff not rendered.
View
0 ella/newman/media/ico/16/vcalendar.png → ella/newman/static/ico/16/vcalendar.png
Diff not rendered.
View
0 ella/newman/media/ico/16/web.png → ella/newman/static/ico/16/web.png
Diff not rendered.
View
0 .../newman/media/ico/64/application-exit.png → ...newman/static/ico/64/application-exit.png
Diff not rendered.
View
0 ella/newman/media/ico/64/kfm_home.png → ella/newman/static/ico/64/kfm_home.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/article.png → ella/newman/static/ico/ct/16/article.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/contest.png → ella/newman/static/ico/ct/16/contest.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/gallery.png → ella/newman/static/ico/ct/16/gallery.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/interview.png → ella/newman/static/ico/ct/16/interview.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/photo.png → ella/newman/static/ico/ct/16/photo.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/quiz.png → ella/newman/static/ico/ct/16/quiz.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/16/video.png → ella/newman/static/ico/ct/16/video.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/article.png → ella/newman/static/ico/ct/64/article.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/author.png → ella/newman/static/ico/ct/64/author.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/category.png → ella/newman/static/ico/ct/64/category.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/contest.png → ella/newman/static/ico/ct/64/contest.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/dbtemplate.png → ella/newman/static/ico/ct/64/dbtemplate.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/gallery.png → ella/newman/static/ico/ct/64/gallery.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/interview.png → ella/newman/static/ico/ct/64/interview.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/photo.png → ella/newman/static/ico/ct/64/photo.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/placement.png → ella/newman/static/ico/ct/64/placement.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/poll.png → ella/newman/static/ico/ct/64/poll.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/position.png → ella/newman/static/ico/ct/64/position.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/publishable.png → ella/newman/static/ico/ct/64/publishable.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/quiz.png → ella/newman/static/ico/ct/64/quiz.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/recipe.png → ella/newman/static/ico/ct/64/recipe.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/serie.png → ella/newman/static/ico/ct/64/serie.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/survey.png → ella/newman/static/ico/ct/64/survey.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/unknown.png → ella/newman/static/ico/ct/64/unknown.png
Diff not rendered.
View
0 ella/newman/media/ico/ct/64/video.png → ella/newman/static/ico/ct/64/video.png
Diff not rendered.
View
0 ella/newman/media/ico/favicon.ico → ella/newman/static/ico/favicon.ico
File renamed without changes.
View
0 ella/newman/media/ico/favs/article.png → ella/newman/static/ico/favs/article.png
Diff not rendered.
View
0 ella/newman/media/ico/favs/gear.png → ella/newman/static/ico/favs/gear.png
Diff not rendered.
View
0 ella/newman/media/img/bg-favs.png → ella/newman/static/img/bg-favs.png
Diff not rendered.
View
0 ella/newman/media/img/horst1.jpg → ella/newman/static/img/horst1.jpg
Diff not rendered.
View
0 ella/newman/media/img/nav-bg-reverse.gif → ella/newman/static/img/nav-bg-reverse.gif
Diff not rendered.
View
0 ella/newman/media/img/nav-bg.gif → ella/newman/static/img/nav-bg.gif
Diff not rendered.
View
0 ella/newman/media/img/newman.jpg → ella/newman/static/img/newman.jpg
Diff not rendered.
View
0 ella/newman/media/img/triangle-left.png → ella/newman/static/img/triangle-left.png
Diff not rendered.
View
0 ...ewman/media/jquery/images/alerts/help.gif → ...wman/static/jquery/images/alerts/help.gif
Diff not rendered.
View
0 .../media/jquery/images/alerts/important.gif → ...static/jquery/images/alerts/important.gif
Diff not rendered.
View
0 ...ewman/media/jquery/images/alerts/info.gif → ...wman/static/jquery/images/alerts/info.gif
Diff not rendered.
View
0 ...wman/media/jquery/images/alerts/title.gif → ...man/static/jquery/images/alerts/title.gif
Diff not rendered.
View
0 ...ery/images/ui-bg_flat_0_aaaaaa_40x100.png → ...ery/images/ui-bg_flat_0_aaaaaa_40x100.png
Diff not rendered.
View
0 ...ry/images/ui-bg_flat_75_ffffff_40x100.png → ...ry/images/ui-bg_flat_75_ffffff_40x100.png
Diff not rendered.
View
0 ...ry/images/ui-bg_glass_55_fbf9ee_1x400.png → ...ry/images/ui-bg_glass_55_fbf9ee_1x400.png
Diff not rendered.
View
0 ...ry/images/ui-bg_glass_65_ffffff_1x400.png → ...ry/images/ui-bg_glass_65_ffffff_1x400.png
Diff not rendered.
View
0 ...ry/images/ui-bg_glass_75_dadada_1x400.png → ...ry/images/ui-bg_glass_75_dadada_1x400.png
Diff not rendered.
View
0 ...ry/images/ui-bg_glass_75_e6e6e6_1x400.png → ...ry/images/ui-bg_glass_75_e6e6e6_1x400.png
Diff not rendered.
View
0 ...ry/images/ui-bg_glass_95_fef1ec_1x400.png → ...ry/images/ui-bg_glass_95_fef1ec_1x400.png
Diff not rendered.
View
0 .../ui-bg_highlight-soft_75_cccccc_1x100.png → .../ui-bg_highlight-soft_75_cccccc_1x100.png
Diff not rendered.
View
0 ...jquery/images/ui-icons_222222_256x240.png → ...jquery/images/ui-icons_222222_256x240.png
Diff not rendered.
View
0 ...jquery/images/ui-icons_2e83ff_256x240.png → ...jquery/images/ui-icons_2e83ff_256x240.png
Diff not rendered.
View
0 ...jquery/images/ui-icons_454545_256x240.png → ...jquery/images/ui-icons_454545_256x240.png
Diff not rendered.
View
0 ...jquery/images/ui-icons_888888_256x240.png → ...jquery/images/ui-icons_888888_256x240.png
Diff not rendered.
View
0 ...jquery/images/ui-icons_cd0a0a_256x240.png → ...jquery/images/ui-icons_cd0a0a_256x240.png
Diff not rendered.
View
0 ella/newman/media/jquery/jquery-1.3.2.js → ella/newman/static/jquery/jquery-1.3.2.js
File renamed without changes.
View
0 ella/newman/media/jquery/jquery-1.4.2.js → ella/newman/static/jquery/jquery-1.4.2.js
File renamed without changes.
View
0 ella/newman/media/jquery/jquery-1.4.3.js → ella/newman/static/jquery/jquery-1.4.3.js
File renamed without changes.
View
0 ...man/media/jquery/jquery-fieldselection.js → ...an/static/jquery/jquery-fieldselection.js
File renamed without changes.
View
0 .../newman/media/jquery/jquery-mousewheel.js → ...newman/static/jquery/jquery-mousewheel.js
File renamed without changes.
View
0 ...man/media/jquery/jquery-ui-smoothness.css → ...an/static/jquery/jquery-ui-smoothness.css
File renamed without changes.
View
0 ella/newman/media/jquery/jquery-ui.js → ella/newman/static/jquery/jquery-ui.js
File renamed without changes.
View
0 ...n/media/jquery/jquery-urldecode-encode.js → .../static/jquery/jquery-urldecode-encode.js
File renamed without changes.
View
0 ella/newman/media/jquery/jquery.alerts.css → ella/newman/static/jquery/jquery.alerts.css
File renamed without changes.
View
0 ella/newman/media/jquery/jquery.alerts.js → ella/newman/static/jquery/jquery.alerts.js
File renamed without changes.
View
0 ella/newman/media/jquery/jquery.autogrow.js → ella/newman/static/jquery/jquery.autogrow.js
File renamed without changes.
View
0 ...edia/jquery/thickbox/loadingAnimation.gif → ...atic/jquery/thickbox/loadingAnimation.gif
Diff not rendered.
View
0 ...newman/media/jquery/thickbox/thickbox.css → ...ewman/static/jquery/thickbox/thickbox.css
File renamed without changes.
View
0 .../newman/media/jquery/thickbox/thickbox.js → ...newman/static/jquery/thickbox/thickbox.js
File renamed without changes.
View
0 ella/newman/media/js/base64.js → ella/newman/static/js/base64.js
File renamed without changes.
View
0 ella/newman/media/js/datetime.js → ella/newman/static/js/datetime.js
File renamed without changes.
View
0 ella/newman/media/js/flash_image.js → ella/newman/static/js/flash_image.js
File renamed without changes.
View
0 ella/newman/media/js/fuckitup.js → ella/newman/static/js/fuckitup.js
File renamed without changes.
View
0 ella/newman/media/js/fuckitup_install.js → ella/newman/static/js/fuckitup_install.js
File renamed without changes.
View
0 ella/newman/media/js/generic.suggest.js → ella/newman/static/js/generic.suggest.js
File renamed without changes.
View
0 ella/newman/media/js/inheritance.js → ella/newman/static/js/inheritance.js
File renamed without changes.
View
0 ella/newman/media/js/inlines.js → ella/newman/static/js/inlines.js
File renamed without changes.
View
0 ella/newman/media/js/json2-min.js → ella/newman/static/js/json2-min.js
File renamed without changes.
View
0 ella/newman/media/js/kobayashi.js → ella/newman/static/js/kobayashi.js
File renamed without changes.
View
0 ...wman/media/js/markitup/jquery.markitup.js → ...man/static/js/markitup/jquery.markitup.js
File renamed without changes.
View
0 ...media/js/markitup/jquery.markitup.pack.js → ...tatic/js/markitup/jquery.markitup.pack.js
File renamed without changes.
View
0 ella/newman/media/js/markitup/readme.txt → ella/newman/static/js/markitup/readme.txt
File renamed without changes.
View
0 ...up/skins/markitup/images/bg-container.png → ...up/sets/czechtile/images/bg-container.png
Diff not rendered.
View
0 .../sets/czechtile/images/bg-editor-ctta.png → .../sets/czechtile/images/bg-editor-ctta.png
Diff not rendered.
View
0 ...kitup/skins/markitup/images/bg-editor.png → ...kitup/sets/czechtile/images/bg-editor.png
Diff not rendered.
View
0 ...js/markitup/sets/markdown/images/bold.png → ...s/markitup/sets/czechtile/images/bold.png
Diff not rendered.
View
0 .../js/markitup/sets/markdown/images/box.png → ...js/markitup/sets/czechtile/images/box.png
Diff not rendered.
View
0 ...rkitup/sets/czechtile/images/enumlist.png → ...rkitup/sets/czechtile/images/enumlist.png
Diff not rendered.
View
0 .../js/markitup/sets/czechtile/images/h1.png → .../js/markitup/sets/czechtile/images/h1.png
Diff not rendered.
View
0 ...s/markitup/skins/simple/images/handle.png → ...markitup/sets/czechtile/images/handle.png
Diff not rendered.
View
0 .../markitup/sets/markdown/images/italic.png → ...markitup/sets/czechtile/images/italic.png
Diff not rendered.
View
0 .../markitup/sets/czechtile/images/kuser.png → .../markitup/sets/czechtile/images/kuser.png
Diff not rendered.
View
0 ...js/markitup/sets/markdown/images/link.png → ...s/markitup/sets/czechtile/images/link.png
Diff not rendered.
View
0 .../js/markitup/skins/simple/images/menu.png → ...s/markitup/sets/czechtile/images/menu.png
Diff not rendered.
View
0 ...markitup/sets/markdown/images/picture.png → ...arkitup/sets/czechtile/images/picture.png
Diff not rendered.
View
0 ...markitup/sets/markdown/images/preview.png → ...arkitup/sets/czechtile/images/preview.png
Diff not rendered.
View
0 .../markitup/skins/simple/images/submenu.png → ...arkitup/sets/czechtile/images/submenu.png
Diff not rendered.
View
0 ...p/sets/czechtile/images/unorderedlist.png → ...p/sets/czechtile/images/unorderedlist.png
Diff not rendered.
View
0 ...n/media/js/markitup/sets/czechtile/set.js → .../static/js/markitup/sets/czechtile/set.js
File renamed without changes.
View
0 ...edia/js/markitup/sets/czechtile/style.css → ...atic/js/markitup/sets/czechtile/style.css
File renamed without changes.
View
0 .../js/markitup/sets/default/images/bold.png → .../js/markitup/sets/default/images/bold.png
Diff not rendered.
View
0 ...js/markitup/sets/default/images/clean.png → ...js/markitup/sets/default/images/clean.png
Diff not rendered.
View
0 ...js/markitup/sets/default/images/image.png → ...js/markitup/sets/default/images/image.png
Diff not rendered.
View
0 ...s/markitup/sets/default/images/italic.png → ...s/markitup/sets/default/images/italic.png
Diff not rendered.
View
0 .../js/markitup/sets/default/images/link.png → .../js/markitup/sets/default/images/link.png
Diff not rendered.
View
0 .../markitup/sets/default/images/picture.png → .../markitup/sets/default/images/picture.png
Diff not rendered.
View
0 .../markitup/sets/default/images/preview.png → .../markitup/sets/default/images/preview.png
Diff not rendered.
View
0 ...s/markitup/sets/default/images/stroke.png → ...s/markitup/sets/default/images/stroke.png
Diff not rendered.
View
0 ...man/media/js/markitup/sets/default/set.js → ...an/static/js/markitup/sets/default/set.js
File renamed without changes.
View
0 .../media/js/markitup/sets/default/style.css → ...static/js/markitup/sets/default/style.css
File renamed without changes.
View
0 ...s/markitup/sets/czechtile/images/bold.png → ...js/markitup/sets/markdown/images/bold.png
Diff not rendered.
View
0 ...js/markitup/sets/czechtile/images/box.png → .../js/markitup/sets/markdown/images/box.png
Diff not rendered.
View
0 ...js/markitup/sets/markdown/images/code.png → ...js/markitup/sets/markdown/images/code.png
Diff not rendered.
View
0 ...a/js/markitup/sets/markdown/images/h1.png → ...c/js/markitup/sets/markdown/images/h1.png
Diff not rendered.
View
0 ...a/js/markitup/sets/markdown/images/h2.png → ...c/js/markitup/sets/markdown/images/h2.png
Diff not rendered.
View
0 ...a/js/markitup/sets/markdown/images/h3.png → ...c/js/markitup/sets/markdown/images/h3.png
Diff not rendered.
View
0 ...a/js/markitup/sets/markdown/images/h4.png → ...c/js/markitup/sets/markdown/images/h4.png
Diff not rendered.
View
0 ...a/js/markitup/sets/markdown/images/h5.png → ...c/js/markitup/sets/markdown/images/h5.png
Diff not rendered.
View
0 ...a/js/markitup/sets/markdown/images/h6.png → ...c/js/markitup/sets/markdown/images/h6.png
Diff not rendered.
View
0 ...markitup/sets/czechtile/images/italic.png → .../markitup/sets/markdown/images/italic.png
Diff not rendered.
View
0 ...s/markitup/sets/czechtile/images/link.png → ...js/markitup/sets/markdown/images/link.png
Diff not rendered.
View
0 ...itup/sets/markdown/images/list-bullet.png → ...itup/sets/markdown/images/list-bullet.png
Diff not rendered.
View
0 ...tup/sets/markdown/images/list-numeric.png → ...tup/sets/markdown/images/list-numeric.png
Diff not rendered.
View
0 ...arkitup/sets/czechtile/images/picture.png → ...markitup/sets/markdown/images/picture.png
Diff not rendered.
View
0 ...arkitup/sets/czechtile/images/preview.png → ...markitup/sets/markdown/images/preview.png
Diff not rendered.
View
0 .../markitup/sets/markdown/images/quotes.png → .../markitup/sets/markdown/images/quotes.png
Diff not rendered.
View
0 ...edia/js/markitup/sets/markdown/readme.txt → ...atic/js/markitup/sets/markdown/readme.txt
File renamed without changes.
View
0 ...an/media/js/markitup/sets/markdown/set.js → ...n/static/js/markitup/sets/markdown/set.js
File renamed without changes.
View
0 ...media/js/markitup/sets/markdown/style.css → ...tatic/js/markitup/sets/markdown/style.css
File renamed without changes.
View
0 ...up/sets/czechtile/images/bg-container.png → ...up/skins/markitup/images/bg-container.png
Diff not rendered.
View
0 ...kins/markitup/images/bg-editor-bbcode.png → ...kins/markitup/images/bg-editor-bbcode.png
Diff not rendered.
View
0 ...ns/markitup/images/bg-editor-dotclear.png → ...ns/markitup/images/bg-editor-dotclear.png
Diff not rendered.
View
0 .../skins/markitup/images/bg-editor-html.png → .../skins/markitup/images/bg-editor-html.png
Diff not rendered.
View
0 .../skins/markitup/images/bg-editor-json.png → .../skins/markitup/images/bg-editor-json.png
Diff not rendered.
View
0 ...ns/markitup/images/bg-editor-markdown.png → ...ns/markitup/images/bg-editor-markdown.png
Diff not rendered.
View
0 ...ins/markitup/images/bg-editor-textile.png → ...ins/markitup/images/bg-editor-textile.png
Diff not rendered.
View
0 .../skins/markitup/images/bg-editor-wiki.png → .../skins/markitup/images/bg-editor-wiki.png
Diff not rendered.
View
0 ...p/skins/markitup/images/bg-editor-xml.png → ...p/skins/markitup/images/bg-editor-xml.png
Diff not rendered.
View
0 ...kitup/sets/czechtile/images/bg-editor.png → ...kitup/skins/markitup/images/bg-editor.png
Diff not rendered.
View
0 ...markitup/skins/markitup/images/handle.png → ...markitup/skins/markitup/images/handle.png
Diff not rendered.
View
0 ...s/markitup/skins/markitup/images/menu.png → ...s/markitup/skins/markitup/images/menu.png
Diff not rendered.
View
0 ...arkitup/skins/markitup/images/submenu.png → ...arkitup/skins/markitup/images/submenu.png
Diff not rendered.
View
0 ...edia/js/markitup/skins/markitup/style.css → ...atic/js/markitup/skins/markitup/style.css
File renamed without changes.
View
0 ...markitup/sets/czechtile/images/handle.png → ...s/markitup/skins/simple/images/handle.png
Diff not rendered.
View
0 ...s/markitup/sets/czechtile/images/menu.png → .../js/markitup/skins/simple/images/menu.png
Diff not rendered.
View
0 ...arkitup/sets/czechtile/images/submenu.png → .../markitup/skins/simple/images/submenu.png
Diff not rendered.
View
0 .../media/js/markitup/skins/simple/style.css → ...static/js/markitup/skins/simple/style.css
File renamed without changes.
View
0 ...n/media/js/markitup/templates/preview.css → .../static/js/markitup/templates/preview.css
File renamed without changes.
View
0 .../media/js/markitup/templates/preview.html → ...static/js/markitup/templates/preview.html
File renamed without changes.
View
0 ella/newman/media/js/newman.js → ella/newman/static/js/newman.js
File renamed without changes.
View
0 ella/newman/media/js/polls.js → ella/newman/static/js/polls.js
File renamed without changes.
View
0 ella/newman/media/js/positions.js → ella/newman/static/js/positions.js
File renamed without changes.
View
0 ella/newman/media/js/related_lookup.js → ella/newman/static/js/related_lookup.js
File renamed without changes.
View
0 ella/newman/media/js/utils.js → ella/newman/static/js/utils.js
File renamed without changes.
View
0 ella/newman/media/swf/PhotoUploader.swf → ella/newman/static/swf/PhotoUploader.swf
File renamed without changes.
View
0 ella/newman/media/swf/lang/cs.xml → ella/newman/static/swf/lang/cs.xml
File renamed without changes.
View
0 ella/newman/media/swf/lang/en.xml → ella/newman/static/swf/lang/en.xml
File renamed without changes.
View
0 ...newman/media/swf/playerProductInstall.swf → ...ewman/static/swf/playerProductInstall.swf
File renamed without changes.
View
2 requirements.txt
@@ -10,4 +10,4 @@ nose
djangosanetesting
git+http://github.com/HonzaKral/django-threadedcomments.git#egg=threadedcomments
-git+http://github.com/ella/django-markup.git#egg=djangomarkup
+-e git+http://github.com/ella/django-markup.git#egg=djangomarkup
View
64 tests/unit_project/test_core/test_feeds.py
@@ -1,9 +1,14 @@
# -*- coding: utf-8 -*-
+from PIL import Image
+
from djangosanetesting import DatabaseTestCase
from django.core.urlresolvers import reverse
+from django.http import HttpRequest
from ella.core.models import Listing
+from ella.core.feeds import RSSTopCategoryListings
+from ella.photos.models import Photo, Format
from unit_project.test_core import create_basic_categories, create_and_place_a_publishable, \
create_and_place_more_publishables, list_all_placements_in_category_by_hour
@@ -21,6 +26,33 @@ def setUp(self):
create_and_place_a_publishable(self)
create_and_place_more_publishables(self)
list_all_placements_in_category_by_hour(self)
+
+ self._feeder = RSSTopCategoryListings('test', HttpRequest())
+
+ def _set_photo(self):
+ from tempfile import mkstemp
+ from django.core.files.base import ContentFile
+
+ image_file_name = mkstemp(suffix=".jpg", prefix="ella-feeds-tests-")[1]
+ image = Image.new('RGB', (200, 100), "black")
+ image.save(image_file_name, format="jpeg")
+
+ f = open(image_file_name)
+ file = ContentFile(f.read())
+ f.close()
+
+ photo = Photo(
+ title = u"Example 中文 photo",
+ slug = u"example-photo",
+ height = 200,
+ width = 100,
+ )
+
+ photo.image.save("bazaaah", file)
+ photo.save()
+
+ self.publishable.photo = photo
+ self.publishable.save()
def test_rss(self):
import feedparser
@@ -46,6 +78,36 @@ def test_atom(self):
self.assert_equals(len(self.placements), len(d['items']))
-
+ def test_get_enclosure_uses_original_when_format_not_set(self):
+ self._set_photo()
+ self.assert_true(self.publishable.photo is not None)
+ original = self.publishable.photo.image
+ new = self._feeder.get_enclosure_image(self.only_publishable, enc_format=None)
+ self.assert_equals(unicode(original), unicode(new))
+
+ def test_get_enclosure_uses_original_when_format_not_found(self):
+ non_existent_format_name = 'aaa'
+ self._set_photo()
+ self.assert_true(self.publishable.photo is not None)
+ original = self.publishable.photo.image
+ new = self._feeder.get_enclosure_image(self.only_publishable, enc_format=non_existent_format_name)
+ self.assert_equals(unicode(original), unicode(new))
+
+ def test_get_enclosure_uses_formated_photo_when_format_available(self):
+ existent_format_name = 'enc_format'
+ f = Format.objects.create(name=existent_format_name, max_width=10, max_height=10,
+ flexible_height=False, stretch=False, nocrop=False)
+ f.sites = [self.site_id]
+
+ self._set_photo()
+ self.assert_true(self.publishable.photo is not None)
+ original = self.publishable.photo.image
+ new = self._feeder.get_enclosure_image(self.only_publishable, enc_format=existent_format_name)
+ self.assert_not_equals(unicode(original), unicode(new))
+
+ def test_get_enclosure_returns_none_when_no_image_set(self):
+ self.assert_equals(self._feeder.get_enclosure_image(self.only_publishable), None)
+
+

No commit comments for this range

Something went wrong with that request. Please try again.