Permalink
Browse files

django 1.4 and django-compressor

  • Loading branch information...
1 parent 67afd16 commit 44ec5e3cfb134c3142d6e9d0420aaa0a46b7af89 @peterbe peterbe committed May 29, 2012
Showing with 6 additions and 5 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 .gitmodules
  3. +2 −1 bin/update_site.py
  4. +1 −1 pto/apps/autocomplete/views.py
  5. 0 { → pto/base}/static/css/.gitignore
  6. 0 { → pto/base}/static/css/demo_table_jui.css
  7. 0 { → pto/base}/static/css/examples/main.css
  8. BIN { → pto/base}/static/css/images/asc.gif
  9. BIN { → pto/base}/static/css/images/background.jpg
  10. BIN { → pto/base}/static/css/images/bg.png
  11. BIN { → pto/base}/static/css/images/desc.gif
  12. BIN { → pto/base}/static/css/images/pto.png
  13. BIN { → pto/base}/static/css/images/sort.gif
  14. BIN { → pto/base}/static/css/images/throbber.png
  15. 0 { → pto/base}/static/css/libs/datatable/css/demo_table.css
  16. BIN { → pto/base}/static/css/libs/datatable/images/back_disabled.jpg
  17. BIN { → pto/base}/static/css/libs/datatable/images/back_enabled.jpg
  18. BIN { → pto/base}/static/css/libs/datatable/images/forward_disabled.jpg
  19. BIN { → pto/base}/static/css/libs/datatable/images/forward_enabled.jpg
  20. BIN { → pto/base}/static/css/libs/datatable/images/sort_asc.png
  21. BIN { → pto/base}/static/css/libs/datatable/images/sort_asc_disabled.png
  22. BIN { → pto/base}/static/css/libs/datatable/images/sort_both.png
  23. BIN { → pto/base}/static/css/libs/datatable/images/sort_desc.png
  24. BIN { → pto/base}/static/css/libs/datatable/images/sort_desc_disabled.png
  25. 0 { → pto/base}/static/css/libs/fireworks.css
  26. 0 { → pto/base}/static/css/libs/fullcalendar.css
  27. 0 { → pto/base}/static/css/libs/fullcalendar.print.css
  28. BIN { → pto/base}/static/css/libs/images/ajax-loader.gif
  29. BIN { → pto/base}/static/css/libs/images/ajax-loader.png
  30. BIN { → pto/base}/static/css/libs/images/icons-18-black.png
  31. BIN { → pto/base}/static/css/libs/images/icons-18-white.png
  32. BIN { → pto/base}/static/css/libs/images/icons-36-black.png
  33. BIN { → pto/base}/static/css/libs/images/icons-36-white.png
  34. 0 { → pto/base}/static/css/libs/jquery.mobile-1.0.1.css
  35. 0 { → pto/base}/static/css/libs/jquery.mobile-1.0.1.min.css
  36. 0 { → pto/base}/static/css/libs/jquery.mobile-1.1.0.css
  37. 0 { → pto/base}/static/css/libs/jquery.mobile-1.1.0.min.css
  38. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
  39. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png
  40. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png
  41. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png
  42. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png
  43. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
  44. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
  45. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
  46. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_217bc0_256x240.png
  47. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_2e83ff_256x240.png
  48. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_469bdd_256x240.png
  49. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_6da8d5_256x240.png
  50. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_cd0a0a_256x240.png
  51. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_d8e7f3_256x240.png
  52. BIN { → pto/base}/static/css/libs/jquery_ui/redmond/images/ui-icons_f9bd01_256x240.png
  53. 0 { → pto/base}/static/css/libs/jquery_ui/redmond/jquery-ui-1.8.20.datepicker.autocomplete.dialog.css
  54. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
  55. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_flat_75_ffffff_40x100.png
  56. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
  57. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_glass_65_ffffff_1x400.png
  58. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_glass_75_dadada_1x400.png
  59. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_glass_75_e6e6e6_1x400.png
  60. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_glass_95_fef1ec_1x400.png
  61. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  62. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-icons_222222_256x240.png
  63. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-icons_2e83ff_256x240.png
  64. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-icons_454545_256x240.png
  65. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-icons_888888_256x240.png
  66. BIN { → pto/base}/static/css/pto/jquery-ui-theme/images/ui-icons_cd0a0a_256x240.png
  67. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.accordion.css
  68. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.all.css
  69. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.base.css
  70. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.core.css
  71. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.datepicker.css
  72. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.dialog.css
  73. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.progressbar.css
  74. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.resizable.css
  75. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.slider.css
  76. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.tabs.css
  77. 0 { → pto/base}/static/css/pto/jquery-ui-theme/ui.theme.css
  78. 0 { → pto/base}/static/css/pto/main.css
  79. 0 { → pto/base}/static/css/style.css
  80. 0 { → pto/base}/static/css/style.less
  81. 0 { → pto/base}/static/img/.gitignore
  82. BIN { → pto/base}/static/img/about-calendar-url/google-adding-calendar.png
  83. BIN { → pto/base}/static/img/about-calendar-url/google-click-to-add.png
  84. BIN { → pto/base}/static/img/about-calendar-url/zimbra-adding-calendar.png
  85. BIN { → pto/base}/static/img/about-calendar-url/zimbra-click-to-add.png
  86. BIN { → pto/base}/static/img/blank.gif
  87. BIN { → pto/base}/static/img/calendar-icon.png
  88. BIN { → pto/base}/static/img/duplicate-icon.png
  89. BIN { → pto/base}/static/img/favicon.ico
  90. BIN { → pto/base}/static/img/particles.gif
  91. 0 { → pto/base}/static/js/.gitignore
  92. 0 { → pto/base}/static/js/global.js
  93. BIN { → pto/base}/static/js/libs/audio/boom1.mp3
  94. BIN { → pto/base}/static/js/libs/audio/boom2.mp3
  95. BIN { → pto/base}/static/js/libs/audio/boom3.mp3
  96. BIN { → pto/base}/static/js/libs/audio/boom4.mp3
  97. BIN { → pto/base}/static/js/libs/audio/pop1.mp3
  98. BIN { → pto/base}/static/js/libs/audio/pop2.mp3
  99. BIN { → pto/base}/static/js/libs/audio/pop3.mp3
  100. BIN { → pto/base}/static/js/libs/audio/pop4.mp3
  101. BIN { → pto/base}/static/js/libs/audio/pop5.mp3
  102. BIN { → pto/base}/static/js/libs/audio/pop6.mp3
  103. 0 { → pto/base}/static/js/libs/date.js
  104. 0 { → pto/base}/static/js/libs/fireworks.js
  105. 0 { → pto/base}/static/js/libs/format.js
  106. 0 { → pto/base}/static/js/libs/fullcalendar.js
  107. 0 { → pto/base}/static/js/libs/fullcalendar.min.js
  108. 0 { → pto/base}/static/js/libs/jquery-1.7.2.min.js
  109. 0 { → pto/base}/static/js/libs/jquery-ui-1.8.20.datepicker.autocomplete.dialog.min.js
  110. 0 { → pto/base}/static/js/libs/jquery.cookie.min.js
  111. 0 { → pto/base}/static/js/libs/jquery.dataTables.js
  112. 0 { → pto/base}/static/js/libs/jquery.dataTables.min.js
  113. 0 { → pto/base}/static/js/libs/jquery.mobile-1.1.0.js
  114. 0 { → pto/base}/static/js/libs/jquery.mobile-1.1.0.min.js
  115. 0 { → pto/base}/static/js/libs/soundmanager2-nodebug-jsmin.js
  116. BIN { → pto/base}/static/js/libs/swf/soundmanager2.swf
  117. BIN { → pto/base}/static/js/libs/swf/soundmanager2_flash9.swf
  118. 0 { → pto/base}/static/js/pto/pto.js
  119. +1 −1 vendor
