API tools faq
paste
Guest User

Untitled

a guest
Jun 19th, 2018
74
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.50 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/zinnia/admin/entry.py b/zinnia/admin/entry.py
  2. index 858ac76..bab8c15 100644
  3. --- a/zinnia/admin/entry.py
  4. +++ b/zinnia/admin/entry.py
  5. @@ -12,6 +12,7 @@ from django.utils.translation import ugettext_lazy as _
  6. from django.core.urlresolvers import reverse, NoReverseMatch
  7.  
  8. from tagging.models import Tag
  9. +from cms.admin.placeholderadmin import PlaceholderAdmin
  10.  
  11. from zinnia import settings
  12. from zinnia.managers import HIDDEN
  13. @@ -20,12 +21,13 @@ from zinnia.ping import DirectoryPinger
  14. from zinnia.admin.forms import EntryAdminForm
  15.  
  16.  
  17. -class EntryAdmin(admin.ModelAdmin):
  18. +class EntryAdmin(PlaceholderAdmin):
  19. """Admin for Entry model"""
  20. form = EntryAdminForm
  21. date_hierarchy = 'creation_date'
  22. - fieldsets = ((_('Content'), {'fields': ('title', 'content',
  23. - 'image', 'status')}),
  24. + fieldsets = ((_('Content'), {'fields': ('title', 'image', 'status')}),
  25. + (None, {'fields': ('content',),
  26. + 'classes': ('plugin-holder', 'plugin-holder-nopage')}),
  27. (_('Options'), {'fields': ('excerpt', 'template', 'related',
  28. 'authors', 'creation_date',
  29. 'start_publication',
  30. @@ -164,16 +166,16 @@ class EntryAdmin(admin.ModelAdmin):
  31. return queryset
  32. return request.user.entry_set.all()
  33.  
  34. - def formfield_for_manytomany(self, db_field, request, **kwargs):
  35. - """Filters the disposable authors"""
  36. - if db_field.name == 'authors':
  37. - if request.user.has_perm('zinnia.can_change_author'):
  38. - kwargs['queryset'] = User.objects.filter(is_staff=True)
  39. - else:
  40. - kwargs['queryset'] = User.objects.filter(pk=request.user.pk)
  41. +# def formfield_for_manytomany(self, db_field, request, **kwargs):
  42. +# """Filters the disposable authors"""
  43. +# if db_field.name == 'authors':
  44. +# if request.user.has_perm('zinnia.can_change_author'):
  45. +# kwargs['queryset'] = User.objects.filter(is_staff=True)
  46. +# else:
  47. +# kwargs['queryset'] = User.objects.filter(pk=request.user.pk)
  48.  
  49. - return super(EntryAdmin, self).formfield_for_manytomany(
  50. - db_field, request, **kwargs)
  51. +# return super(EntryAdmin, self).formfield_for_manytomany(
  52. +# db_field, request, **kwargs)
  53.  
  54. def get_actions(self, request):
  55. """Define user actions by permissions"""
  56. @@ -250,34 +252,34 @@ class EntryAdmin(admin.ModelAdmin):
  57. ping_directories.short_description = _('Ping Directories for ' \
  58. 'selected entries')
  59.  
  60. - def get_urls(self):
  61. - entry_admin_urls = super(EntryAdmin, self).get_urls()
  62. - urls = patterns('django.views.generic.simple',
  63. - url(r'^autocomplete_tags/$', 'direct_to_template',
  64. - {'template': 'admin/zinnia/entry/autocomplete_tags.js',
  65. - 'mimetype': 'application/javascript'},
  66. - name='zinnia_entry_autocomplete_tags'),
  67. - url(r'^wymeditor/$', 'direct_to_template',
  68. - {'template': 'admin/zinnia/entry/wymeditor.js',
  69. - 'mimetype': 'application/javascript'},
  70. - name='zinnia_entry_wymeditor'),)
  71. - return urls + entry_admin_urls
  72. -
  73. - def _media(self):
  74. - MEDIA_URL = settings.MEDIA_URL
  75. - media = super(EntryAdmin, self).media + \
  76. - Media(css={'all': ('%scss/jquery.autocomplete.css' % MEDIA_URL,)},
  77. - js=('%sjs/jquery.js' % MEDIA_URL,
  78. - '%sjs/jquery.bgiframe.js' % MEDIA_URL,
  79. - '%sjs/jquery.autocomplete.js' % MEDIA_URL,
  80. - reverse('admin:zinnia_entry_autocomplete_tags'),))
  81. -
  82. - if settings.WYSIWYG == 'wymeditor':
  83. - media += Media(js=('%sjs/wymeditor/jquery.wymeditor.pack.js' % MEDIA_URL,
  84. - reverse('admin:zinnia_entry_wymeditor')))
  85. - elif settings.WYSIWYG == 'tinymce':
  86. - from tinymce.widgets import TinyMCE
  87. - media += TinyMCE().media + Media(
  88. - js=(reverse('tinymce-js', args=('admin/zinnia/entry',)),))
  89. - return media
  90. - media = property(_media)
  91. +# def get_urls(self):
  92. +# entry_admin_urls = super(EntryAdmin, self).get_urls()
  93. +# urls = patterns('django.views.generic.simple',
  94. +# url(r'^autocomplete_tags/$', 'direct_to_template',
  95. +# {'template': 'admin/zinnia/entry/autocomplete_tags.js',
  96. +# 'mimetype': 'application/javascript'},
  97. +# name='zinnia_entry_autocomplete_tags'),
  98. +# url(r'^wymeditor/$', 'direct_to_template',
  99. +# {'template': 'admin/zinnia/entry/wymeditor.js',
  100. +# 'mimetype': 'application/javascript'},
  101. +# name='zinnia_entry_wymeditor'),)
  102. +# return urls + entry_admin_urls
  103. +
  104. +# def _media(self):
  105. +# MEDIA_URL = settings.MEDIA_URL
  106. +# media = super(EntryAdmin, self).media + \
  107. +# Media(css={'all': ('%scss/jquery.autocomplete.css' % MEDIA_URL,)},
  108. +# js=('%sjs/jquery.js' % MEDIA_URL,
  109. +# '%sjs/jquery.bgiframe.js' % MEDIA_URL,
  110. +# '%sjs/jquery.autocomplete.js' % MEDIA_URL,
  111. +# reverse('admin:zinnia_entry_autocomplete_tags'),))
  112. +
  113. +# if settings.WYSIWYG == 'wymeditor':
  114. +# media += Media(js=('%sjs/wymeditor/jquery.wymeditor.pack.js' % MEDIA_URL,
  115. +# reverse('admin:zinnia_entry_wymeditor')))
  116. +# elif settings.WYSIWYG == 'tinymce':
  117. +# from tinymce.widgets import TinyMCE
  118. +# media += TinyMCE().media + Media(
  119. +# js=(reverse('tinymce-js', args=('admin/zinnia/entry',)),))
  120. +# return media
  121. +# media = property(_media)
  122. diff --git a/zinnia/models.py b/zinnia/models.py
  123. index 140eeed..3f7636e 100644
  124. --- a/zinnia/models.py
  125. +++ b/zinnia/models.py
  126. @@ -16,6 +16,7 @@ try:
  127. except ImportError:
  128. MPTTModel = models.Model
  129. from tagging.fields import TagField
  130. +from cms.models.fields import PlaceholderField
  131.  
  132. from zinnia.settings import USE_BITLY
  133. from zinnia.settings import UPLOAD_TO
  134. @@ -80,7 +81,8 @@ class Entry(models.Model):
  135.  
  136. image = models.ImageField(_('image'), upload_to=UPLOAD_TO,
  137. blank=True, help_text=_('used for illustration'))
  138. - content = models.TextField(_('content'))
  139. + #content = models.TextField(_('content'))
  140. + content = PlaceholderField('content')
  141. excerpt = models.TextField(_('excerpt'), blank=True,
  142. help_text=_('optional element'))
  143.  
  144. @@ -127,9 +129,10 @@ class Entry(models.Model):
  145. @property
  146. def html_content(self):
  147. """Return the content correctly formatted"""
  148. - if not '</p>' in self.content:
  149. - return linebreaks(self.content)
  150. - return self.content
  151. + return 'No content'
  152. + #if not '</p>' in self.content:
  153. + # return linebreaks(self.content)
  154. + #return self.content
  155.  
  156. @property
  157. def previous_entry(self):
  158. diff --git a/zinnia/templates/zinnia/_entry_detail.html b/zinnia/templates/zinnia/_entry_detail.html
  159. index b90028c..1b8da61 100644
  160. --- a/zinnia/templates/zinnia/_entry_detail.html
  161. +++ b/zinnia/templates/zinnia/_entry_detail.html
  162. @@ -1,4 +1,4 @@
  163. -{% load tagging_tags comments i18n %}
  164. +{% load tagging_tags comments i18n placeholder_tags %}
  165.  
  166. <div class="entry-header span-16 last">
  167. <h2 class="entry-title">
  168. @@ -41,7 +41,7 @@
  169. </div>
  170. {% endif %}
  171. <div class="entry-content">
  172. - {{ object_content }}
  173. + {% render_placeholder object.content "640" %}
  174. </div>
  175. </div>
  176.  
  177. diff --git a/zinnia/templates/zinnia/entry_archive_base.html b/zinnia/templates/zinnia/entry_archive_base.html
  178. index bf0d4e4..468f563 100644
  179. --- a/zinnia/templates/zinnia/entry_archive_base.html
  180. +++ b/zinnia/templates/zinnia/entry_archive_base.html
  181. @@ -31,9 +31,9 @@
  182.  
  183. {% for object in object_list %}
  184. <div id="entry-{{ object.pk }}" class="hentry span-16 last">
  185. - {% with object.html_content|truncatewords_html:100|safe as object_content %}
  186. + {#% with object.html_content|truncatewords_html:100|safe as object_content %#}
  187. {% include "zinnia/_entry_detail.html" %}
  188. - {% endwith %}
  189. + {#% endwith %#}
  190. </div>
  191. <hr />
  192. {% empty %}
  193. diff --git a/zinnia/templates/zinnia/entry_detail.html b/zinnia/templates/zinnia/entry_detail.html
  194. index 71709da..650bc5e 100644
  195. --- a/zinnia/templates/zinnia/entry_detail.html
  196. +++ b/zinnia/templates/zinnia/entry_detail.html
  197. @@ -14,9 +14,9 @@
  198.  
  199. {% block content %}
  200. <div id="entry-{{ object.pk }}" class="hentry span-16 last">
  201. - {% with object.html_content|safe as object_content %}
  202. + {#% with object.html_content|safe as object_content %#}
  203. {% include "zinnia/_entry_detail.html" %}
  204. - {% endwith %}
  205. + {#% endwith %#}
  206. </div>
  207.  
  208. <hr />
  209. diff --git a/zinnia/templatetags/zinnia_tags.py b/zinnia/templatetags/zinnia_tags.py
  210. index 2b1752b..c11afe1 100644
  211. --- a/zinnia/templatetags/zinnia_tags.py
  212. +++ b/zinnia/templatetags/zinnia_tags.py
  213. @@ -23,7 +23,7 @@ from zinnia.comparison import pearson_score
  214. register = Library()
  215.  
  216. VECTORS = VectorBuilder({'queryset': Entry.published.all(),
  217. - 'fields': ['title', 'excerpt', 'content']})
  218. + 'fields': ['title', 'excerpt', ]})
  219. CACHE_ENTRIES_RELATED = {}
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!