Permalink
Browse files

Merge pull request #10 from wanderer/rideshare

merged the ridesharing code
  • Loading branch information...
2 parents 514b8ac + 8cba617 commit a9d744b24eef2f98ef952e867dea75d1e48c155e Justine Alexandra Roberts Tunney committed Aug 17, 2012
Showing with 3,158 additions and 28,199 deletions.
  1. +13 −27 occupywallst/admin.py
  2. +0 −18 occupywallst/forms.py
  3. BIN ...query-ui/development-bundle/themes/base → css/custom-theme}/images/ui-bg_flat_0_aaaaaa_40x100.png
  4. BIN ...uery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-bg_flat_75_ffffff_40x100.png
  5. BIN ...uery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-bg_glass_55_fbf9ee_1x400.png
  6. BIN ...development-bundle/themes/ui-lightness → css/custom-theme}/images/ui-bg_glass_65_ffffff_1x400.png
  7. BIN ...uery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-bg_glass_75_dadada_1x400.png
  8. BIN ...uery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-bg_glass_75_e6e6e6_1x400.png
  9. BIN ...uery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-bg_glass_95_fef1ec_1x400.png
  10. BIN ...evelopment-bundle/themes/base → css/custom-theme}/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  11. BIN ...-ui/development-bundle/themes/ui-lightness → css/custom-theme}/images/ui-icons_222222_256x240.png
  12. BIN .../{jquery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-icons_2e83ff_256x240.png
  13. BIN ...ghtness/images/ui-icons_ffffff_256x240.png → css/custom-theme/images/ui-icons_454545_256x240.png}
  14. BIN ...ghtness/images/ui-icons_222222_256x240.png → css/custom-theme/images/ui-icons_888888_256x240.png}
  15. BIN .../{jquery-ui/development-bundle/themes/base → css/custom-theme}/images/ui-icons_cd0a0a_256x240.png
  16. +233 −55 ...y-ui/css/ui-lightness/jquery-ui-1.8.12.custom.css → css/custom-theme/jquery-ui-1.8.23.custom.css}
  17. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  18. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  19. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  20. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  21. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  22. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
  23. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  24. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  25. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  26. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-icons_228ef1_256x240.png
  27. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-icons_ef8c08_256x240.png
  28. BIN occupywallst/media/jquery-ui/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
  29. +0 −30 occupywallst/media/jquery-ui/development-bundle/AUTHORS.txt
  30. +0 −278 occupywallst/media/jquery-ui/development-bundle/GPL-LICENSE.txt
  31. +0 −25 occupywallst/media/jquery-ui/development-bundle/MIT-LICENSE.txt
  32. +0 −36 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/alt-field.html
  33. +0 −58 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/animation.html
  34. +0 −35 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/buttonbar.html
  35. +0 −47 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/date-formats.html
  36. +0 −49 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/date-range.html
  37. +0 −33 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/default.html
  38. +0 −36 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/dropdown-month-year.html
  39. +0 −37 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/icon-trigger.html
  40. BIN occupywallst/media/jquery-ui/development-bundle/demos/datepicker/images/calendar.gif
  41. +0 −31 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/index.html
  42. +0 −33 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/inline.html
  43. +0 −162 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/localization.html
  44. +0 −33 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/min-max.html
  45. +0 −36 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/multiple-calendars.html
  46. +0 −37 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/other-months.html
  47. +0 −39 occupywallst/media/jquery-ui/development-bundle/demos/datepicker/show-week.html
  48. +0 −334 occupywallst/media/jquery-ui/development-bundle/demos/demos.css
  49. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/calendar.gif
  50. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/demo-config-on-tile.gif
  51. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/demo-config-on.gif
  52. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/demo-spindown-closed.gif
  53. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/demo-spindown-open.gif
  54. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/icon-docs-info.gif
  55. BIN occupywallst/media/jquery-ui/development-bundle/demos/images/pbar-ani.gif
  56. +0 −321 occupywallst/media/jquery-ui/development-bundle/demos/index.html
  57. +0 −95 occupywallst/media/jquery-ui/development-bundle/demos/slider/colorpicker.html
  58. +0 −37 occupywallst/media/jquery-ui/development-bundle/demos/slider/default.html
  59. +0 −59 occupywallst/media/jquery-ui/development-bundle/demos/slider/hotelrooms.html
  60. +0 −29 occupywallst/media/jquery-ui/development-bundle/demos/slider/index.html
  61. +0 −77 occupywallst/media/jquery-ui/development-bundle/demos/slider/multiple-vertical.html
  62. +0 −51 occupywallst/media/jquery-ui/development-bundle/demos/slider/range-vertical.html
  63. +0 −52 occupywallst/media/jquery-ui/development-bundle/demos/slider/range.html
  64. +0 −50 occupywallst/media/jquery-ui/development-bundle/demos/slider/rangemax.html
  65. +0 −51 occupywallst/media/jquery-ui/development-bundle/demos/slider/rangemin.html
  66. +0 −140 occupywallst/media/jquery-ui/development-bundle/demos/slider/side-scroll.html
  67. +0 −52 occupywallst/media/jquery-ui/development-bundle/demos/slider/slider-vertical.html
  68. +0 −51 occupywallst/media/jquery-ui/development-bundle/demos/slider/steps.html
  69. +0 −67 occupywallst/media/jquery-ui/development-bundle/demos/slider/tabs.html
  70. +0 −2,570 occupywallst/media/jquery-ui/development-bundle/docs/datepicker.html
  71. +0 −860 occupywallst/media/jquery-ui/development-bundle/docs/slider.html
  72. +0 −39 occupywallst/media/jquery-ui/development-bundle/external/jquery.bgiframe-2.1.2.js
  73. +0 −89 occupywallst/media/jquery-ui/development-bundle/external/jquery.cookie.js
  74. +0 −122 occupywallst/media/jquery-ui/development-bundle/external/jquery.metadata.js
  75. +0 −153 occupywallst/media/jquery-ui/development-bundle/external/qunit.css
  76. +0 −1,261 occupywallst/media/jquery-ui/development-bundle/external/qunit.js
  77. +0 −8,316 occupywallst/media/jquery-ui/development-bundle/jquery-1.5.1.js
  78. BIN occupywallst/media/jquery-ui/development-bundle/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
  79. BIN occupywallst/media/jquery-ui/development-bundle/themes/base/images/ui-icons_222222_256x240.png
  80. BIN occupywallst/media/jquery-ui/development-bundle/themes/base/images/ui-icons_454545_256x240.png
  81. BIN occupywallst/media/jquery-ui/development-bundle/themes/base/images/ui-icons_888888_256x240.png
  82. +0 −11 occupywallst/media/jquery-ui/development-bundle/themes/base/jquery.ui.all.css
  83. +0 −3 occupywallst/media/jquery-ui/development-bundle/themes/base/jquery.ui.base.css
  84. +0 −41 occupywallst/media/jquery-ui/development-bundle/themes/base/jquery.ui.core.css
  85. +0 −68 occupywallst/media/jquery-ui/development-bundle/themes/base/jquery.ui.datepicker.css
  86. +0 −24 occupywallst/media/jquery-ui/development-bundle/themes/base/jquery.ui.slider.css
  87. +0 −252 occupywallst/media/jquery-ui/development-bundle/themes/base/jquery.ui.theme.css
  88. BIN ...jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
  89. BIN ...jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
  90. BIN ...lst/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
  91. BIN ...st/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
  92. BIN ...st/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
  93. BIN ...ia/jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
  94. BIN ...jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
  95. BIN .../jquery-ui/development-bundle/themes/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
  96. BIN ...ywallst/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-icons_228ef1_256x240.png
  97. BIN ...ywallst/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-icons_ef8c08_256x240.png
  98. BIN ...ywallst/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-icons_ffd27a_256x240.png
  99. BIN ...ywallst/media/jquery-ui/development-bundle/themes/ui-lightness/images/ui-icons_ffffff_256x240.png
  100. +0 −385 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery-ui-1.8.12.custom.css
  101. +0 −11 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery.ui.all.css
  102. +0 −3 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery.ui.base.css
  103. +0 −41 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery.ui.core.css
  104. +0 −68 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery.ui.datepicker.css
  105. +0 −24 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery.ui.slider.css
  106. +0 −254 occupywallst/media/jquery-ui/development-bundle/themes/ui-lightness/jquery.ui.theme.css
  107. +0 −1,379 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery-ui-i18n.js
  108. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-af.js
  109. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ar-DZ.js
  110. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ar.js
  111. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-az.js
  112. +0 −24 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-bg.js
  113. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-bs.js
  114. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ca.js
  115. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-cs.js
  116. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-da.js
  117. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-de.js
  118. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-el.js
  119. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-en-AU.js
  120. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-en-GB.js
  121. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-en-NZ.js
  122. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-eo.js
  123. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-es.js
  124. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-et.js
  125. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-eu.js
  126. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-fa.js
  127. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-fi.js
  128. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-fo.js
  129. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-fr-CH.js
  130. +0 −25 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-fr.js
  131. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-gl.js
  132. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-he.js
  133. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-hr.js
  134. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-hu.js
  135. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-hy.js
  136. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-id.js
  137. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-is.js
  138. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-it.js
  139. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ja.js
  140. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ko.js
  141. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-kz.js
  142. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-lt.js
  143. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-lv.js
  144. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ml.js
  145. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ms.js
  146. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-nl.js
  147. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-no.js
  148. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-pl.js
  149. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-pt-BR.js
  150. +0 −22 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-pt.js
  151. +0 −21 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-rm.js
  152. +0 −26 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ro.js
  153. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ru.js
  154. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-sk.js
  155. +0 −24 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-sl.js
  156. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-sq.js
  157. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-sr-SR.js
  158. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-sr.js
  159. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-sv.js
  160. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-ta.js
  161. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-th.js
  162. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-tj.js
  163. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-tr.js
  164. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-uk.js
  165. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-vi.js
  166. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-CN.js
  167. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-HK.js
  168. +0 −23 occupywallst/media/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-zh-TW.js
  169. +0 −3,185 occupywallst/media/jquery-ui/development-bundle/ui/jquery-ui-1.8.12.custom.js
  170. +0 −308 occupywallst/media/jquery-ui/development-bundle/ui/jquery.ui.core.js
  171. +0 −1,775 occupywallst/media/jquery-ui/development-bundle/ui/jquery.ui.datepicker.js
  172. +0 −156 occupywallst/media/jquery-ui/development-bundle/ui/jquery.ui.mouse.js
  173. +0 −684 occupywallst/media/jquery-ui/development-bundle/ui/jquery.ui.slider.js
  174. +0 −262 occupywallst/media/jquery-ui/development-bundle/ui/jquery.ui.widget.js
  175. +0 −17 occupywallst/media/jquery-ui/development-bundle/ui/minified/jquery.ui.core.min.js
  176. +0 −82 occupywallst/media/jquery-ui/development-bundle/ui/minified/jquery.ui.datepicker.min.js
  177. +0 −17 occupywallst/media/jquery-ui/development-bundle/ui/minified/jquery.ui.mouse.min.js
  178. +0 −33 occupywallst/media/jquery-ui/development-bundle/ui/minified/jquery.ui.slider.min.js
  179. +0 −15 occupywallst/media/jquery-ui/development-bundle/ui/minified/jquery.ui.widget.min.js
  180. +0 −1 occupywallst/media/jquery-ui/development-bundle/version.txt
  181. +0 −276 occupywallst/media/jquery-ui/index.html
  182. +0 −16 occupywallst/media/jquery-ui/js/jquery-1.5.1.min.js
  183. +0 −165 occupywallst/media/jquery-ui/js/jquery-ui-1.8.12.custom.min.js
  184. +356 −0 occupywallst/media/js/occupywallst/jquery-ui-1.8.17.custom.min.js
  185. +1,326 −911 occupywallst/media/js/{ → occupywallst}/jquery-ui-timepicker-addon.js
  186. +316 −46 occupywallst/media/js/occupywallst/rides.js
  187. +0 −158 occupywallst/models.py
  188. +2 −1 occupywallst/settings.py
  189. +14 −17 occupywallst/urls.py
  190. +0 −92 occupywallst/views.py
  191. 0 rideshare/__init__.py
  192. +14 −0 rideshare/admin.py
  193. +85 −0 rideshare/forms.py
  194. +189 −0 rideshare/models.py
  195. +10 −0 rideshare/settings.py
  196. +84 −0 rideshare/templates/request_view.html
  197. +28 −0 rideshare/templates/ride_base.html
  198. +135 −0 rideshare/templates/ride_info.html
  199. +48 −0 rideshare/templates/ride_update.html
  200. +39 −0 rideshare/templates/rides.html
  201. +16 −0 rideshare/tests.py
  202. +22 −0 rideshare/urls.py
  203. +228 −0 rideshare/views.py
  204. 0 scripts/occupywallst