View
@@ -15,7 +15,7 @@ vendor
tmp/*
*~
*.mo
-settings/local*
+pto/settings/local*
*.js.old
TODO
cover/
View
@@ -1,6 +1,6 @@
[submodule "vendor"]
path = vendor
- url = git://github.com/mozilla/playdoh-lib.git
+ url = git://github.com/peterbe/playdoh-lib.git
[submodule "vendor-local/src/python-dateutil"]
path = vendor-local/src/python-dateutil
url = git://github.com/cozi/python-dateutil.git
View
@@ -41,6 +41,7 @@
SVN_UP = "svn update"
COMPILE_MO = "./bin/compile-mo.sh %(localedir)s %(unique)s"
+
EXEC = 'exec'
CHDIR = 'chdir'
@@ -88,7 +89,7 @@ def update_site(env, debug):
(EXEC, GIT_SUBMODULE),
(CHDIR, os.path.join(here)),
(EXEC, 'python2.6 vendor/src/schematic/schematic migrations/'),
- (EXEC, 'python2.6 manage.py compress_assets'),
+ (EXEC, 'python2.6 manage.py collectstatic --noinput'),
]
for cmd, cmd_args in commands:
@@ -20,7 +20,7 @@ def cities(request):
qs = qs.filter(city__istartswith=term)
for each in (qs
.values('city')
- .distinct('city')
+ .distinct()
.order_by('city')):
city = each['city']
data.append(city)
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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 vendor

0 comments on commit 44ec5e3

Please sign in to comment.