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. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
  21. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png
  22. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png
  23. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_glass_50_3baae3_1x400.png
  24. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png
  25. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
  26. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png
  27. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png
  28. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
  29. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_2694e8_256x240.png
  30. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_2e83ff_256x240.png
  31. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_3d80b3_256x240.png
  32. 0 cms/{media → static}/cms/css/jquery/cupertino/images/ui-icons_72a7cf_256x240.png
  33. 0 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. 0 cms/{media → static}/cms/images/bold.gif
  45. 0 cms/{media → static}/cms/images/changelist-filter-button-bg.jpg
  46. 0 cms/{media → static}/cms/images/close.gif
  47. 0 cms/{media → static}/cms/images/cms_toolbar.gif
  48. 0 cms/{media → static}/cms/images/cms_toolbar.png
  49. 0 cms/{media → static}/cms/images/copy.gif
  50. 0 cms/{media → static}/cms/images/cut.gif
  51. 0 cms/{media → static}/cms/images/file_icons/flv.gif
  52. 0 cms/{media → static}/cms/images/file_icons/gif.gif
  53. 0 cms/{media → static}/cms/images/file_icons/html.gif
  54. 0 cms/{media → static}/cms/images/file_icons/java.gif
  55. 0 cms/{media → static}/cms/images/file_icons/jpg.gif
  56. 0 cms/{media → static}/cms/images/file_icons/mp3.png
  57. 0 cms/{media → static}/cms/images/file_icons/ods.png
  58. 0 cms/{media → static}/cms/images/file_icons/odt.png
  59. 0 cms/{media → static}/cms/images/file_icons/pdf.gif
  60. 0 cms/{media → static}/cms/images/file_icons/php.gif
  61. 0 cms/{media → static}/cms/images/file_icons/png.gif
  62. 0 cms/{media → static}/cms/images/file_icons/swf.gif
  63. 0 cms/{media → static}/cms/images/file_icons/tgz.png
  64. 0 cms/{media → static}/cms/images/file_icons/ttf.gif
  65. 0 cms/{media → static}/cms/images/file_icons/txt.gif
  66. 0 cms/{media → static}/cms/images/file_icons/txt.png
  67. 0 cms/{media → static}/cms/images/file_icons/wav.gif
  68. 0 cms/{media → static}/cms/images/file_icons/zip.png
  69. 0 cms/{media → static}/cms/images/icon_addlink.gif
  70. 0 cms/{media → static}/cms/images/icon_deletelink.gif
  71. 0 cms/{media → static}/cms/images/icon_extension.gif
  72. 0 cms/{media → static}/cms/images/icon_pluginedit.gif
  73. 0 cms/{media → static}/cms/images/icons.png
  74. 0 cms/{media/cms/images/plugins → static/cms/images}/image.png
  75. 0 cms/{media → static}/cms/images/indicator.gif
  76. 0 cms/{media → static}/cms/images/italic.gif
  77. 0 cms/{media → static}/cms/images/jquery/accordion-left-act.png
  78. 0 cms/{media → static}/cms/images/jquery/accordion-left-over.png
  79. 0 cms/{media → static}/cms/images/jquery/accordion-left.png
  80. 0 cms/{media → static}/cms/images/jquery/accordion-middle-act.png
  81. 0 cms/{media → static}/cms/images/jquery/accordion-middle-over.png
  82. 0 cms/{media → static}/cms/images/jquery/accordion-middle.png
  83. 0 cms/{media → static}/cms/images/jquery/accordion-right-act.png
  84. 0 cms/{media → static}/cms/images/jquery/accordion-right-over.png
  85. 0 cms/{media → static}/cms/images/jquery/accordion-right.png
  86. 0 cms/{media → static}/cms/images/jquery/default-bg.gif
  87. 0 cms/{media → static}/cms/images/jquery/dialog-e.gif
  88. 0 cms/{media → static}/cms/images/jquery/dialog-n.gif
  89. 0 cms/{media → static}/cms/images/jquery/dialog-ne.gif
  90. 0 cms/{media → static}/cms/images/jquery/dialog-nw.gif
  91. 0 cms/{media → static}/cms/images/jquery/dialog-s.gif
  92. 0 cms/{media → static}/cms/images/jquery/dialog-se.gif
  93. 0 cms/{media → static}/cms/images/jquery/dialog-sw.gif
  94. 0 cms/{media → static}/cms/images/jquery/dialog-title.gif
  95. 0 cms/{media → static}/cms/images/jquery/dialog-titlebar-close-hover.png
  96. 0 cms/{media → static}/cms/images/jquery/dialog-titlebar-close.png
  97. 0 cms/{media → static}/cms/images/jquery/dialog-w.gif
  98. 0 cms/{media/cms/images → static/cms/images/jquery}/nav-bg.gif
  99. 0 cms/{media → static}/cms/images/jquery/resizable-e.gif
  100. 0 cms/{media → static}/cms/images/jquery/resizable-n.gif
  101. 0 cms/{media → static}/cms/images/jquery/resizable-ne.gif
  102. 0 cms/{media → static}/cms/images/jquery/resizable-nw.gif
  103. 0 cms/{media → static}/cms/images/jquery/resizable-s.gif
  104. 0 cms/{media → static}/cms/images/jquery/resizable-se.gif
  105. 0 cms/{media → static}/cms/images/jquery/resizable-sw.gif
  106. 0 cms/{media → static}/cms/images/jquery/resizable-w.gif
  107. 0 cms/{media → static}/cms/images/jquery/slider-bg-1.png
  108. 0 cms/{media → static}/cms/images/jquery/slider-bg-2.png
  109. 0 cms/{media → static}/cms/images/jquery/slider-handle.gif
  110. 0 cms/{media → static}/cms/images/jquery/tabs.png
  111. 0 cms/{media/cms/images/plugins → static/cms/images}/link.png
  112. 0 cms/{media → static}/cms/images/logo.jpg
  113. 0 cms/{media/cms/images/jquery → static/cms/images}/nav-bg.gif
  114. 0 cms/{media → static}/cms/images/page_find.gif
  115. 0 cms/{media → static}/cms/images/pluginlist-delete.png
  116. 0 cms/{media → static}/cms/images/pluginlist-holder-bg.gif
  117. 0 cms/{media → static}/cms/images/plugins/file.png
  118. 0 cms/{media → static}/cms/images/plugins/get_flash_player.gif
  119. 0 cms/{media/cms/images → static/cms/images/plugins}/image.png
  120. 0 cms/{media/cms/images → static/cms/images/plugins}/link.png
  121. 0 cms/{media → static}/cms/images/plugins/snippet.png
  122. 0 cms/{media → static}/cms/images/pony.jpg
  123. 0 cms/{media → static}/cms/images/sitemap-exim.gif
  124. 0 cms/{media → static}/cms/images/sitemap-exlm.gif
  125. 0 cms/{media → static}/cms/images/sitemap-extm.gif
  126. 0 cms/{media → static}/cms/images/sitemap-li-bg.jpg
  127. 0 cms/{media → static}/cms/images/sitemap-li-collapse.gif
  128. 0 cms/{media → static}/cms/images/sitemap-li-drag.gif
  129. 0 cms/{media → static}/cms/images/toolbar/frame_shadow.gif
  130. 0 cms/{media → static}/cms/images/toolbar/icons/icon_admin.png
  131. 0 cms/{media → static}/cms/images/toolbar/icons/icon_child.png
  132. 0 cms/{media → static}/cms/images/toolbar/icons/icon_delete.png
  133. 0 cms/{media → static}/cms/images/toolbar/icons/icon_edit.png
  134. 0 cms/{media → static}/cms/images/toolbar/icons/icon_history.png
  135. 0 cms/{media → static}/cms/images/toolbar/icons/icon_lock.png
  136. 0 cms/{media → static}/cms/images/toolbar/icons/icon_page.png
  137. 0 cms/{media → static}/cms/images/toolbar/icons/icon_sibling.png
  138. 0 cms/{media → static}/cms/images/toolbar/icons/icon_sitemap.png
  139. 0 cms/{media → static}/cms/images/toolbar/icons/icon_template.png
  140. 0 cms/{media → static}/cms/images/toolbar/loader.gif
  141. 0 cms/{media → static}/cms/images/toolbar/sprite_toolbar-ie.png
  142. 0 cms/{media → static}/cms/images/toolbar/sprite_toolbar.png
  143. 0 cms/{media → static}/cms/images/toolbar/toolbar_bg.gif
  144. 0 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. 0 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. 0 cms/{media → static}/cms/jstree/themes/classic/folder.gif
  188. 0 cms/{media → static}/cms/jstree/themes/classic/folderopen.gif
  189. 0 cms/{media → static}/cms/jstree/themes/classic/minus.gif
  190. 0 cms/{media → static}/cms/jstree/themes/classic/plus.gif
  191. 0 cms/{media → static}/cms/jstree/themes/classic/style.css
  192. 0 cms/{media → static}/cms/jstree/themes/default/context.gif
  193. 0 cms/{media → static}/cms/jstree/themes/default/create.png
  194. 0 cms/{media → static}/cms/jstree/themes/default/dot.gif
  195. 0 cms/{media → static}/cms/jstree/themes/default/f.png
  196. 0 cms/{media → static}/cms/jstree/themes/default/fminus.gif
  197. 0 cms/{media → static}/cms/jstree/themes/default/fminus_rtl.gif
  198. 0 cms/{media → static}/cms/jstree/themes/default/fplus.gif
  199. 0 cms/{media → static}/cms/jstree/themes/default/fplus_rtl.gif
  200. 0 cms/{media → static}/cms/jstree/themes/default/lastli.gif
  201. 0 cms/{media → static}/cms/jstree/themes/default/lastli_rtl.gif
  202. 0 cms/{media → static}/cms/jstree/themes/default/li.gif
  203. 0 cms/{media → static}/cms/jstree/themes/default/marker.gif
  204. 0 cms/{media → static}/cms/jstree/themes/default/marker_rtl.gif
  205. 0 cms/{media → static}/cms/jstree/themes/default/plus.gif
  206. 0 cms/{media → static}/cms/jstree/themes/default/remove.gif
  207. 0 cms/{media → static}/cms/jstree/themes/default/remove.png
  208. 0 cms/{media → static}/cms/jstree/themes/default/rename.png
  209. 0 cms/{media → static}/cms/jstree/themes/default/style.css
  210. 0 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. 0 cms/{media → static}/cms/swf/expressInstall.swf
  214. 0 cms/{media → static}/cms/swf/player.swf
  215. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-blockquote.png
  216. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-h1.png
  217. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-h2.png
  218. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-h3.png
  219. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-h4.png
  220. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-h5.png
  221. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-h6.png
  222. 0 cms/{media → static}/cms/wymeditor/iframe/default/lbl-p.png
  223. 0 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. 0 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. 0 cms/{media/cms/wymeditor/skins/twopanels → 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. 0 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. 0 cms/{media/cms/wymeditor/skins/silver → static/cms/wymeditor/skins/minimal}/images/bg.header.gif
  265. 0 ...ia/cms/wymeditor/skins/silver → static/cms/wymeditor/skins/minimal}/images/bg.selector.silver.gif
  266. 0 cms/{media/cms/wymeditor/skins/silver → static/cms/wymeditor/skins/minimal}/images/bg.wymeditor.png
  267. 0 cms/{media/cms/wymeditor/skins/silver → 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. 0 cms/{media/cms/wymeditor/skins/minimal → static/cms/wymeditor/skins/silver}/images/bg.header.gif
  273. 0 ...ia/cms/wymeditor/skins/minimal → static/cms/wymeditor/skins/silver}/images/bg.selector.silver.gif
  274. 0 cms/{media/cms/wymeditor/skins/minimal → static/cms/wymeditor/skins/silver}/images/bg.wymeditor.png
  275. 0 cms/{media/cms/wymeditor/skins/minimal → 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. 0 cms/{media/cms/wymeditor/skins/compact → 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. 0 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
5 cms/admin/pageadmin.py
@@ -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',
View
4 cms/admin/placeholderadmin.py
@@ -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
7 cms/forms/widgets.py
@@ -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)))
View
2 cms/plugins/file/cms_plugins.py
@@ -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)
View
4 cms/plugins/file/models.py
@@ -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())
View
8 cms/plugins/flash/templates/cms/plugins/flash.html
@@ -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>
View
2 cms/plugins/link/cms_plugins.py
@@ -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)
View
2 cms/plugins/picture/cms_plugins.py
@@ -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)
View
2 cms/plugins/snippet/cms_plugins.py
@@ -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)
View
2 cms/plugins/text/settings.py
@@ -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 )
View
6 cms/plugins/text/templates/cms/plugins/text_plugin_change_form.html
@@ -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 %}
View
4 cms/plugins/text/templates/cms/plugins/widgets/wymeditor.html
@@ -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>
View
4 cms/plugins/text/widgets/tinymce_widget.py
@@ -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
View
8 cms/plugins/text/widgets/wymeditor_widget.py
@@ -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)
View
4 cms/plugins/twitter/templates/cms/plugins/twitter_recent_entries.html
@@ -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>
View
10 cms/plugins/video/templates/cms/plugins/video.html
@@ -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]>-->
View
0 cms/media/cms/css/change_form.css → cms/static/cms/css/change_form.css
File renamed without changes.
View
0 cms/media/cms/css/jquery.dialog.css → cms/static/cms/css/jquery.dialog.css
File renamed without changes.
View
0 cms/media/cms/css/jquery.tooltip.css → cms/static/cms/css/jquery.tooltip.css
File renamed without changes.
View
0 ...ui-bg_diagonals-thick_90_eeeeee_40x40.png → ...ui-bg_diagonals-thick_90_eeeeee_40x40.png
File renamed without changes
View
0 ...no/images/ui-bg_flat_15_cd0a0a_40x100.png → ...no/images/ui-bg_flat_15_cd0a0a_40x100.png
File renamed without changes
View
0 ...o/images/ui-bg_glass_100_e4f1fb_1x400.png → ...o/images/ui-bg_glass_100_e4f1fb_1x400.png
File renamed without changes
View
0 ...no/images/ui-bg_glass_50_3baae3_1x400.png → ...no/images/ui-bg_glass_50_3baae3_1x400.png
File renamed without changes
View
0 ...no/images/ui-bg_glass_80_d7ebf9_1x400.png → ...no/images/ui-bg_glass_80_d7ebf9_1x400.png
File renamed without changes
View
0 ...ui-bg_highlight-hard_100_f2f5f7_1x100.png → ...ui-bg_highlight-hard_100_f2f5f7_1x100.png
File renamed without changes
View
0 .../ui-bg_highlight-hard_70_000000_1x100.png → .../ui-bg_highlight-hard_70_000000_1x100.png
File renamed without changes
View
0 ...ui-bg_highlight-soft_100_deedf7_1x100.png → ...ui-bg_highlight-soft_100_deedf7_1x100.png
File renamed without changes
View
0 .../ui-bg_highlight-soft_25_ffef8f_1x100.png → .../ui-bg_highlight-soft_25_ffef8f_1x100.png
File renamed without changes
View
0 ...ertino/images/ui-icons_2694e8_256x240.png → ...ertino/images/ui-icons_2694e8_256x240.png
File renamed without changes
View
0 ...ertino/images/ui-icons_2e83ff_256x240.png → ...ertino/images/ui-icons_2e83ff_256x240.png
File renamed without changes
View
0 ...ertino/images/ui-icons_3d80b3_256x240.png → ...ertino/images/ui-icons_3d80b3_256x240.png
File renamed without changes
View
0 ...ertino/images/ui-icons_72a7cf_256x240.png → ...ertino/images/ui-icons_72a7cf_256x240.png
File renamed without changes
View
0 ...ertino/images/ui-icons_ffffff_256x240.png → ...ertino/images/ui-icons_ffffff_256x240.png
File renamed without changes
View
0 ...ia/cms/css/jquery/cupertino/jquery-ui.css → ...ic/cms/css/jquery/cupertino/jquery-ui.css
File renamed without changes.
View
0 cms/media/cms/css/pages.css → cms/static/cms/css/pages.css
File renamed without changes.
View
0 cms/media/cms/css/plugin_editor.css → cms/static/cms/css/plugin_editor.css
File renamed without changes.
View
0 cms/media/cms/css/plugin_forms.css → cms/static/cms/css/plugin_forms.css
File renamed without changes.
View
0 ...edia/cms/css/plugins/cms.placeholders.css → ...atic/cms/css/plugins/cms.placeholders.css
File renamed without changes.
View
0 cms/media/cms/css/plugins/cms.toolbar.css → cms/static/cms/css/plugins/cms.toolbar.css
File renamed without changes.
View
0 cms/media/cms/css/rte.css → cms/static/cms/css/rte.css
File renamed without changes.
View
0 cms/media/cms/css/tinymce_toolbar.css → cms/static/cms/css/tinymce_toolbar.css
File renamed without changes.
View
0 cms/media/cms/css/toolbar.css → cms/static/cms/css/toolbar.css
File renamed without changes.
View
0 cms/media/cms/css/wymeditor.css → cms/static/cms/css/wymeditor.css
File renamed without changes.
View
0 cms/media/cms/images/bold.gif → cms/static/cms/images/bold.gif
File renamed without changes
View
0 ...ms/images/changelist-filter-button-bg.jpg → ...ms/images/changelist-filter-button-bg.jpg
File renamed without changes
View
0 cms/media/cms/images/close.gif → cms/static/cms/images/close.gif
File renamed without changes
View
0 cms/media/cms/images/cms_toolbar.gif → cms/static/cms/images/cms_toolbar.gif
File renamed without changes
View
0 cms/media/cms/images/cms_toolbar.png → cms/static/cms/images/cms_toolbar.png
File renamed without changes
View
0 cms/media/cms/images/copy.gif → cms/static/cms/images/copy.gif
File renamed without changes
View
0 cms/media/cms/images/cut.gif → cms/static/cms/images/cut.gif
File renamed without changes
View
0 cms/media/cms/images/file_icons/flv.gif → cms/static/cms/images/file_icons/flv.gif
File renamed without changes
View
0 cms/media/cms/images/file_icons/gif.gif → cms/static/cms/images/file_icons/gif.gif
File renamed without changes
View
0 cms/media/cms/images/file_icons/html.gif → cms/static/cms/images/file_icons/html.gif
File renamed without changes
View
0 cms/media/cms/images/file_icons/java.gif → cms/static/cms/images/file_icons/java.gif
File renamed without changes
View
0 cms/media/cms/images/file_icons/jpg.gif → cms/static/cms/images/file_icons/jpg.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/mp3.png → cms/static/cms/images/file_icons/mp3.png
Diff not rendered.
View
0 cms/media/cms/images/file_icons/ods.png → cms/static/cms/images/file_icons/ods.png
Diff not rendered.
View
0 cms/media/cms/images/file_icons/odt.png → cms/static/cms/images/file_icons/odt.png
Diff not rendered.
View
0 cms/media/cms/images/file_icons/pdf.gif → cms/static/cms/images/file_icons/pdf.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/php.gif → cms/static/cms/images/file_icons/php.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/png.gif → cms/static/cms/images/file_icons/png.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/swf.gif → cms/static/cms/images/file_icons/swf.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/tgz.png → cms/static/cms/images/file_icons/tgz.png
Diff not rendered.
View
0 cms/media/cms/images/file_icons/ttf.gif → cms/static/cms/images/file_icons/ttf.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/txt.gif → cms/static/cms/images/file_icons/txt.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/txt.png → cms/static/cms/images/file_icons/txt.png
Diff not rendered.
View
0 cms/media/cms/images/file_icons/wav.gif → cms/static/cms/images/file_icons/wav.gif
Diff not rendered.
View
0 cms/media/cms/images/file_icons/zip.png → cms/static/cms/images/file_icons/zip.png
Diff not rendered.
View
0 cms/media/cms/images/icon_addlink.gif → cms/static/cms/images/icon_addlink.gif
Diff not rendered.
View
0 cms/media/cms/images/icon_deletelink.gif → cms/static/cms/images/icon_deletelink.gif
Diff not rendered.
View
0 cms/media/cms/images/icon_extension.gif → cms/static/cms/images/icon_extension.gif
Diff not rendered.
View
0 cms/media/cms/images/icon_pluginedit.gif → cms/static/cms/images/icon_pluginedit.gif
Diff not rendered.
View
0 cms/media/cms/images/icons.png → cms/static/cms/images/icons.png
Diff not rendered.
View
0 cms/media/cms/images/plugins/image.png → cms/static/cms/images/image.png
Diff not rendered.
View
0 cms/media/cms/images/indicator.gif → cms/static/cms/images/indicator.gif
Diff not rendered.
View
0 cms/media/cms/images/italic.gif → cms/static/cms/images/italic.gif
Diff not rendered.
View
0 .../cms/images/jquery/accordion-left-act.png → .../cms/images/jquery/accordion-left-act.png
Diff not rendered.
View
0 ...cms/images/jquery/accordion-left-over.png → ...cms/images/jquery/accordion-left-over.png
Diff not rendered.
View
0 ...edia/cms/images/jquery/accordion-left.png → ...atic/cms/images/jquery/accordion-left.png
Diff not rendered.
View
0 ...ms/images/jquery/accordion-middle-act.png → ...ms/images/jquery/accordion-middle-act.png
Diff not rendered.
View
0 ...s/images/jquery/accordion-middle-over.png → ...s/images/jquery/accordion-middle-over.png
Diff not rendered.
View
0 ...ia/cms/images/jquery/accordion-middle.png → ...ic/cms/images/jquery/accordion-middle.png
Diff not rendered.
View
0 ...cms/images/jquery/accordion-right-act.png → ...cms/images/jquery/accordion-right-act.png
Diff not rendered.
View
0 ...ms/images/jquery/accordion-right-over.png → ...ms/images/jquery/accordion-right-over.png
Diff not rendered.
View
0 ...dia/cms/images/jquery/accordion-right.png → ...tic/cms/images/jquery/accordion-right.png
Diff not rendered.
View
0 cms/media/cms/images/jquery/default-bg.gif → cms/static/cms/images/jquery/default-bg.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-e.gif → cms/static/cms/images/jquery/dialog-e.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-n.gif → cms/static/cms/images/jquery/dialog-n.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-ne.gif → cms/static/cms/images/jquery/dialog-ne.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-nw.gif → cms/static/cms/images/jquery/dialog-nw.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-s.gif → cms/static/cms/images/jquery/dialog-s.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-se.gif → cms/static/cms/images/jquery/dialog-se.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-sw.gif → cms/static/cms/images/jquery/dialog-sw.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-title.gif → ...static/cms/images/jquery/dialog-title.gif
Diff not rendered.
View
0 ...es/jquery/dialog-titlebar-close-hover.png → ...es/jquery/dialog-titlebar-close-hover.png
Diff not rendered.
View
0 ...s/images/jquery/dialog-titlebar-close.png → ...s/images/jquery/dialog-titlebar-close.png
Diff not rendered.
View
0 cms/media/cms/images/jquery/dialog-w.gif → cms/static/cms/images/jquery/dialog-w.gif
Diff not rendered.
View
0 cms/media/cms/images/nav-bg.gif → cms/static/cms/images/jquery/nav-bg.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-e.gif → cms/static/cms/images/jquery/resizable-e.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-n.gif → cms/static/cms/images/jquery/resizable-n.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-ne.gif → ...static/cms/images/jquery/resizable-ne.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-nw.gif → ...static/cms/images/jquery/resizable-nw.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-s.gif → cms/static/cms/images/jquery/resizable-s.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-se.gif → ...static/cms/images/jquery/resizable-se.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-sw.gif → ...static/cms/images/jquery/resizable-sw.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/resizable-w.gif → cms/static/cms/images/jquery/resizable-w.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/slider-bg-1.png → cms/static/cms/images/jquery/slider-bg-1.png
Diff not rendered.
View
0 cms/media/cms/images/jquery/slider-bg-2.png → cms/static/cms/images/jquery/slider-bg-2.png
Diff not rendered.
View
0 ...media/cms/images/jquery/slider-handle.gif → ...tatic/cms/images/jquery/slider-handle.gif
Diff not rendered.
View
0 cms/media/cms/images/jquery/tabs.png → cms/static/cms/images/jquery/tabs.png
Diff not rendered.
View
0 cms/media/cms/images/plugins/link.png → cms/static/cms/images/link.png
Diff not rendered.
View
0 cms/media/cms/images/logo.jpg → cms/static/cms/images/logo.jpg
Diff not rendered.
View
0 cms/media/cms/images/jquery/nav-bg.gif → cms/static/cms/images/nav-bg.gif
Diff not rendered.
View
0 cms/media/cms/images/page_find.gif → cms/static/cms/images/page_find.gif
Diff not rendered.
View
0 cms/media/cms/images/pluginlist-delete.png → cms/static/cms/images/pluginlist-delete.png
Diff not rendered.
View
0 ...media/cms/images/pluginlist-holder-bg.gif → ...tatic/cms/images/pluginlist-holder-bg.gif
Diff not rendered.
View
0 cms/media/cms/images/plugins/file.png → cms/static/cms/images/plugins/file.png
Diff not rendered.
View
0 ...a/cms/images/plugins/get_flash_player.gif → ...c/cms/images/plugins/get_flash_player.gif
Diff not rendered.
View
0 cms/media/cms/images/image.png → cms/static/cms/images/plugins/image.png
Diff not rendered.
View
0 cms/media/cms/images/link.png → cms/static/cms/images/plugins/link.png
Diff not rendered.
View
0 cms/media/cms/images/plugins/snippet.png → cms/static/cms/images/plugins/snippet.png
Diff not rendered.
View
0 cms/media/cms/images/pony.jpg → cms/static/cms/images/pony.jpg
Diff not rendered.
View
0 cms/media/cms/images/sitemap-exim.gif → cms/static/cms/images/sitemap-exim.gif
Diff not rendered.
View
0 cms/media/cms/images/sitemap-exlm.gif → cms/static/cms/images/sitemap-exlm.gif
Diff not rendered.
View
0 cms/media/cms/images/sitemap-extm.gif → cms/static/cms/images/sitemap-extm.gif
Diff not rendered.
View
0 cms/media/cms/images/sitemap-li-bg.jpg → cms/static/cms/images/sitemap-li-bg.jpg
Diff not rendered.
View
0 cms/media/cms/images/sitemap-li-collapse.gif → ...static/cms/images/sitemap-li-collapse.gif
Diff not rendered.
View
0 cms/media/cms/images/sitemap-li-drag.gif → cms/static/cms/images/sitemap-li-drag.gif
Diff not rendered.
View
0 ...media/cms/images/toolbar/frame_shadow.gif → ...tatic/cms/images/toolbar/frame_shadow.gif
Diff not rendered.
View
0 ...a/cms/images/toolbar/icons/icon_admin.png → ...c/cms/images/toolbar/icons/icon_admin.png
Diff not rendered.
View
0 ...a/cms/images/toolbar/icons/icon_child.png → ...c/cms/images/toolbar/icons/icon_child.png
Diff not rendered.
View
0 .../cms/images/toolbar/icons/icon_delete.png → .../cms/images/toolbar/icons/icon_delete.png
Diff not rendered.
View
0 ...ia/cms/images/toolbar/icons/icon_edit.png → ...ic/cms/images/toolbar/icons/icon_edit.png
Diff not rendered.
View
0 ...cms/images/toolbar/icons/icon_history.png → ...cms/images/toolbar/icons/icon_history.png
Diff not rendered.
View
0 ...ia/cms/images/toolbar/icons/icon_lock.png → ...ic/cms/images/toolbar/icons/icon_lock.png
Diff not rendered.
View
0 ...ia/cms/images/toolbar/icons/icon_page.png → ...ic/cms/images/toolbar/icons/icon_page.png
Diff not rendered.
View
0 ...cms/images/toolbar/icons/icon_sibling.png → ...cms/images/toolbar/icons/icon_sibling.png
Diff not rendered.
View
0 ...cms/images/toolbar/icons/icon_sitemap.png → ...cms/images/toolbar/icons/icon_sitemap.png
Diff not rendered.
View
0 ...ms/images/toolbar/icons/icon_template.png → ...ms/images/toolbar/icons/icon_template.png
Diff not rendered.
View
0 cms/media/cms/images/toolbar/loader.gif → cms/static/cms/images/toolbar/loader.gif
Diff not rendered.
View
0 .../cms/images/toolbar/sprite_toolbar-ie.png → .../cms/images/toolbar/sprite_toolbar-ie.png
Diff not rendered.
View
0 ...dia/cms/images/toolbar/sprite_toolbar.png → ...tic/cms/images/toolbar/sprite_toolbar.png
Diff not rendered.
View
0 cms/media/cms/images/toolbar/toolbar_bg.gif → cms/static/cms/images/toolbar/toolbar_bg.gif
Diff not rendered.
View
0 cms/media/cms/images/unordered.gif → cms/static/cms/images/unordered.gif
Diff not rendered.
View
0 cms/media/cms/js/change_form.js → cms/static/cms/js/change_form.js
File renamed without changes.
View
0 cms/media/cms/js/change_list.js → cms/static/cms/js/change_list.js
File renamed without changes.
View
0 cms/media/cms/js/csrf.js → cms/static/cms/js/csrf.js
File renamed without changes.
View
0 cms/media/cms/js/libs/classy.min.js → cms/static/cms/js/libs/classy.min.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.bind.js → cms/static/cms/js/libs/jquery.bind.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.cookie.js → cms/static/cms/js/libs/jquery.cookie.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.form.js → cms/static/cms/js/libs/jquery.form.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.functional.js → cms/static/cms/js/libs/jquery.functional.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.livequery.js → cms/static/cms/js/libs/jquery.livequery.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.query.js → cms/static/cms/js/libs/jquery.query.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.tweet.js → cms/static/cms/js/libs/jquery.tweet.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.ui.checkbox.js → cms/static/cms/js/libs/jquery.ui.checkbox.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.ui.core.js → cms/static/cms/js/libs/jquery.ui.core.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.ui.dialog.js → cms/static/cms/js/libs/jquery.ui.dialog.js
File renamed without changes.
View
0 ...dia/cms/js/libs/jquery.ui.effects.core.js → ...tic/cms/js/libs/jquery.ui.effects.core.js
File renamed without changes.
View
0 ...ms/js/libs/jquery.ui.effects.highlight.js → ...ms/js/libs/jquery.ui.effects.highlight.js
File renamed without changes.
View
0 cms/media/cms/js/libs/jquery.ui.sortable.js → cms/static/cms/js/libs/jquery.ui.sortable.js
File renamed without changes.
View
0 cms/media/cms/js/libs/swfobject.min.js → cms/static/cms/js/libs/swfobject.min.js
File renamed without changes.
View
0 ...dia/cms/js/placeholder_editor_registry.js → ...tic/cms/js/placeholder_editor_registry.js
File renamed without changes.
View
0 cms/media/cms/js/plugin_editor.js → cms/static/cms/js/plugin_editor.js
File renamed without changes.
View
0 cms/media/cms/js/plugins/admincompat.js → cms/static/cms/js/plugins/admincompat.js
File renamed without changes.
View
0 cms/media/cms/js/plugins/cms.base.js → cms/static/cms/js/plugins/cms.base.js
File renamed without changes.
View
0 cms/media/cms/js/plugins/cms.placeholders.js → ...static/cms/js/plugins/cms.placeholders.js
File renamed without changes.
View
0 cms/media/cms/js/plugins/cms.toolbar.js → cms/static/cms/js/plugins/cms.toolbar.js
File renamed without changes.
View
0 ...media/cms/js/tinymce.placeholdereditor.js → ...tatic/cms/js/tinymce.placeholdereditor.js
File renamed without changes.
View
0 ...dia/cms/js/wymeditor.placeholdereditor.js → ...tic/cms/js/wymeditor.placeholdereditor.js
File renamed without changes.
View
0 ...a/cms/js/wymeditor/skins/django/icons.png → ...c/cms/js/wymeditor/skins/django/icons.png
Diff not rendered.
View
0 ...ia/cms/js/wymeditor/skins/django/skin.css → ...ic/cms/js/wymeditor/skins/django/skin.css
File renamed without changes.
View
0 ...dia/cms/js/wymeditor/skins/django/skin.js → ...tic/cms/js/wymeditor/skins/django/skin.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/_all.js → cms/static/cms/jstree/_lib/_all.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/css.js → cms/static/cms/jstree/_lib/css.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.cookie.js → cms/static/cms/jstree/_lib/jquery.cookie.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.hotkeys.js → cms/static/cms/jstree/_lib/jquery.hotkeys.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.js → cms/static/cms/jstree/_lib/jquery.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.listen.js → cms/static/cms/jstree/_lib/jquery.listen.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.log.js → cms/static/cms/jstree/_lib/jquery.log.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.metadata.js → ...static/cms/jstree/_lib/jquery.metadata.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/jquery.xslt.js → cms/static/cms/jstree/_lib/jquery.xslt.js
File renamed without changes.
View
0 cms/media/cms/jstree/_lib/sarissa.js → cms/static/cms/jstree/_lib/sarissa.js
File renamed without changes.
View
0 ...ia/cms/jstree/_lib/sarissa_ieemu_xpath.js → ...ic/cms/jstree/_lib/sarissa_ieemu_xpath.js
File renamed without changes.
View
0 cms/media/cms/jstree/flat.xsl → cms/static/cms/jstree/flat.xsl
File renamed without changes.
View
0 cms/media/cms/jstree/nested.xsl → cms/static/cms/jstree/nested.xsl
File renamed without changes.
View
0 ...edia/cms/jstree/themes/classic/folder.gif → ...atic/cms/jstree/themes/classic/folder.gif
Diff not rendered.
View
0 .../cms/jstree/themes/classic/folderopen.gif → .../cms/jstree/themes/classic/folderopen.gif
Diff not rendered.
View
0 ...media/cms/jstree/themes/classic/minus.gif → ...tatic/cms/jstree/themes/classic/minus.gif
Diff not rendered.
View
0 cms/media/cms/jstree/themes/classic/plus.gif → ...static/cms/jstree/themes/classic/plus.gif
Diff not rendered.
View
0 ...media/cms/jstree/themes/classic/style.css → ...tatic/cms/jstree/themes/classic/style.css
File renamed without changes.
View
0 ...dia/cms/jstree/themes/default/context.gif → ...tic/cms/jstree/themes/default/context.gif
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/create.png → ...atic/cms/jstree/themes/default/create.png
Diff not rendered.
View
0 cms/media/cms/jstree/themes/default/dot.gif → cms/static/cms/jstree/themes/default/dot.gif
Diff not rendered.
View
0 cms/media/cms/jstree/themes/default/f.png → cms/static/cms/jstree/themes/default/f.png
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/fminus.gif → ...atic/cms/jstree/themes/default/fminus.gif
Diff not rendered.
View
0 .../cms/jstree/themes/default/fminus_rtl.gif → .../cms/jstree/themes/default/fminus_rtl.gif
Diff not rendered.
View
0 ...media/cms/jstree/themes/default/fplus.gif → ...tatic/cms/jstree/themes/default/fplus.gif
Diff not rendered.
View
0 ...a/cms/jstree/themes/default/fplus_rtl.gif → ...c/cms/jstree/themes/default/fplus_rtl.gif
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/lastli.gif → ...atic/cms/jstree/themes/default/lastli.gif
Diff not rendered.
View
0 .../cms/jstree/themes/default/lastli_rtl.gif → .../cms/jstree/themes/default/lastli_rtl.gif
Diff not rendered.
View
0 cms/media/cms/jstree/themes/default/li.gif → cms/static/cms/jstree/themes/default/li.gif
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/marker.gif → ...atic/cms/jstree/themes/default/marker.gif
Diff not rendered.
View
0 .../cms/jstree/themes/default/marker_rtl.gif → .../cms/jstree/themes/default/marker_rtl.gif
Diff not rendered.
View
0 cms/media/cms/jstree/themes/default/plus.gif → ...static/cms/jstree/themes/default/plus.gif
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/remove.gif → ...atic/cms/jstree/themes/default/remove.gif
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/remove.png → ...atic/cms/jstree/themes/default/remove.png
Diff not rendered.
View
0 ...edia/cms/jstree/themes/default/rename.png → ...atic/cms/jstree/themes/default/rename.png
Diff not rendered.
View
0 ...media/cms/jstree/themes/default/style.css → ...tatic/cms/jstree/themes/default/style.css
File renamed without changes.
View
0 ...ia/cms/jstree/themes/default/throbber.gif → ...ic/cms/jstree/themes/default/throbber.gif
Diff not rendered.
View
0 cms/media/cms/jstree/tree_component.css → cms/static/cms/jstree/tree_component.css
File renamed without changes.
View
0 cms/media/cms/jstree/tree_component.js → cms/static/cms/jstree/tree_component.js
File renamed without changes.
View
0 cms/media/cms/swf/expressInstall.swf → cms/static/cms/swf/expressInstall.swf
File renamed without changes.
View
0 cms/media/cms/swf/player.swf → cms/static/cms/swf/player.swf
File renamed without changes.
View
0 ...meditor/iframe/default/lbl-blockquote.png → ...meditor/iframe/default/lbl-blockquote.png
Diff not rendered.
View
0 ...a/cms/wymeditor/iframe/default/lbl-h1.png → ...c/cms/wymeditor/iframe/default/lbl-h1.png
Diff not rendered.
View
0 ...a/cms/wymeditor/iframe/default/lbl-h2.png → ...c/cms/wymeditor/iframe/default/lbl-h2.png
Diff not rendered.
View
0 ...a/cms/wymeditor/iframe/default/lbl-h3.png → ...c/cms/wymeditor/iframe/default/lbl-h3.png
Diff not rendered.
View
0 ...a/cms/wymeditor/iframe/default/lbl-h4.png → ...c/cms/wymeditor/iframe/default/lbl-h4.png
Diff not rendered.
View
0 ...a/cms/wymeditor/iframe/default/lbl-h5.png → ...c/cms/wymeditor/iframe/default/lbl-h5.png
Diff not rendered.
View
0 ...a/cms/wymeditor/iframe/default/lbl-h6.png → ...c/cms/wymeditor/iframe/default/lbl-h6.png
Diff not rendered.
View
0 ...ia/cms/wymeditor/iframe/default/lbl-p.png → ...ic/cms/wymeditor/iframe/default/lbl-p.png
Diff not rendered.
View
0 .../cms/wymeditor/iframe/default/lbl-pre.png → .../cms/wymeditor/iframe/default/lbl-pre.png
Diff not rendered.
View
0 ...ms/wymeditor/iframe/default/wymiframe.css → ...ms/wymeditor/iframe/default/wymiframe.css
File renamed without changes.
View
0 ...s/wymeditor/iframe/default/wymiframe.html → ...s/wymeditor/iframe/default/wymiframe.html
File renamed without changes.
View
0 cms/media/cms/wymeditor/jquery.wymeditor.js → cms/static/cms/wymeditor/jquery.wymeditor.js
File renamed without changes.
View
0 ...dia/cms/wymeditor/jquery.wymeditor.min.js → ...tic/cms/wymeditor/jquery.wymeditor.min.js
File renamed without changes.
View
0 ...ia/cms/wymeditor/jquery.wymeditor.pack.js → ...ic/cms/wymeditor/jquery.wymeditor.pack.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/bg.js → cms/static/cms/wymeditor/lang/bg.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/ca.js → cms/static/cms/wymeditor/lang/ca.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/cs.js → cms/static/cms/wymeditor/lang/cs.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/de.js → cms/static/cms/wymeditor/lang/de.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/en.js → cms/static/cms/wymeditor/lang/en.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/es.js → cms/static/cms/wymeditor/lang/es.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/fa.js → cms/static/cms/wymeditor/lang/fa.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/fi.js → cms/static/cms/wymeditor/lang/fi.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/fr.js → cms/static/cms/wymeditor/lang/fr.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/he.js → cms/static/cms/wymeditor/lang/he.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/hr.js → cms/static/cms/wymeditor/lang/hr.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/hu.js → cms/static/cms/wymeditor/lang/hu.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/it.js → cms/static/cms/wymeditor/lang/it.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/nb.js → cms/static/cms/wymeditor/lang/nb.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/nl.js → cms/static/cms/wymeditor/lang/nl.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/nn.js → cms/static/cms/wymeditor/lang/nn.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/pl.js → cms/static/cms/wymeditor/lang/pl.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/pt-br.js → cms/static/cms/wymeditor/lang/pt-br.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/pt.js → cms/static/cms/wymeditor/lang/pt.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/ru.js → cms/static/cms/wymeditor/lang/ru.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/sv.js → cms/static/cms/wymeditor/lang/sv.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/tr.js → cms/static/cms/wymeditor/lang/tr.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/lang/zh_cn.js → cms/static/cms/wymeditor/lang/zh_cn.js
File renamed without changes.
View
0 ...r/plugins/embed/jquery.wymeditor.embed.js → ...r/plugins/embed/jquery.wymeditor.embed.js
File renamed without changes.
View
0 ...or/plugins/fullscreen/icon_fullscreen.gif → ...or/plugins/fullscreen/icon_fullscreen.gif
Diff not rendered.
View
0 ...fullscreen/jquery.wymeditor.fullscreen.js → ...fullscreen/jquery.wymeditor.fullscreen.js
File renamed without changes.
View
0 ...hovertools/jquery.wymeditor.hovertools.js → ...hovertools/jquery.wymeditor.hovertools.js
File renamed without changes.
View
0 ...s/resizable/jquery.wymeditor.resizable.js → ...s/resizable/jquery.wymeditor.resizable.js
File renamed without changes.
View
0 ...ms/wymeditor/plugins/resizable/readme.txt → ...ms/wymeditor/plugins/resizable/readme.txt
File renamed without changes.
View
0 ...a/cms/wymeditor/skins/twopanels/icons.png → ...tic/cms/wymeditor/skins/compact/icons.png
Diff not rendered.
View
0 ...edia/cms/wymeditor/skins/compact/skin.css → ...atic/cms/wymeditor/skins/compact/skin.css
File renamed without changes.
View
0 ...media/cms/wymeditor/skins/compact/skin.js → ...tatic/cms/wymeditor/skins/compact/skin.js
File renamed without changes.
View
0 ...dia/cms/wymeditor/skins/default/icons.png → ...tic/cms/wymeditor/skins/default/icons.png
Diff not rendered.
View
0 ...edia/cms/wymeditor/skins/default/skin.css → ...atic/cms/wymeditor/skins/default/skin.css
File renamed without changes.
View
0 ...media/cms/wymeditor/skins/default/skin.js → ...tatic/cms/wymeditor/skins/default/skin.js
File renamed without changes.
View
0 ...meditor/skins/silver/images/bg.header.gif → ...editor/skins/minimal/images/bg.header.gif
Diff not rendered.
View
0 ...kins/silver/images/bg.selector.silver.gif → ...ins/minimal/images/bg.selector.silver.gif
Diff not rendered.
View
0 ...itor/skins/silver/images/bg.wymeditor.png → ...tor/skins/minimal/images/bg.wymeditor.png
Diff not rendered.
View
0 ...itor/skins/silver/images/icons.silver.gif → ...tor/skins/minimal/images/icons.silver.gif
Diff not rendered.
View
0 ...edia/cms/wymeditor/skins/minimal/skin.css → ...atic/cms/wymeditor/skins/minimal/skin.css
File renamed without changes.
View
0 ...media/cms/wymeditor/skins/minimal/skin.js → ...tatic/cms/wymeditor/skins/minimal/skin.js
File renamed without changes.
View
0 cms/media/cms/wymeditor/skins/silver/COPYING → ...static/cms/wymeditor/skins/silver/COPYING
File renamed without changes.
View
0 cms/media/cms/wymeditor/skins/silver/README → cms/static/cms/wymeditor/skins/silver/README
File renamed without changes.
View
0 ...editor/skins/minimal/images/bg.header.gif → ...meditor/skins/silver/images/bg.header.gif
Diff not rendered.
View
0 ...ins/minimal/images/bg.selector.silver.gif → ...kins/silver/images/bg.selector.silver.gif
Diff not rendered.
View
0 ...tor/skins/minimal/images/bg.wymeditor.png → ...itor/skins/silver/images/bg.wymeditor.png
Diff not rendered.
View
0 ...tor/skins/minimal/images/icons.silver.gif → ...itor/skins/silver/images/icons.silver.gif
Diff not rendered.
View
0 ...media/cms/wymeditor/skins/silver/skin.css → ...tatic/cms/wymeditor/skins/silver/skin.css
File renamed without changes.
View
0 cms/media/cms/wymeditor/skins/silver/skin.js → ...static/cms/wymeditor/skins/silver/skin.js
File renamed without changes.
View
0 ...dia/cms/wymeditor/skins/compact/icons.png → ...c/cms/wymeditor/skins/twopanels/icons.png
Diff not rendered.
View
0 ...ia/cms/wymeditor/skins/twopanels/skin.css → ...ic/cms/wymeditor/skins/twopanels/skin.css
File renamed without changes.
View
0 ...dia/cms/wymeditor/skins/twopanels/skin.js → ...tic/cms/wymeditor/skins/twopanels/skin.js
File renamed without changes.
View
0 ...ia/cms/wymeditor/skins/wymeditor_icon.png → ...ic/cms/wymeditor/skins/wymeditor_icon.png
Diff not rendered.
View
4 cms/templates/admin/cms/page/change_form.html
@@ -4,11 +4,11 @@
{% block extrahead %}
{{ block.super }}
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/csrf.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/csrf.js"></script>
<script type="text/javascript" src="{% url admin:jsi18n %}"></script>
{% if not add %}
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/change_form.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/change_form.js"></script>
{% endif %}
<script type="text/javascript" src="{% admin_media_prefix %}js/urlify.js"></script>
View
40 cms/templates/admin/cms/page/change_list.html
@@ -12,32 +12,32 @@
{% block coltype %}flex{% endblock %}
{% block extrahead %}
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}css/pages.css"/>
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}jstree/tree_component.css" />
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}css/jquery.dialog.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/pages.css"/>
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/jstree/tree_component.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/jquery.dialog.css" />
{{ block.super }}
<script type="text/javascript" src="{% admin_media_prefix %}js/jquery.min.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/csrf.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.livequery.js"></script>
-
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.core.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.bind.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.checkbox.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.effects.core.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.effects.highlight.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.form.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}jstree/_lib/_all.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}jstree/tree_component.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.ui.dialog.js"></script>
-<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.functional.js"></script>
-<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="{{ CMS_MEDIA_URL }}js/change_list.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/csrf.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.livequery.js"></script>
+
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.core.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.bind.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.checkbox.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.effects.core.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.effects.highlight.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.form.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/jstree/_lib/_all.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/jstree/tree_component.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.ui.dialog.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.functional.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" src="{{ STATIC_URL }}cms/js/change_list.js"></script>
{% if cl.is_filtered %}
-<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}jstree/themes/default/style.css" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/jstree/themes/default/style.css" />
{% endif %}
{% endblock %}
View
2 cms/templates/admin/cms/page/plugin_forms_history.html
@@ -18,4 +18,4 @@
})(jQuery);
//]]>
</script>
-{% endblock %}
+{% endblock %}
View
8 cms/templates/cms/new.html
@@ -43,7 +43,7 @@
<body>
<div id="main">
<div class="box-left">
- <p><img src="{{ CMS_MEDIA_URL }}images/pony.jpg" alt="" />&nbsp;</p>
+ <p><img src="{{ STATIC_URL }}cms/images/pony.jpg" alt="" />&nbsp;</p>
</div>
<div class="box-right">
<h1>Welcome to the django CMS!<br />Here is what to do next:</h1>
@@ -58,12 +58,12 @@
</div>
<div class="clear"></div>
<p class="foot padding-top">
- If you don't see the django CMS logo at the end of this line make sure you linked the <code>cms/media</code> folder
- to your media files: <img src="{{ CMS_MEDIA_URL }}images/logo.jpg" alt="here should be a logo" height="20" /></p>
+ If you don't see the django CMS logo at the end of this line make sure you linked the <code>cms/static</code> folder
+ to your static files: <img src="{{ STATIC_URL }}cms/images/logo.jpg" alt="here should be a logo" height="20" /></p>
<p class="foot">
You're seeing this message because you have <code>DEBUG = True</code> in your
django settings file and haven't added any pages yet. Get to work!"
</p>
</div>
</body>
-</html>
+</html>
View
16 cms/templates/cms/toolbar/toolbar.html
@@ -1,12 +1,12 @@
{% load i18n adminmedia sekizai_tags %}
{% addtoblock "js" %}<script type="text/javascript" src="{% admin_media_prefix %}js/jquery.min.js"></script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/classy.min.js"></script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/libs/jquery.cookie.js"></script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins/cms.base.js"></script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins/cms.toolbar.js"></script>{% endaddtoblock %}
-{% addtoblock "js" %}<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins/cms.placeholders.js"></script>{% endaddtoblock %}
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}css/plugins/cms.toolbar.css?v1" media="all" />{% endaddtoblock %}
-{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ CMS_MEDIA_URL }}css/plugins/cms.placeholders.css?v1" media="all" />{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/classy.min.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/libs/jquery.cookie.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.base.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.toolbar.js"></script>{% endaddtoblock %}
+{% addtoblock "js" %}<script type="text/javascript" src="{{ STATIC_URL }}cms/js/plugins/cms.placeholders.js"></script>{% endaddtoblock %}
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/plugins/cms.toolbar.css?v1" media="all" />{% endaddtoblock %}
+{% addtoblock "css" %}<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}cms/css/plugins/cms.placeholders.css?v1" media="all" />{% endaddtoblock %}
{% addtoblock "js" %}
<script type="text/javascript">
//<![CDATA[
@@ -87,4 +87,4 @@
<!-- item: html - login -->
{% include "cms/toolbar/items/login.html" %}
-</div>
+</div>
View
67 cms/tests/plugins.py
@@ -24,6 +24,7 @@
from django.contrib.auth.models import User
from django.core.exceptions import ImproperlyConfigured
from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.management import call_command
from django.forms.widgets import Media
from django.test.testcases import TestCase
from project.pluginapp.models import Article, Section
@@ -333,38 +334,7 @@ def test_inheritplugin_media(self):
self.client.logout()
response = self.client.get(page.get_absolute_url())
</