View
@@ -17,36 +17,9 @@
from django.contrib.admin import AdminSite as BaseAdminSite
from django.contrib.gis.admin import OSMGeoAdmin
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin, GroupAdmin
-
import taggit.admin
-
from occupywallst import models as db
-
-class AdminSite(BaseAdminSite):
- def __init__(self, *args, **kwargs):
- BaseAdminSite.__init__(self, *args, **kwargs)
- self.register(db.User, UserAdmin)
- self.register(db.Group, GroupAdmin)
- self.register(db.Carousel, CarouselAdmin)
- self.register(db.Verbiage, VerbiageAdmin)
- self.register(db.NewsArticle, ArticleAdmin)
- self.register(db.ForumPost, ArticleAdmin)
- self.register(db.UserInfo, UserInfoAdmin)
- self.register(db.Comment, CommentAdmin)
- self.register(db.RideRequest, GeoAdmin)
- self.register(db.Ride, GeoAdmin)
- self.register(db.SpamText, admin.ModelAdmin)
- self.register(db.List, ListAdmin)
- self.register(db.ListMember, ListMemberAdmin)
- self.register(db.Pledge, PledgeAdmin)
- self.register(taggit.admin.Tag, taggit.admin.TagAdmin)
- self.register(taggit.admin.TaggedItem)
- # message table intentionally excluded. i don't want to tempt
- # myself or anyone else using the backend to read private
- # conversations.
-
-
class GeoAdmin(OSMGeoAdmin):
default_lat = 39.95 # philadelphia
default_lon = -75.16
@@ -275,3 +248,16 @@ class PledgeAdmin(admin.ModelAdmin):
list_display = ['name', 'email', 'zipcode', 'ip', 'created'] + list_filter
search_fields = ['name', 'email', 'zipcode', 'ip']
ordering = ['-created']
+
+
+admin.site.register(db.Carousel, CarouselAdmin)
+admin.site.register(db.Verbiage, VerbiageAdmin)
+admin.site.register(db.NewsArticle, ArticleAdmin)
+admin.site.register(db.ForumPost, ArticleAdmin)
+admin.site.register(db.UserInfo, UserInfoAdmin)
+admin.site.register(db.Comment, CommentAdmin)
+admin.site.register(db.SpamText, admin.ModelAdmin)
+admin.site.register(db.List, ListAdmin)
+admin.site.register(db.ListMember, ListMemberAdmin)
+admin.site.register(db.Pledge, PledgeAdmin)
+
View
@@ -111,24 +111,6 @@ def save(self):
self.user = user
return super(SignupForm, self).save()
-
-class RideForm(forms.ModelForm):
- class Meta:
- model = db.Ride
- exclude = ['seats_used', 'route', 'route_data', 'forum_post']
-
-
-class RideRequestForm(forms.Form):
- info = forms.CharField(help_text="Want a seat? Tell us about yourself.",
- widget=forms.widgets.Textarea)
- def save(self, user, ride):
- ride_request = db.RideRequest(user=user,ride=ride)
- ride_request.status = "pending"
- ride_request.info = self.cleaned_data['info']
- ride_request.save()
- return ride_request
-
-
class SubscribeForm(forms.Form):
email = forms.EmailField()
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong. Retry.

0 comments on commit a9d744b

Please sign in to comment.