Permalink
Browse files

Merge pull request #922 from ojii/stephrdev-feature/staticfiles

Transition to staticfiles
  • Loading branch information...
2 parents 6f59936 + 1701822 commit 2d5793844c8843f8014332cc61d87ec0a288cef7 @chrisglass chrisglass committed Aug 4, 2011
Showing with 136 additions and 122 deletions.
  1. +2 −3 cms/admin/pageadmin.py
  2. +2 −2 cms/admin/placeholderadmin.py
  3. +3 −4 cms/forms/widgets.py
  4. +1 −1 cms/plugins/file/cms_plugins.py
  5. +2 −2 cms/plugins/file/models.py
  6. +4 −4 cms/plugins/flash/templates/cms/plugins/flash.html
  7. +1 −1 cms/plugins/link/cms_plugins.py
  8. +1 −1 cms/plugins/picture/cms_plugins.py
  9. +1 −1 cms/plugins/snippet/cms_plugins.py
  10. +1 −1 cms/plugins/text/settings.py
  11. +3 −3 cms/plugins/text/templates/cms/plugins/text_plugin_change_form.html
  12. +2 −2 cms/plugins/text/templates/cms/plugins/widgets/wymeditor.html
  13. +2 −2 cms/plugins/text/widgets/tinymce_widget.py
  14. +4 −4 cms/plugins/text/widgets/wymeditor_widget.py
  15. +2 −2 cms/plugins/twitter/templates/cms/plugins/twitter_recent_entries.html
  16. +5 −5 cms/plugins/video/templates/cms/plugins/video.html
  17. 0 cms/{media → static}/cms/css/change_form.css
  18. 0 cms/{media → static}/cms/css/jquery.dialog.css
  19. 0 cms/{media → static}/cms/css/jquery.tooltip.css
  20. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
  21. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
  22. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
  23. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
  24. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
  25. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
  26. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
  27. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
  28. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
  29. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_2694e8_256x240.png
  30. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_2e83ff_256x240.png
  31. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_3d80b3_256x240.png
  32. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_72a7cf_256x240.png
  33. BIN cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_ffffff_256x240.png
  34. 0 cms/{media → static}/cms/css/jquery/cupertino/jquery-ui.css
  35. 0 cms/{media → static}/cms/css/pages.css
  36. 0 cms/{media → static}/cms/css/plugin_editor.css
  37. 0 cms/{media → static}/cms/css/plugin_forms.css
  38. 0 cms/{media → static}/cms/css/plugins/cms.placeholders.css
  39. 0 cms/{media → static}/cms/css/plugins/cms.toolbar.css
  40. 0 cms/{media → static}/cms/css/rte.css
  41. 0 cms/{media → static}/cms/css/tinymce_toolbar.css
  42. 0 cms/{media → static}/cms/css/toolbar.css
  43. 0 cms/{media → static}/cms/css/wymeditor.css
  44. BIN cms/{media → static}/cms/images/bold.gif
  45. BIN cms/{media → static}/cms/images/changelist-filter-button-bg.jpg
  46. BIN cms/{media → static}/cms/images/close.gif
  47. BIN cms/{media → static}/cms/images/cms_toolbar.gif
  48. BIN cms/{media → static}/cms/images/cms_toolbar.png
  49. BIN cms/{media → static}/cms/images/copy.gif
  50. BIN cms/{media → static}/cms/images/cut.gif
  51. BIN cms/{media → static}/cms/images/file_icons/flv.gif
  52. BIN cms/{media → static}/cms/images/file_icons/gif.gif
  53. BIN cms/{media → static}/cms/images/file_icons/html.gif
  54. BIN cms/{media → static}/cms/images/file_icons/java.gif
  55. BIN cms/{media → static}/cms/images/file_icons/jpg.gif
  56. BIN cms/{media → static}/cms/images/file_icons/mp3.png
  57. BIN cms/{media → static}/cms/images/file_icons/ods.png
  58. BIN cms/{media → static}/cms/images/file_icons/odt.png
  59. BIN cms/{media → static}/cms/images/file_icons/pdf.gif
  60. BIN cms/{media → static}/cms/images/file_icons/php.gif
  61. BIN cms/{media → static}/cms/images/file_icons/png.gif
  62. BIN cms/{media → static}/cms/images/file_icons/swf.gif
  63. BIN cms/{media → static}/cms/images/file_icons/tgz.png
  64. BIN cms/{media → static}/cms/images/file_icons/ttf.gif
  65. BIN cms/{media → static}/cms/images/file_icons/txt.gif
  66. BIN cms/{media → static}/cms/images/file_icons/txt.png
  67. BIN cms/{media → static}/cms/images/file_icons/wav.gif
  68. BIN cms/{media → static}/cms/images/file_icons/zip.png
  69. BIN cms/{media → static}/cms/images/icon_addlink.gif
  70. BIN cms/{media → static}/cms/images/icon_deletelink.gif
  71. BIN cms/{media → static}/cms/images/icon_extension.gif
  72. BIN cms/{media → static}/cms/images/icon_pluginedit.gif
  73. BIN cms/{media → static}/cms/images/icons.png
  74. BIN cms/{media → static}/cms/images/image.png
  75. BIN cms/{media → static}/cms/images/indicator.gif
  76. BIN cms/{media → static}/cms/images/italic.gif
  77. BIN cms/{media → static}/cms/images/jquery/accordion-left-act.png
  78. BIN cms/{media → static}/cms/images/jquery/accordion-left-over.png
  79. BIN cms/{media → static}/cms/images/jquery/accordion-left.png
  80. BIN cms/{media → static}/cms/images/jquery/accordion-middle-act.png
  81. BIN cms/{media → static}/cms/images/jquery/accordion-middle-over.png
  82. BIN cms/{media → static}/cms/images/jquery/accordion-middle.png
  83. BIN cms/{media → static}/cms/images/jquery/accordion-right-act.png
  84. BIN cms/{media → static}/cms/images/jquery/accordion-right-over.png
  85. BIN cms/{media → static}/cms/images/jquery/accordion-right.png
  86. BIN cms/{media → static}/cms/images/jquery/default-bg.gif
  87. BIN cms/{media → static}/cms/images/jquery/dialog-e.gif
  88. BIN cms/{media → static}/cms/images/jquery/dialog-n.gif
  89. BIN cms/{media → static}/cms/images/jquery/dialog-ne.gif
  90. BIN cms/{media → static}/cms/images/jquery/dialog-nw.gif
  91. BIN cms/{media → static}/cms/images/jquery/dialog-s.gif
  92. BIN cms/{media → static}/cms/images/jquery/dialog-se.gif
  93. BIN cms/{media → static}/cms/images/jquery/dialog-sw.gif
  94. BIN cms/{media → static}/cms/images/jquery/dialog-title.gif
  95. BIN cms/{media → static}/cms/images/jquery/dialog-titlebar-close-hover.png
  96. BIN cms/{media → static}/cms/images/jquery/dialog-titlebar-close.png
  97. BIN cms/{media → static}/cms/images/jquery/dialog-w.gif
  98. BIN cms/{media → static}/cms/images/jquery/nav-bg.gif
  99. BIN cms/{media → static}/cms/images/jquery/resizable-e.gif
  100. BIN cms/{media → static}/cms/images/jquery/resizable-n.gif
  101. BIN cms/{media → static}/cms/images/jquery/resizable-ne.gif
  102. BIN cms/{media → static}/cms/images/jquery/resizable-nw.gif
  103. BIN cms/{media → static}/cms/images/jquery/resizable-s.gif
  104. BIN cms/{media → static}/cms/images/jquery/resizable-se.gif
  105. BIN cms/{media → static}/cms/images/jquery/resizable-sw.gif
  106. BIN cms/{media → static}/cms/images/jquery/resizable-w.gif
  107. BIN cms/{media → static}/cms/images/jquery/slider-bg-1.png
  108. BIN cms/{media → static}/cms/images/jquery/slider-bg-2.png
  109. BIN cms/{media → static}/cms/images/jquery/slider-handle.gif
  110. BIN cms/{media → static}/cms/images/jquery/tabs.png
  111. BIN cms/{media → static}/cms/images/link.png
  112. BIN cms/{media → static}/cms/images/logo.jpg
  113. BIN cms/{media → static}/cms/images/nav-bg.gif
  114. BIN cms/{media → static}/cms/images/page_find.gif
  115. BIN cms/{media → static}/cms/images/pluginlist-delete.png
  116. BIN cms/{media → static}/cms/images/pluginlist-holder-bg.gif
  117. BIN cms/{media → static}/cms/images/plugins/file.png
  118. BIN cms/{media → static}/cms/images/plugins/get_flash_player.gif
  119. BIN cms/{media → static}/cms/images/plugins/image.png
  120. BIN cms/{media → static}/cms/images/plugins/link.png
  121. BIN cms/{media → static}/cms/images/plugins/snippet.png
  122. BIN cms/{media → static}/cms/images/pony.jpg
  123. BIN cms/{media → static}/cms/images/sitemap-exim.gif
  124. BIN cms/{media → static}/cms/images/sitemap-exlm.gif
  125. BIN cms/{media → static}/cms/images/sitemap-extm.gif
  126. BIN cms/{media → static}/cms/images/sitemap-li-bg.jpg
  127. BIN cms/{media → static}/cms/images/sitemap-li-collapse.gif
  128. BIN cms/{media → static}/cms/images/sitemap-li-drag.gif
  129. BIN cms/{media → static}/cms/images/toolbar/frame_shadow.gif
  130. BIN cms/{media → static}/cms/images/toolbar/icons/icon_admin.png
  131. BIN cms/{media → static}/cms/images/toolbar/icons/icon_child.png
  132. BIN cms/{media → static}/cms/images/toolbar/icons/icon_delete.png
  133. BIN cms/{media → static}/cms/images/toolbar/icons/icon_edit.png
  134. BIN cms/{media → static}/cms/images/toolbar/icons/icon_history.png
  135. BIN cms/{media → static}/cms/images/toolbar/icons/icon_lock.png
  136. BIN cms/{media → static}/cms/images/toolbar/icons/icon_page.png
  137. BIN cms/{media → static}/cms/images/toolbar/icons/icon_sibling.png
  138. BIN cms/{media → static}/cms/images/toolbar/icons/icon_sitemap.png
  139. BIN cms/{media → static}/cms/images/toolbar/icons/icon_template.png
  140. BIN cms/{media → static}/cms/images/toolbar/loader.gif
  141. BIN cms/{media → static}/cms/images/toolbar/sprite_toolbar-ie.png
  142. BIN cms/{media → static}/cms/images/toolbar/sprite_toolbar.png
  143. BIN cms/{media → static}/cms/images/toolbar/toolbar_bg.gif
  144. BIN cms/{media → static}/cms/images/unordered.gif
  145. 0 cms/{media → static}/cms/js/change_form.js
  146. 0 cms/{media → static}/cms/js/change_list.js
  147. 0 cms/{media → static}/cms/js/csrf.js
  148. 0 cms/{media → static}/cms/js/libs/classy.min.js
  149. 0 cms/{media → static}/cms/js/libs/jquery.bind.js
  150. 0 cms/{media → static}/cms/js/libs/jquery.cookie.js
  151. 0 cms/{media → static}/cms/js/libs/jquery.form.js
  152. 0 cms/{media → static}/cms/js/libs/jquery.functional.js
  153. 0 cms/{media → static}/cms/js/libs/jquery.livequery.js
  154. 0 cms/{media → static}/cms/js/libs/jquery.query.js
  155. 0 cms/{media → static}/cms/js/libs/jquery.tweet.js
  156. 0 cms/{media → static}/cms/js/libs/jquery.ui.checkbox.js
  157. 0 cms/{media → static}/cms/js/libs/jquery.ui.core.js
  158. 0 cms/{media → static}/cms/js/libs/jquery.ui.dialog.js
  159. 0 cms/{media → static}/cms/js/libs/jquery.ui.effects.core.js
  160. 0 cms/{media → static}/cms/js/libs/jquery.ui.effects.highlight.js
  161. 0 cms/{media → static}/cms/js/libs/jquery.ui.sortable.js
  162. 0 cms/{media → static}/cms/js/libs/swfobject.min.js
  163. 0 cms/{media → static}/cms/js/placeholder_editor_registry.js
  164. 0 cms/{media → static}/cms/js/plugin_editor.js
  165. 0 cms/{media → static}/cms/js/plugins/admincompat.js
  166. 0 cms/{media → static}/cms/js/plugins/cms.base.js
  167. 0 cms/{media → static}/cms/js/plugins/cms.placeholders.js
  168. 0 cms/{media → static}/cms/js/plugins/cms.toolbar.js
  169. 0 cms/{media → static}/cms/js/tinymce.placeholdereditor.js
  170. 0 cms/{media → static}/cms/js/wymeditor.placeholdereditor.js
  171. BIN cms/{media → static}/cms/js/wymeditor/skins/django/icons.png
  172. 0 cms/{media → static}/cms/js/wymeditor/skins/django/skin.css
  173. 0 cms/{media → static}/cms/js/wymeditor/skins/django/skin.js
  174. 0 cms/{media → static}/cms/jstree/_lib/_all.js
  175. 0 cms/{media → static}/cms/jstree/_lib/css.js
  176. 0 cms/{media → static}/cms/jstree/_lib/jquery.cookie.js
  177. 0 cms/{media → static}/cms/jstree/_lib/jquery.hotkeys.js
  178. 0 cms/{media → static}/cms/jstree/_lib/jquery.js
  179. 0 cms/{media → static}/cms/jstree/_lib/jquery.listen.js
  180. 0 cms/{media → static}/cms/jstree/_lib/jquery.log.js
  181. 0 cms/{media → static}/cms/jstree/_lib/jquery.metadata.js
  182. 0 cms/{media → static}/cms/jstree/_lib/jquery.xslt.js
  183. 0 cms/{media → static}/cms/jstree/_lib/sarissa.js
  184. 0 cms/{media → static}/cms/jstree/_lib/sarissa_ieemu_xpath.js
  185. 0 cms/{media → static}/cms/jstree/flat.xsl
  186. 0 cms/{media → static}/cms/jstree/nested.xsl
  187. BIN cms/{media → static}/cms/jstree/themes/classic/folder.gif
  188. BIN cms/{media → static}/cms/jstree/themes/classic/folderopen.gif
  189. BIN cms/{media → static}/cms/jstree/themes/classic/minus.gif
  190. BIN cms/{media → static}/cms/jstree/themes/classic/plus.gif
  191. 0 cms/{media → static}/cms/jstree/themes/classic/style.css
  192. BIN cms/{media → static}/cms/jstree/themes/default/context.gif
  193. BIN cms/{media → static}/cms/jstree/themes/default/create.png
  194. BIN cms/{media → static}/cms/jstree/themes/default/dot.gif
  195. BIN cms/{media → static}/cms/jstree/themes/default/f.png
  196. BIN cms/{media → static}/cms/jstree/themes/default/fminus.gif
  197. BIN cms/{media → static}/cms/jstree/themes/default/fminus_rtl.gif
  198. BIN cms/{media → static}/cms/jstree/themes/default/fplus.gif
  199. BIN cms/{media → static}/cms/jstree/themes/default/fplus_rtl.gif
  200. BIN cms/{media → static}/cms/jstree/themes/default/lastli.gif
  201. BIN cms/{media → static}/cms/jstree/themes/default/lastli_rtl.gif
  202. BIN cms/{media → static}/cms/jstree/themes/default/li.gif
  203. BIN cms/{media → static}/cms/jstree/themes/default/marker.gif
  204. BIN cms/{media → static}/cms/jstree/themes/default/marker_rtl.gif
  205. BIN cms/{media → static}/cms/jstree/themes/default/plus.gif
  206. BIN cms/{media → static}/cms/jstree/themes/default/remove.gif
  207. BIN cms/{media → static}/cms/jstree/themes/default/remove.png
  208. BIN cms/{media → static}/cms/jstree/themes/default/rename.png
  209. 0 cms/{media → static}/cms/jstree/themes/default/style.css
  210. BIN cms/{media → static}/cms/jstree/themes/default/throbber.gif
  211. 0 cms/{media → static}/cms/jstree/tree_component.css
  212. 0 cms/{media → static}/cms/jstree/tree_component.js
  213. BIN cms/{media → static}/cms/swf/expressInstall.swf
  214. BIN cms/{media → static}/cms/swf/player.swf
  215. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-blockquote.png
  216. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-h1.png
  217. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-h2.png
  218. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-h3.png
  219. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-h4.png
  220. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-h5.png
  221. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-h6.png
  222. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-p.png
  223. BIN cms/{media → static}/cms/wymeditor/iframe/default/lbl-pre.png
  224. 0 cms/{media → static}/cms/wymeditor/iframe/default/wymiframe.css
  225. 0 cms/{media → static}/cms/wymeditor/iframe/default/wymiframe.html
  226. 0 cms/{media → static}/cms/wymeditor/jquery.wymeditor.js
  227. 0 cms/{media → static}/cms/wymeditor/jquery.wymeditor.min.js
  228. 0 cms/{media → static}/cms/wymeditor/jquery.wymeditor.pack.js
  229. 0 cms/{media → static}/cms/wymeditor/lang/bg.js
  230. 0 cms/{media → static}/cms/wymeditor/lang/ca.js
  231. 0 cms/{media → static}/cms/wymeditor/lang/cs.js
  232. 0 cms/{media → static}/cms/wymeditor/lang/de.js
  233. 0 cms/{media → static}/cms/wymeditor/lang/en.js
  234. 0 cms/{media → static}/cms/wymeditor/lang/es.js
  235. 0 cms/{media → static}/cms/wymeditor/lang/fa.js
  236. 0 cms/{media → static}/cms/wymeditor/lang/fi.js
  237. 0 cms/{media → static}/cms/wymeditor/lang/fr.js
  238. 0 cms/{media → static}/cms/wymeditor/lang/he.js
  239. 0 cms/{media → static}/cms/wymeditor/lang/hr.js
  240. 0 cms/{media → static}/cms/wymeditor/lang/hu.js
  241. 0 cms/{media → static}/cms/wymeditor/lang/it.js
  242. 0 cms/{media → static}/cms/wymeditor/lang/nb.js
  243. 0 cms/{media → static}/cms/wymeditor/lang/nl.js
  244. 0 cms/{media → static}/cms/wymeditor/lang/nn.js
  245. 0 cms/{media → static}/cms/wymeditor/lang/pl.js
  246. 0 cms/{media → static}/cms/wymeditor/lang/pt-br.js
  247. 0 cms/{media → static}/cms/wymeditor/lang/pt.js
  248. 0 cms/{media → static}/cms/wymeditor/lang/ru.js
  249. 0 cms/{media → static}/cms/wymeditor/lang/sv.js
  250. 0 cms/{media → static}/cms/wymeditor/lang/tr.js
  251. 0 cms/{media → static}/cms/wymeditor/lang/zh_cn.js
  252. 0 cms/{media → static}/cms/wymeditor/plugins/embed/jquery.wymeditor.embed.js
  253. BIN cms/{media → static}/cms/wymeditor/plugins/fullscreen/icon_fullscreen.gif
  254. 0 cms/{media → static}/cms/wymeditor/plugins/fullscreen/jquery.wymeditor.fullscreen.js
  255. 0 cms/{media → static}/cms/wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js
  256. 0 cms/{media → static}/cms/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js
  257. 0 cms/{media → static}/cms/wymeditor/plugins/resizable/readme.txt
  258. BIN cms/{media → static}/cms/wymeditor/skins/compact/icons.png
  259. 0 cms/{media → static}/cms/wymeditor/skins/compact/skin.css
  260. 0 cms/{media → static}/cms/wymeditor/skins/compact/skin.js
  261. BIN cms/{media → static}/cms/wymeditor/skins/default/icons.png
  262. 0 cms/{media → static}/cms/wymeditor/skins/default/skin.css
  263. 0 cms/{media → static}/cms/wymeditor/skins/default/skin.js
  264. BIN cms/{media → static}/cms/wymeditor/skins/minimal/images/bg.header.gif
  265. BIN cms/{media → static}/cms/wymeditor/skins/minimal/images/bg.selector.silver.gif
  266. BIN cms/{media → static}/cms/wymeditor/skins/minimal/images/bg.wymeditor.png
  267. BIN cms/{media → static}/cms/wymeditor/skins/minimal/images/icons.silver.gif
  268. 0 cms/{media → static}/cms/wymeditor/skins/minimal/skin.css
  269. 0 cms/{media → static}/cms/wymeditor/skins/minimal/skin.js
  270. 0 cms/{media → static}/cms/wymeditor/skins/silver/COPYING
  271. 0 cms/{media → static}/cms/wymeditor/skins/silver/README
  272. BIN cms/{media → static}/cms/wymeditor/skins/silver/images/bg.header.gif
  273. BIN cms/{media → static}/cms/wymeditor/skins/silver/images/bg.selector.silver.gif
  274. BIN cms/{media → static}/cms/wymeditor/skins/silver/images/bg.wymeditor.png
  275. BIN cms/{media → static}/cms/wymeditor/skins/silver/images/icons.silver.gif
  276. 0 cms/{media → static}/cms/wymeditor/skins/silver/skin.css
  277. 0 cms/{media → static}/cms/wymeditor/skins/silver/skin.js
  278. BIN cms/{media → static}/cms/wymeditor/skins/twopanels/icons.png
  279. 0 cms/{media → static}/cms/wymeditor/skins/twopanels/skin.css
  280. 0 cms/{media → static}/cms/wymeditor/skins/twopanels/skin.js
  281. BIN cms/{media → static}/cms/wymeditor/skins/wymeditor_icon.png
  282. +2 −2 cms/templates/admin/cms/page/change_form.html
  283. +20 −20 cms/templates/admin/cms/page/change_list.html
  284. +1 −1 cms/templates/admin/cms/page/plugin_forms_history.html
  285. +4 −4 cms/templates/cms/new.html
  286. +8 −8 cms/templates/cms/toolbar/toolbar.html
  287. +35 −32 cms/tests/plugins.py
  288. +4 −4 cms/toolbar/items.py
  289. +2 −2 cms/utils/__init__.py
  290. +1 −2 cms/views.py
  291. +1 −0 tests/buildout.cfg
  292. +1 −0 tests/django-12.cfg
  293. +16 −5 tests/project/settings.py
  294. +2 −2 tests/project/templates/base.html
  295. +2 −2 tests/project/templates/fail.html
  296. +1 −0 tests/project/urls.py
View
@@ -164,15 +164,14 @@ class PageAdmin(ModelAdmin):
class Media:
css = {
- 'all': [os.path.join(settings.CMS_MEDIA_URL, path) for path in (
+ 'all': [os.path.join(settings.STATIC_URL, 'cms', path) for path in (
'css/rte.css',
'css/pages.css',
'css/change_form.css',
'css/jquery.dialog.css',
)]
}
- js = ['%sjs/jquery.min.js' % settings.ADMIN_MEDIA_PREFIX] + [
- os.path.join(settings.CMS_MEDIA_URL, path) for path in [
+ js = ['%sjs/jquery.min.js' % settings.ADMIN_MEDIA_PREFIX] + [os.path.join(settings.STATIC_URL, 'cms', path) for path in [
'js/plugins/admincompat.js',
'js/libs/jquery.query.js',
'js/libs/jquery.ui.core.js',
@@ -21,7 +21,7 @@ class PlaceholderAdmin(ModelAdmin):
class Media:
css = {
- 'all': [os.path.join(settings.CMS_MEDIA_URL, path) for path in (
+ 'all': [os.path.join(settings.STATIC_URL, 'cms', path) for path in (
'css/rte.css',
'css/pages.css',
'css/change_form.css',
@@ -30,7 +30,7 @@ class Media:
)]
}
js = ['%sjs/jquery.min.js' % settings.ADMIN_MEDIA_PREFIX] + [
- os.path.join(settings.CMS_MEDIA_URL, path) for path in [
+ os.path.join(settings.STATIC_URL, 'cms', path) for path in [
'js/plugins/admincompat.js',
'js/csrf.js',
'js/libs/jquery.query.js',
View
@@ -130,13 +130,12 @@ def __init__(self, attrs=None):
self.attrs = {}
class Media:
- js = [join(settings.CMS_MEDIA_URL, path) for path in (
+ js = [join(settings.STATIC_URL, 'cms', path) for path in (
'js/libs/jquery.ui.core.js',
'js/libs/jquery.ui.sortable.js',
- 'js/plugin_editor.js',
)]
css = {
- 'all': [join(settings.CMS_MEDIA_URL, path) for path in (
+ 'all': [join(settings.STATIC_URL, 'cms', path) for path in (
'css/plugin_editor.css',
)]
}
@@ -217,4 +216,4 @@ def render(self, name, value, attrs=None):
#return mark_safe(render_to_string(
# 'admin/cms/page/widgets/plugin_editor.html', context))
return mark_safe(render_to_string(
- 'admin/cms/page/widgets/placeholder_editor.html', context, RequestContext(self.request)))
+ 'admin/cms/page/widgets/placeholder_editor.html', context, RequestContext(self.request)))
@@ -20,6 +20,6 @@ def render(self, context, instance, placeholder):
def icon_src(self, instance):
file_icon = instance.get_icon_url()
if file_icon: return file_icon
- return settings.CMS_MEDIA_URL + u"images/plugins/file.png"
+ return settings.STATIC_URL + u"cms/images/plugins/file.png"
plugin_pool.register_plugin(FilePlugin)
@@ -26,8 +26,8 @@ class File(CMSPlugin):
# CMS_ICON_EXTENSIONS and CMS_ICON_PATH are assumed to be plugin-specific, and not included in cms.settings
# -- they are therefore imported from django.conf.settings
ICON_EXTENSIONS = getattr(settings, "CMS_FILE_ICON_EXTENSIONS", ('gif', 'png'))
- ICON_PATH = getattr(settings, "CMS_FILE_ICON_PATH", os.path.join(settings.CMS_MEDIA_ROOT, "images", "file_icons"))
- ICON_URL = getattr(settings, "CMS_FILE_ICON_URL", "%s%s/%s/" % (settings.CMS_MEDIA_URL, "images", "file_icons"))
+ ICON_PATH = getattr(settings, "CMS_FILE_ICON_PATH", os.path.join(settings.STATIC_ROOT, "cms", "images", "file_icons"))
+ ICON_URL = getattr(settings, "CMS_FILE_ICON_URL", "%s%s/%s/%s/" % (settings.STATIC_URL, "cms", "images", "file_icons"))
def get_icon_url(self):
path_base = os.path.join(self.ICON_PATH, self.get_ext())
@@ -1,5 +1,5 @@
{% load i18n sekizai_tags %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/swfobject.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/swfobject.min.js"></script>{% endaddtoblock %}
{% addtoblock "js" %}
<script type="text/javascript">
//<![CDATA[
@@ -12,7 +12,7 @@
name: 'flash-plugin-name-{{ object.id }}'
};
// replace flash_plugin object through swfobject
- swfobject.embedSWF('{{ object.file.url }}', 'flash-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ CMS_MEDIA_URL }}swf/expressInstall.swf', flashvars, params, attributes);
+ swfobject.embedSWF('{{ object.file.url }}', 'flash-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ STATIC_URL }}cms/swf/expressInstall.swf', flashvars, params, attributes);
})();
//]]>
</script>
@@ -39,11 +39,11 @@
<!-- alternate content -->
{% trans "Missing flash plugin. Please download the latest Adobe Flash Player: " %}<br />
<a href="https://www.adobe.com/go/getflashplayer">
- <img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ CMS_MEDIA_URL }}images/plugins/get_flash_player.gif" />
+ <img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ STATIC_URL }}cms/images/plugins/get_flash_player.gif" />
</a>
<!-- /alternate content -->
<!--[if !IE]>-->
</object>
<!--<![endif]-->
</object>
-</div>
+</div>
@@ -62,6 +62,6 @@ def __call__(self, *args, **kwargs):
return FakeForm(Form, site)
def icon_src(self, instance):
- return settings.CMS_MEDIA_URL + u"images/plugins/link.png"
+ return settings.STATIC_URL + u"cms/images/plugins/link.png"
plugin_pool.register_plugin(LinkPlugin)
@@ -26,6 +26,6 @@ def render(self, context, instance, placeholder):
def icon_src(self, instance):
# TODO - possibly use 'instance' and provide a thumbnail image
- return settings.CMS_MEDIA_URL + u"images/plugins/image.png"
+ return settings.STATIC_URL + u"cms/images/plugins/image.png"
plugin_pool.register_plugin(PicturePlugin)
@@ -36,6 +36,6 @@ def render(self, context, instance, placeholder):
return context
def icon_src(self, instance):
- return settings.CMS_MEDIA_URL + u"images/plugins/snippet.png"
+ return settings.STATIC_URL + u"cms/images/plugins/snippet.png"
plugin_pool.register_plugin(SnippetPlugin)
@@ -61,6 +61,6 @@
#Advantageously replaces WYM_CLASSES and WYM_STYLES
##Prepare url for wymeditor.css
CMS_MEDIA_PATH = getattr(settings, 'CMS_MEDIA_PATH', 'cms/')
-WYM_STYLESHEET_PATH = getattr(settings, 'CMS_MEDIA_URL', ''.join((settings.MEDIA_URL, CMS_MEDIA_PATH)) )
+WYM_STYLESHEET_PATH = getattr(settings, 'WYM_STYLESHEET_PATH', ''.join((settings.STATIC_URL, 'cms')) )
WYM_STYLESHEET = getattr(settings, "WYM_STYLESHEET", '"%scss/wymeditor.css"' % WYM_STYLESHEET_PATH )
@@ -5,12 +5,12 @@
{% for fieldset in adminform %}
{% include "cms/plugins/text_plugin_fieldset.html" %}
{% endfor %}
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/classy.min.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins/cms.base.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/classy.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.base.js"></script>
<script type="text/javascript">
jQuery(document).ready(function ($) {
// initialize security patch
CMS.API.Security.csrf();
});
</script>
-{% endblock %}
+{% endblock %}
@@ -14,7 +14,7 @@
$('#id_{{ name }}').wymeditor({
lang: '{{ language }}',
skin: 'django',
- skinPath: "{{ CMS_MEDIA_URL }}js/wymeditor/skins/django/",
+ skinPath: "{{ STATIC_URL }}cms/js/wymeditor/skins/django/",
updateSelector: 'input[type=submit],',
updateEvent: 'click',
logoHtml: '',
@@ -111,4 +111,4 @@
+ '</li>';
return html;
}
-</script>
+</script>
@@ -30,12 +30,12 @@ def render_additions(self, name, value, attrs=None):
def _media(self):
media = super(TinyMCEEditor, self)._media()
- media.add_js([join(settings.CMS_MEDIA_URL, path) for path in (
+ media.add_js([join(settings.STATIC_URL, 'cms', path) for path in (
'js/tinymce.placeholdereditor.js',
'js/libs/jquery.ui.core.js',
'js/placeholder_editor_registry.js',
)])
- media.add_css({"all":[join(settings.CMS_MEDIA_URL, path) for path in ('css/jquery/cupertino/jquery-ui.css',
+ media.add_css({"all":[join(settings.STATIC_URL, 'cms', path) for path in ('css/jquery/cupertino/jquery-ui.css',
'css/tinymce_toolbar.css')]})
return media
@@ -10,15 +10,15 @@
class WYMEditor(Textarea):
class Media:
- js = [join(settings.CMS_MEDIA_URL, path) for path in (
+ js = [join(settings.STATIC_URL, 'cms', path) for path in (
'wymeditor/jquery.wymeditor.js',
'wymeditor/plugins/resizable/jquery.wymeditor.resizable.js',
'js/wymeditor.placeholdereditor.js',
'js/libs/jquery.ui.core.js',
'js/placeholder_editor_registry.js',
)]
css = {
- 'all': [join(settings.CMS_MEDIA_URL, path) for path in (
+ 'all': [join(settings.STATIC_URL, 'cms', path) for path in (
'css/jquery/cupertino/jquery-ui.css',
)],
}
@@ -43,7 +43,7 @@ def render_additions(self, name, value, attrs=None):
context = {
'name': name,
'language': language,
- 'CMS_MEDIA_URL': settings.CMS_MEDIA_URL,
+ 'STATIC_URL': settings.STATIC_URL,
'WYM_TOOLS': mark_safe(text_settings.WYM_TOOLS),
'WYM_CONTAINERS': mark_safe(text_settings.WYM_CONTAINERS),
'WYM_CLASSES': mark_safe(text_settings.WYM_CLASSES),
@@ -56,4 +56,4 @@ def render_additions(self, name, value, attrs=None):
def render(self, name, value, attrs=None):
return self.render_textarea(name, value, attrs) + \
- self.render_additions(name, value, attrs)
+ self.render_additions(name, value, attrs)
@@ -1,5 +1,5 @@
{% load i18n sekizai_tags %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.tweet.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.tweet.js"></script>{% endaddtoblock %}
{% addtoblock "js" %}
<script type="text/javascript">
//<![CDATA[
@@ -27,4 +27,4 @@
<h2>{{ object.title }} <a href="https://www.twitter.com/{{ object.twitter_user }}" class="twitter-icon">{% trans "Twitter" %}</a></h2>
<div id="twitter-container-{{ object.pk }}"></div>
{% if object.twitter_user %}<p><a href="https://www.twitter.com/{{ object.twitter_user }}" class="twitter-link">{{ object.link_hint }}</a></p>{% endif %}
-</div>
+</div>
@@ -1,5 +1,5 @@
{% load i18n sekizai_tags js %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/swfobject.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/swfobject.min.js"></script>{% endaddtoblock %}
{% addtoblock "js" %}
<script type="text/javascript">
//<![CDATA[
@@ -30,15 +30,15 @@
var attributes = { align: 'middle' };
// load
- swfobject.embedSWF('{{ CMS_MEDIA_URL }}swf/player.swf', 'video-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ CMS_MEDIA_URL }}swf/expressInstall.swf', flashvars, params, attributes);
+ swfobject.embedSWF('{{ STATIC_URL }}cms/swf/player.swf', 'video-plugin-{{ object.id }}', '{{ object.get_width }}', '{{ object.get_height }}', '9', '{{ STATIC_URL }}cms/swf/expressInstall.swf', flashvars, params, attributes);
})();
//]]>
</script>
{% endaddtoblock %}
<div class="plugin_video">
<object id="video-plugin-{{ object.id }}" width="{{ object.get_width }}" height="{{ object.get_height }}" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" >
- <param name="movie" value="{{ CMS_MEDIA_URL }}swf/player.swf"/>
+ <param name="movie" value="{{ STATIC_URL }}cms/swf/player.swf"/>
<param name="allowFullScreen" value="true" />
<param name="allowScriptAccess" value="always" />
<param name="allowFullScreen" value="true" />
@@ -47,7 +47,7 @@
<param name="bgcolor" value="#{{ object.bgcolor }}" />
<param name="flashvars" value="movie={{ object.get_movie }}&amp;{% if object.image %}image={{ object.image.url }}&amp;{% endif %}autoplay={{ object.auto_play|bool }}&amp;loop={{ object.loop|bool }}&amp;autohide={{ object.auto_hide|bool }}&amp;fullscreen={{ object.fullscreen|bool }}&amp;color_text=0x{{ object.textcolor }}&amp;color_seekbar=0x{{ object.seekbarcolor }}&amp;color_loadingbar=0x{{ object.loadingbarcolor }}&amp;color_seekbarbg=0x{{ object.seekbarbgcolor }}&amp;color_button_out=0x{{ object.buttonoutcolor }}&amp;color_button_over=0x{{ object.buttonovercolor }}&amp;color_button_highlight=0x{{ object.buttonhighlightcolor }}" />
<!--[if !IE]>-->
- <object width="{{ object.get_width }}" height="{{ object.get_height }}" data="{{ CMS_MEDIA_URL }}swf/player.swf" type="application/x-shockwave-flash">
+ <object width="{{ object.get_width }}" height="{{ object.get_height }}" data="{{ STATIC_URL }}cms/swf/player.swf" type="application/x-shockwave-flash">
<param name="allowFullScreen" value="true" />
<param name="allowScriptAccess" value="always" />
<param name="allowFullScreen" value="true" />
@@ -59,7 +59,7 @@
<!-- alternate content -->
{% trans "Missing flash plugin. Please download the latest Adobe Flash Player: " %}<br />
<a href="https://www.adobe.com/go/getflashplayer">
- <img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ CMS_MEDIA_URL }}images/plugins/get_flash_player.gif" />
+ <img alt="{% trans 'Get Adobe Flash Player' %}" src="{{ STATIC_URL }}cms/images/plugins/get_flash_player.gif" />
</a>
<!-- /alternate content -->
<!--[if !IE]>-->
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.