Permalink
Browse files

remove 'knesset.' from imports. move project files to dir knesset. re…

…name template tag libraries of important apps to *_tags.
  • Loading branch information...
1 parent b17eefc commit da3a8bf977538c88ae5439daa7a1f4e3745302cf @ofri committed Oct 22, 2012
Showing with 623 additions and 790 deletions.
  1. +5 −6 buildout.cfg
  2. +1 −1 src/knesset/agendas/admin.py
  3. +3 −3 src/knesset/agendas/api.py
  4. +2 −3 src/knesset/agendas/listeners.py
  5. +6 −6 src/knesset/agendas/templatetags/{agendas.py → agendas_tags.py}
  6. +3 −3 src/knesset/agendas/tests.py
  7. +4 −4 src/knesset/agendas/views.py
  8. 0 src/knesset/{ → apis}/__init__.py
  9. +7 −9 src/knesset/{api → apis}/handlers.py
  10. 0 src/knesset/{api → apis}/resources/__init__.py
  11. 0 src/knesset/{api → apis}/resources/base.py
  12. +5 −5 src/knesset/{api → apis}/tests.py
  13. +3 −3 src/knesset/{api → apis}/urls.py
  14. +1 −1 src/knesset/auxiliary/templatetags/search.py
  15. +4 −4 src/knesset/auxiliary/tests.py
  16. +9 −14 src/knesset/auxiliary/views.py
  17. +0 −1 src/knesset/badges/__init__.py
  18. +20 −20 src/knesset/badges/handlers.py
  19. +3 −1 src/knesset/badges/models.py
  20. +3 −3 src/knesset/badges/urls.py
  21. +2 −4 src/knesset/badges/views.py
  22. +2 −3 src/knesset/committees/admin.py
  23. +2 −2 src/knesset/committees/api.py
  24. +1 −1 src/knesset/committees/forms.py
  25. +1 −1 src/knesset/committees/listeners.py
  26. 0 src/knesset/committees/templatetags/{committees.py → committees_tags.py}
  27. +3 −3 src/knesset/committees/tests.py
  28. +1 −1 src/knesset/committees/urls.py
  29. +5 −5 src/knesset/committees/views.py
  30. +1 −1 src/knesset/events/models.py
  31. 0 src/knesset/{api → knesset}/__init__.py
  32. 0 src/knesset/{ → knesset}/context.py
  33. 0 src/knesset/{ → knesset}/emitters.py
  34. +1 −1 src/knesset/{ → knesset}/feeds.py
  35. +1 −0 src/knesset/knesset/locale
  36. 0 src/knesset/{ → knesset}/manage.py
  37. +23 −19 src/knesset/{ → knesset}/settings.py
  38. +4 −4 src/knesset/{ → knesset}/sitemap.py
  39. 0 src/knesset/{ → knesset}/templates/404.html
  40. 0 src/knesset/{ → knesset}/templates/500.html
  41. 0 src/knesset/{ → knesset}/templates/_about.html
  42. 0 src/knesset/{ → knesset}/templates/about.he.html
  43. 0 src/knesset/{ → knesset}/templates/about.html
  44. 0 src/knesset/{ → knesset}/templates/accounts/email_validation.html
  45. 0 src/knesset/{ → knesset}/templates/accounts/email_validation_failed.html
  46. 0 src/knesset/{ → knesset}/templates/accounts/email_validation_sent.html
  47. 0 src/knesset/{ → knesset}/templates/accounts/email_validation_subject.html
  48. 0 src/knesset/{ → knesset}/templates/accounts/email_validation_successful.html
  49. 0 src/knesset/{ → knesset}/templates/activity/action_email.html
  50. 0 src/knesset/{ → knesset}/templates/activity/action_email.txt
  51. 0 src/knesset/{ → knesset}/templates/activity/agenda-vote_relation_updated/action_email.html
  52. 0 src/knesset/{ → knesset}/templates/activity/agenda_ascribed/action_email.html
  53. 0 src/knesset/{ → knesset}/templates/activity/agenda_bill_ascribed/action_email.html
  54. 0 src/knesset/{ → knesset}/templates/activity/agenda_bill_relation_updated/action_email.html
  55. 0 src/knesset/{ → knesset}/templates/activity/agenda_bill_removed/action_email.html
  56. 0 src/knesset/{ → knesset}/templates/activity/agenda_meeting_ascribed/action_email.html
  57. 0 src/knesset/{ → knesset}/templates/activity/agenda_meeting_relation_updated/action_email.html
  58. 0 src/knesset/{ → knesset}/templates/activity/agenda_meeting_removed/action_email.html
  59. 0 src/knesset/{ → knesset}/templates/activity/agenda_removed/action_email.html
  60. 0 src/knesset/{ → knesset}/templates/activity/annotation-added/action.html
  61. 0 src/knesset/{ → knesset}/templates/activity/annotation-added/action_email.html
  62. 0 src/knesset/{ → knesset}/templates/activity/attended/action.html
  63. 0 src/knesset/{ → knesset}/templates/activity/attended/action_email.html
  64. 0 src/knesset/{ → knesset}/templates/activity/comment-added/action_email.html
  65. 0 src/knesset/{ → knesset}/templates/activity/joined/action.html
  66. 0 src/knesset/{ → knesset}/templates/activity/joined/action_email.html
  67. 0 src/knesset/{ → knesset}/templates/activity/posted/action.html
  68. 0 src/knesset/{ → knesset}/templates/activity/posted/action_email.html
  69. 0 src/knesset/{ → knesset}/templates/activity/proposed/action.html
  70. 0 src/knesset/{ → knesset}/templates/activity/proposed/action_email.html
  71. 0 src/knesset/{ → knesset}/templates/activity/tag-voted/action.html
  72. 0 src/knesset/{ → knesset}/templates/activity/voted/action.html
  73. 0 src/knesset/{ → knesset}/templates/activity/voted/action_email.html
  74. 0 src/knesset/{ → knesset}/templates/activity/voted/action_email.txt
  75. 0 src/knesset/{ → knesset}/templates/activity/was-approval-voted/action_email.html
  76. 0 src/knesset/{ → knesset}/templates/activity/was-converted-to-discussion/action_email.html
  77. 0 src/knesset/{ → knesset}/templates/activity/was-discussed/action_email.html
  78. 0 src/knesset/{ → knesset}/templates/activity/was-first-voted/action_email.html
  79. 0 src/knesset/{ → knesset}/templates/activity/was-knesset-proposed/action_email.html
  80. 0 src/knesset/{ → knesset}/templates/activity/was-pre-voted/action_email.html
  81. 0 src/knesset/{ → knesset}/templates/activity/was-proposed/action_email.html
  82. 0 src/knesset/{ → knesset}/templates/activity/was-voted-on-gov/action_email.html
  83. 0 src/knesset/{ → knesset}/templates/activity_aggr/aggr_action.html
  84. 0 src/knesset/{ → knesset}/templates/activity_aggr/tag-voted/aggr_action.html
  85. 0 src/knesset/{ → knesset}/templates/admin/simple/change_form_with_extra.html
  86. +1 −9 src/knesset/{ → knesset}/templates/agendas/agenda_add.html
  87. +1 −10 src/knesset/{ → knesset}/templates/agendas/agenda_detail.html
  88. +1 −9 src/knesset/{ → knesset}/templates/agendas/agenda_detail_edit.html
  89. +2 −7 src/knesset/{ → knesset}/templates/agendas/agenda_list.html
  90. 0 src/knesset/{ → knesset}/templates/agendas/agenda_list_header.he.html
  91. 0 src/knesset/{ → knesset}/templates/agendas/agenda_list_help.he.html
  92. +1 −1 src/knesset/{ → knesset}/templates/agendas/agenda_list_item.html
  93. 0 src/knesset/{ → knesset}/templates/agendas/agendasfor.html
  94. +1 −10 src/knesset/{ → knesset}/templates/agendas/mk_agenda_detail.html
  95. 0 src/knesset/{ → knesset}/templates/annotatetext/_annotation.html
  96. 0 src/knesset/{ → knesset}/templates/auxiliary/_bar.html
  97. +1 −2 src/knesset/{ → knesset}/templates/auxiliary/tag_detail.html
  98. 0 src/knesset/{ → knesset}/templates/auxiliary/tag_list.html
  99. 0 src/knesset/{ → knesset}/templates/auxiliary/tag_list_help.he.html
  100. 0 src/knesset/{ → knesset}/templates/avatar/change.html
  101. 0 src/knesset/{ → knesset}/templates/badges/all_badge_list.html
  102. 0 src/knesset/{ → knesset}/templates/badges/badge_detail.html
  103. 0 src/knesset/{ → knesset}/templates/base.html
  104. +1 −3 src/knesset/{ → knesset}/templates/comments/comment_list.html
  105. 0 src/knesset/{ → knesset}/templates/comments/delete.html
  106. 0 src/knesset/{ → knesset}/templates/comments/deleted.html
  107. 0 src/knesset/{ → knesset}/templates/comments/form.html
  108. 0 src/knesset/{ → knesset}/templates/comments/object_comment_list.html
  109. 0 src/knesset/{ → knesset}/templates/committees/_meeting_li.html
  110. +2 −4 src/knesset/{ → knesset}/templates/committees/_member_summary.html
  111. 0 src/knesset/{ → knesset}/templates/committees/_topics_summary.html
  112. +1 −3 src/knesset/{ → knesset}/templates/committees/committee_detail.html
  113. +2 −11 src/knesset/{ → knesset}/templates/committees/committee_list.html
  114. 0 src/knesset/{ → knesset}/templates/committees/committee_list_help.he.html
  115. +1 −9 src/knesset/{ → knesset}/templates/committees/committeemeeting_detail.html
  116. +1 −2 src/knesset/{ → knesset}/templates/committees/committeemeeting_list.html
  117. +1 −2 src/knesset/{ → knesset}/templates/committees/committeemeeting_list_by_tag.html
  118. 0 src/knesset/{ → knesset}/templates/committees/delete_topic.html
  119. +1 −3 src/knesset/{ → knesset}/templates/committees/edit_topic.html
  120. +1 −2 src/knesset/{ → knesset}/templates/committees/flatpages.html
  121. +1 −1 src/knesset/{ → knesset}/templates/committees/topic_detail.html
  122. 0 src/knesset/{ → knesset}/templates/committees/topic_list.html
  123. 0 src/knesset/{ → knesset}/templates/events/_event_li.html
  124. 0 src/knesset/{ → knesset}/templates/feeds/votes_title.html
  125. 0 src/knesset/{ → knesset}/templates/help_base.html
  126. +1 −2 src/knesset/{ → knesset}/templates/help_page.he.html
  127. 0 src/knesset/{ → knesset}/templates/include/member_detail.html
  128. 0 src/knesset/{ → knesset}/templates/include/member_list.html
  129. 0 src/knesset/{ → knesset}/templates/include/party_detail.html
  130. 0 src/knesset/{ → knesset}/templates/include/party_list.html
  131. 0 src/knesset/{ → knesset}/templates/include/vote_list.html
  132. +1 −0 src/knesset/knesset/templates/last_build.txt
  133. 0 src/knesset/{ → knesset}/templates/laws/_member_stand.html
  134. 0 src/knesset/{ → knesset}/templates/laws/_paginator.html
  135. 0 src/knesset/{ → knesset}/templates/laws/bill_confirm_vote.html
  136. +1 −1 src/knesset/{ → knesset}/templates/laws/bill_detail.html
  137. 0 src/knesset/{ → knesset}/templates/laws/bill_detail_help.he.html
  138. 0 src/knesset/{ → knesset}/templates/laws/bill_full_name.html
  139. 0 src/knesset/{ → knesset}/templates/laws/bill_inabox.html
  140. +1 −4 src/knesset/{ → knesset}/templates/laws/bill_list.html
  141. +1 −3 src/knesset/{ → knesset}/templates/laws/bill_list_by_tag.html
  142. 0 src/knesset/{ → knesset}/templates/laws/bill_list_help.he.html
  143. +1 −2 src/knesset/{ → knesset}/templates/laws/bill_list_item.html
  144. 0 src/knesset/{ → knesset}/templates/laws/bill_tags_cloud.html
  145. 0 src/knesset/{ → knesset}/templates/laws/bill_unbind_vote.html
  146. +2 −0 src/knesset/knesset/templates/laws/embed_bill_detail.html
  147. 0 src/knesset/{ → knesset}/templates/laws/item_tags.html
  148. +1 −2 src/knesset/{ → knesset}/templates/laws/knessetproposal_detail.html
  149. +1 −2 src/knesset/{ → knesset}/templates/laws/knessetproposal_list.html
  150. +1 −2 src/knesset/{ → knesset}/templates/laws/law_detail.html
  151. +1 −2 src/knesset/{ → knesset}/templates/laws/law_list.html
  152. +1 −1 src/knesset/{ → knesset}/templates/laws/vote_detail.html
  153. 0 src/knesset/{ → knesset}/templates/laws/vote_detail_help.he.html
  154. +1 −4 src/knesset/{ → knesset}/templates/laws/vote_list.html
  155. +1 −2 src/knesset/{ → knesset}/templates/laws/vote_list_by_tag.html
  156. 0 src/knesset/{ → knesset}/templates/laws/vote_list_help.he.html
  157. +1 −1 src/knesset/{ → knesset}/templates/laws/vote_list_item.html
  158. 0 src/knesset/{ → knesset}/templates/laws/vote_tags_cloud.html
  159. 0 src/knesset/{ → knesset}/templates/laws/votes_tags_cloud.html
  160. 0 src/knesset/{ → knesset}/templates/links/_object_links.html
  161. +1 −2 src/knesset/{ → knesset}/templates/main.he.html
  162. 0 src/knesset/{ → knesset}/templates/main.html
  163. 0 src/knesset/{ → knesset}/templates/main_help.he.html
  164. 0 src/knesset/{ → knesset}/templates/mks/export_csv_link.html
  165. +1 −12 src/knesset/{ → knesset}/templates/mks/member_detail.html
  166. 0 src/knesset/{ → knesset}/templates/mks/member_graph.html
  167. +4 −7 src/knesset/{ → knesset}/templates/mks/member_list.html
  168. 0 src/knesset/{ → knesset}/templates/mks/member_list_with_bars.html
  169. 0 src/knesset/{ → knesset}/templates/mks/member_list_with_bars_help.he.html
  170. 0 src/knesset/{ → knesset}/templates/mks/member_select.html
  171. 0 src/knesset/{ → knesset}/templates/mks/mk_card.html
  172. +1 −4 src/knesset/{ → knesset}/templates/mks/party_detail.html
  173. 0 src/knesset/{ → knesset}/templates/mks/party_list.html
  174. 0 src/knesset/{ → knesset}/templates/mks/party_list_help.he.html
  175. 0 src/knesset/{ → knesset}/templates/mmm/committee_mmm_docs.html
  176. 0 src/knesset/{ → knesset}/templates/mmm/member_mmm_docs.html
  177. 0 src/knesset/{ → knesset}/templates/notify/agenda_update.html
  178. 0 src/knesset/{ → knesset}/templates/notify/agenda_update.txt
  179. 0 src/knesset/{ → knesset}/templates/notify/footer.html
  180. 0 src/knesset/{ → knesset}/templates/notify/footer.txt
  181. 0 src/knesset/{ → knesset}/templates/notify/header.html
  182. 0 src/knesset/{ → knesset}/templates/notify/header.txt
  183. 0 src/knesset/{ → knesset}/templates/notify/member_section.html
  184. 0 src/knesset/{ → knesset}/templates/notify/member_section.txt
  185. 0 src/knesset/{ → knesset}/templates/notify/model_header.html
  186. 0 src/knesset/{ → knesset}/templates/notify/model_header.txt
  187. 0 src/knesset/{ → knesset}/templates/notify/party_membership.html
  188. 0 src/knesset/{ → knesset}/templates/notify/party_membership.txt
  189. 0 src/knesset/{ → knesset}/templates/okhelptexts/okhelptext.html
  190. 0 src/knesset/{ → knesset}/templates/pagination/pagination.html
  191. +3 −9 src/knesset/{ → knesset}/templates/persons/person_detail.html
  192. +2 −4 src/knesset/{ → knesset}/templates/persons/person_list.html
  193. 0 src/knesset/{ → knesset}/templates/planet/base.html
  194. 0 src/knesset/{ → knesset}/templates/planet/blogs/list.html
  195. 0 src/knesset/{ → knesset}/templates/planet/feeds/list.html
  196. 0 src/knesset/{ → knesset}/templates/planet/posts/detail.html
  197. 0 src/knesset/{ → knesset}/templates/planet/posts/details.html
  198. +3 −4 src/knesset/{ → knesset}/templates/planet/posts/full_details.html
  199. 0 src/knesset/{ → knesset}/templates/planet/posts/list.html
  200. 0 src/knesset/{ → knesset}/templates/planet/tags/cloud.html
  201. 0 src/knesset/{ → knesset}/templates/planet/tags/detail.html
  202. 0 src/knesset/{ → knesset}/templates/planet/tags/list.html
  203. 0 src/knesset/{ → knesset}/templates/robots.txt
  204. 0 src/knesset/{ → knesset}/templates/search/indexes/comments/comment_text.txt
  205. 0 src/knesset/{ → knesset}/templates/search/indexes/committees/committee_text.txt
  206. 0 src/knesset/{ → knesset}/templates/search/indexes/committees/committeemeeting_text.txt
  207. 0 src/knesset/{ → knesset}/templates/search/indexes/laws/bill_text.txt
  208. 0 src/knesset/{ → knesset}/templates/search/indexes/laws/vote_text.txt
  209. 0 src/knesset/{ → knesset}/templates/search/indexes/mks/member_text.txt
  210. 0 src/knesset/{ → knesset}/templates/search/indexes/mks/party_text.txt
  211. 0 src/knesset/{ → knesset}/templates/search/search.html
  212. 0 src/knesset/{ → knesset}/templates/search/search_form.html
  213. 0 src/knesset/{ → knesset}/templates/site_base.html
  214. 0 src/knesset/{ → knesset}/templates/two_cols.html
  215. 0 src/knesset/{ → knesset}/templates/user/_user.html
  216. 0 src/knesset/{ → knesset}/templates/user/annotated_items.html
  217. 0 src/knesset/{ → knesset}/templates/user/create_user.html
  218. +1 −3 src/knesset/{ → knesset}/templates/user/editprofile.html
  219. 0 src/knesset/{ → knesset}/templates/user/followed_topics.html
  220. 0 src/knesset/{ → knesset}/templates/user/login.html
  221. 0 src/knesset/{ → knesset}/templates/user/password_reset_complete.html
  222. 0 src/knesset/{ → knesset}/templates/user/password_reset_confirm.html
  223. 0 src/knesset/{ → knesset}/templates/user/password_reset_done.html
  224. 0 src/knesset/{ → knesset}/templates/user/password_reset_form.html
  225. +1 −4 src/knesset/{ → knesset}/templates/user/profile_list.html
  226. +1 −4 src/knesset/{ → knesset}/templates/user/public_profile.html
  227. 0 src/knesset/{ → knesset}/templates/user/tagged_items.html
  228. 0 src/knesset/{ → knesset}/templates/video/_paginator.html
  229. 0 src/knesset/{ → knesset}/templates/video/_video_init.html
  230. 0 src/knesset/{ → knesset}/templates/video/_video_list_item.html
  231. 0 src/knesset/{ → knesset}/templates/video/_video_player.html
  232. 0 src/knesset/{ → knesset}/templates/video/_video_playlist.html
  233. 0 src/knesset/{ → knesset}/templates/video/_video_playlist_player.html
  234. +1 −7 src/knesset/{ → knesset}/templates/video/video_list.html
  235. +16 −18 src/knesset/{ → knesset}/urls.py
  236. 0 src/knesset/{ → knesset}/utils.py
  237. +1 −1 src/knesset/laws/admin.py
  238. +1 −1 src/knesset/laws/api.py
  239. +2 −1 src/knesset/laws/feeds.py
  240. +1 −1 src/knesset/laws/listeners.py
  241. +1 −1 src/knesset/laws/models.py
  242. 0 src/knesset/laws/templatetags/{bills_extra.py → bills_tags.py}
  243. +3 −4 src/knesset/laws/templatetags/{laws_extra.py → laws_tags.py}
  244. +2 −3 src/knesset/laws/tests.py
  245. +1 −1 src/knesset/laws/urls.py
  246. +8 −14 src/knesset/laws/views.py
  247. +2 −2 src/knesset/links/api.py
  248. +1 −2 src/knesset/links/templatetags/{links.py → links_tags.py}
  249. +3 −3 src/knesset/links/tests.py
  250. +0 −1 src/knesset/locale
  251. +4 −6 src/knesset/mks/admin.py
  252. +2 −2 src/knesset/mks/api.py
  253. +2 −2 src/knesset/mks/listeners.py
  254. +1 −4 src/knesset/mks/server_urls.py
  255. +1 −1 src/knesset/mks/templatetags/{mks.py → mks_tags.py}
  256. +6 −8 src/knesset/mks/tests.py
  257. +1 −1 src/knesset/mks/urls.py
  258. +9 −9 src/knesset/mks/views.py
  259. +6 −8 src/knesset/mmm/models.py
  260. +7 −8 src/knesset/mmm/urls.py
  261. +6 −7 src/knesset/mmm/views.py
  262. +2 −2 src/knesset/okhelptexts/templatetags/hlp.py
  263. +1 −3 src/knesset/persons/admin.py
  264. +0 −3 src/knesset/simple/admin.py
  265. +1 −1 src/knesset/simple/management/commands/parse_knesset_bill_pdf.py
  266. +2 −2 src/knesset/simple/management/commands/parse_laws.py
  267. +5 −5 src/knesset/simple/management/commands/syncdata.py
  268. +7 −8 src/knesset/simple/tests.py
  269. +9 −7 src/knesset/tagvotes/models.py
  270. +0 −2 src/knesset/templates/laws/embed_bill_detail.html
  271. +2 −2 src/knesset/user/forms.py
  272. +4 −4 src/knesset/user/models.py
  273. 0 src/knesset/user/templatetags/{user.py → user_tags.py}
  274. +4 −4 src/knesset/user/tests.py
  275. +2 −2 src/knesset/user/urls.py
  276. +6 −6 src/knesset/user/views.py
  277. +1 −1 src/knesset/video/admin.py
  278. +3 −3 src/knesset/video/api.py
  279. +21 −21 src/knesset/video/management/commands/sub_commands/AddVideo.py
  280. +89 −89 src/knesset/video/management/commands/sub_commands/DownloadCommitteesVideos.py
  281. +4 −4 src/knesset/video/management/commands/sub_commands/UpdateCommitteesVideos.py
  282. +6 −6 src/knesset/video/management/commands/sub_commands/UpdateMembersAboutVideo.py
  283. +13 −13 src/knesset/video/management/commands/sub_commands/UpdateMembersRelatedVideos.py
  284. +15 −16 src/knesset/video/management/commands/sub_commands/UploadCommitteesVideos.py
  285. +14 −20 src/knesset/video/management/commands/sub_commands/tests/AddVideo.py
  286. +18 −18 src/knesset/video/management/commands/sub_commands/tests/DownloadCommitteesVideos.py
  287. +36 −38 src/knesset/video/management/commands/sub_commands/tests/UpdateCommitteesVideos.py
  288. +19 −19 src/knesset/video/management/commands/sub_commands/tests/UpdateMembersAboutVideo.py
  289. +20 −22 src/knesset/video/management/commands/sub_commands/tests/UpdateMembersRelatedVideos.py
  290. +10 −10 src/knesset/video/management/commands/sub_commands/tests/UploadCommitteesVideos.py
  291. +16 −16 src/knesset/video/management/commands/sub_commands/tests/__init__.py
  292. +1 −1 src/knesset/video/utils/__init__.py
  293. +3 −3 src/knesset/video/utils/tests/__init__.py
  294. +3 −3 src/knesset/video/utils/tests/parse_dict.py
  295. +7 −8 src/knesset/video/utils/tests/youtube.py
  296. +7 −7 src/knesset/video/utils/youtube.py
  297. +4 −4 src/knesset/video/views.py
View
@@ -141,12 +141,11 @@ wsgi = true
project = knesset
projectegg = knesset
settings = settings
-testsettings = testsettings
-eggs = ${buildout:eggs}
+eggs = ${buildout:eggs}
test =
- knesset.mks knesset.user knesset.laws knesset.links knesset.committees
- knesset.agendas knesset.auxiliary knesset.simple knesset.api knesset.events
- knesset.video
+ mks user laws links committees
+ agendas auxiliary simple apis events
+ video
extra-paths =
${django-piston:location}
@@ -202,7 +201,7 @@ recipe = collective.recipe.cmd
on_install = true
on_update = true
cmds =
- git log --pretty=format:"Code Commit: %H <br>Last Update: %cd" -n 1 > src/knesset/templates/last_build.txt
+ git log --pretty=format:"Code Commit: %H <br>Last Update: %cd" -n 1 > src/knesset/knesset/templates/last_build.txt
[sphinx]
recipe = zc.recipe.egg
@@ -1,4 +1,4 @@
-from knesset.agendas.models import *
+from models import Agenda, AgendaVote
from django.contrib import admin
@@ -5,9 +5,9 @@
from avatar.templatetags.avatar_tags import avatar_url
from django.contrib.auth.models import User
-from knesset.agendas.models import Agenda, AgendaVote
-from knesset.api.resources.base import BaseResource
-from knesset.mks.models import Member, Party
+from models import Agenda, AgendaVote
+from apis.resources.base import BaseResource
+from mks.models import Member, Party
class UserResource(BaseResource):
@@ -6,9 +6,8 @@
from actstream import action
from actstream.models import Follow
from knesset.utils import cannonize, disable_for_loaddata
-from knesset.agendas.models import AgendaVote, AgendaMeeting, AgendaBill
-from knesset.agendas.models import Agenda
-from knesset.links.models import Link, LinkType
+from agendas.models import AgendaVote, AgendaMeeting, AgendaBill, Agenda
+from links.models import Link, LinkType
@disable_for_loaddata
def record_agenda_ascription_action(sender, created, instance, **kwargs):
@@ -2,12 +2,12 @@
from django import template
from django.conf import settings
-from knesset.links.models import Link
-from knesset.agendas.models import (Agenda, AgendaVote, AgendaMeeting,
- AgendaBill, Party,
- UserSuggestedVote)
-from knesset.agendas.forms import (VoteLinkingForm, VoteLinkingFormSet,
- MeetingLinkingFormSet)
+from links.models import Link
+from agendas.models import (Agenda, AgendaVote, AgendaMeeting,
+ AgendaBill, Party,
+ UserSuggestedVote)
+from agendas.forms import (VoteLinkingForm, VoteLinkingFormSet,
+ MeetingLinkingFormSet)
from django.core.cache import cache
register = template.Library()
@@ -9,9 +9,9 @@
from django.conf import settings
from models import Agenda, AgendaVote
-from knesset.laws.models import Vote, VoteAction
-from knesset.mks.models import Party, Member
-from knesset.committees.models import Committee, CommitteeMeeting
+from laws.models import Vote, VoteAction
+from mks.models import Party, Member
+from committees.models import Committee, CommitteeMeeting
just_id = lambda x: x.id
class SimpleTest(TestCase):
@@ -12,10 +12,10 @@
from django.core.urlresolvers import reverse
from django.core.cache import cache
-from knesset.hashnav import DetailView, ListView, method_decorator
-from knesset.laws.models import Vote
-from knesset.mks.models import Member, Party
-from knesset.api.urls import vote_handler
+from hashnav import DetailView, ListView, method_decorator
+from laws.models import Vote
+from mks.models import Member, Party
+from apis.urls import vote_handler
from forms import (EditAgendaForm, AddAgendaForm, VoteLinkingFormSet,
MeetingLinkingFormSet)
File renamed without changes.
@@ -1,5 +1,4 @@
-import datetime
-import urllib
+import datetime, urllib, math
from operator import attrgetter
from django.db.models import Q
from django.contrib.contenttypes.models import ContentType
@@ -8,14 +7,13 @@
from django.db.models import Count
from piston.handler import BaseHandler
from piston.utils import rc
-from knesset.mks.models import Member, Party, Membership
-from knesset.laws.models import Vote, VoteAction, Bill, KnessetProposal, GovProposal
-from knesset.agendas.models import Agenda
-from knesset.committees.models import Committee, CommitteeMeeting
-from knesset.links.models import Link
+from mks.models import Member, Party, Membership
+from laws.models import Vote, VoteAction, Bill, KnessetProposal, GovProposal
+from agendas.models import Agenda
+from committees.models import Committee, CommitteeMeeting
+from links.models import Link
from tagging.models import Tag, TaggedItem
-from knesset.events.models import Event
-import math
+from events.models import Event
from django.forms import model_to_dict
DEFAULT_PAGE_LEN = 20
@@ -4,11 +4,11 @@
from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import User, Group, Permission
from tagging.models import Tag, TaggedItem
-from knesset.laws.models import Vote, VoteAction, Bill, Law
-from knesset.mks.models import Member,Party,WeeklyPresence
-from knesset.agendas.models import Agenda
-from knesset.committees.models import Committee
-from knesset.events.models import Event
+from laws.models import Vote, VoteAction, Bill, Law
+from mks.models import Member,Party,WeeklyPresence
+from agendas.models import Agenda
+from committees.models import Committee
+from events.models import Event
from django.utils import simplejson as json
from django.core import cache
@@ -2,7 +2,7 @@
from piston.resource import Resource
from django.views.decorators.cache import cache_page
-from knesset.api.handlers import *
+from handlers import *
from resources import v2_api
@@ -38,8 +38,8 @@
url(r'^event/$', event_handler, name='event-handler'),
url(r'^event/(?P<id>[0-9]+)/$', event_handler, name='event-handler'),
# NOTE: this view is not in the api application, but in the events application
- url(r'^event/icalendar/$', 'knesset.events.views.icalendar', name='event-icalendar'),
- url(r'^event/icalendar/(?P<summary_length>\d+)/$', 'knesset.events.views.icalendar', name='event-icalendar'),
+ url(r'^event/icalendar/$', 'events.views.icalendar', name='event-icalendar'),
+ url(r'^event/icalendar/(?P<summary_length>\d+)/$', 'events.views.icalendar', name='event-icalendar'),
(r'^', include(v2_api.urls)),
)
@@ -1,7 +1,7 @@
from django import template
from django.core import urlresolvers
from django.conf import settings
-from knesset.auxiliary.forms import SearchForm
+from auxiliary.forms import SearchForm
register = template.Library()
@@ -7,12 +7,12 @@
from django.utils import translation
from django.conf import settings
from tagging.models import Tag,TaggedItem
-from knesset.laws.models import Vote, VoteAction, Bill
-from knesset.mks.models import Member,Party,WeeklyPresence
-from knesset.agendas.models import Agenda
+from laws.models import Vote, VoteAction, Bill
+from mks.models import Member,Party,WeeklyPresence
+from agendas.models import Agenda
from knesset.sitemap import sitemaps
from django.utils import simplejson as json
-from knesset.auxiliary.views import CsvView
+from auxiliary.views import CsvView
class InternalLinksTest(TestCase):
@@ -1,5 +1,4 @@
-import csv
-import random
+import csv, random, tagging, logging
from operator import attrgetter
from django.template import RequestContext
from django.shortcuts import render_to_response, get_object_or_404
@@ -11,25 +10,21 @@
HttpResponse, HttpResponseNotAllowed, HttpResponseBadRequest, Http404
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.contenttypes.models import ContentType
-import tagging
-from actstream import action
-from actstream.models import Action
-from knesset.mks.models import Member
-from knesset.laws.models import Vote,Bill
-from knesset.committees.models import Topic, CommitteeMeeting
-from tagging.models import Tag, TaggedItem
-from annotatetext.views import post_annotation as annotatetext_post_annotation
-from annotatetext.models import Annotation
from django.views.generic.base import TemplateView
from django.views.generic.detail import DetailView
from django.views.generic.list import BaseListView
from django.views.generic.list import ListView
from django.contrib.comments.models import Comment
+from actstream import action
+from actstream.models import Action
+from mks.models import Member
+from laws.models import Vote, Bill, get_debated_bills
+from committees.models import Topic, CommitteeMeeting, PUBLIC_TOPIC_STATUS
+from tagging.models import Tag, TaggedItem
+from annotatetext.views import post_annotation as annotatetext_post_annotation
+from annotatetext.models import Annotation
from knesset.utils import notify_responsible_adult, main_actions
-from knesset.committees.models import PUBLIC_TOPIC_STATUS
-from knesset.laws.models import get_debated_bills
-import logging
logger = logging.getLogger("open-knesset.auxiliary.views")
def help_page(request):
@@ -1 +0,0 @@
-from handlers import *
@@ -5,28 +5,28 @@
from actstream import action
from actstream.models import Follow
-from knesset.user.models import UserProfile
-from knesset.mks.models import Member
-from knesset.badges.models import Badge, BadgeType
+from user.models import UserProfile
+from mks.models import Member
+from models import Badge, BadgeType
class BadgeHandler(object):
def __init__(self, badge_name, badge_description):
self.badge_name = badge_name
self.badge_description = badge_description
-
+
def __call__(self, sender, **kwargs):
if self.test(sender, **kwargs):
profile = self.get_profile(sender, **kwargs)
- self.create_badge(profile)
-
+ self.create_badge(profile)
+
def test(self, sender, **kwargs):
"""Has user reached achivment criteria for this badge"""
return False
def get_profile(self, sender, **kwargs):
"""Get user profile"""
return None
-
+
def create_badge(self, profile):
"""Create badge, if not exist"""
try:
@@ -37,29 +37,29 @@ def create_badge(self, profile):
except BadgeType.DoesNotExist:
badge_type = BadgeType.objects.create(name=self.badge_name, description=self.badge_description)
if Badge.objects.filter(profile = profile, badge_type = badge_type).count()==0:
- badge = Badge.objects.create(profile = profile, badge_type = badge_type)
+ badge = Badge.objects.create(profile = profile, badge_type = badge_type)
action.send(profile.user, verb='got badge', target=badge)
ugettext('got badge') # so we'll have a translation for this
class PostFollowSaveHandler(BadgeHandler):
def get_profile(self, sender, **kwargs):
instance = kwargs.get('instance',None)
return instance.user.profiles.all()[0]
-
+
class FirstFollowHandler(PostFollowSaveHandler):
"""
First Follow Badge is a badge you get when you follow something for the first time
- """
+ """
def __init__(self):
- name = u'FirstFollow'
- description = u'You are following something'
+ name = u'FirstFollow'
+ description = u'You are following something'
super(FirstFollowHandler, self).__init__(badge_name=name, badge_description=description)
- # These two lines make sure translation identifies these strings
+ # These two lines make sure translation identifies these strings
ugettext(u'FirstFollow')
ugettext(u'You are following something')
-
-
+
+
def test(self, sender, **kwargs):
return True # on each follow, this achivment is granted
@@ -70,18 +70,18 @@ def first_follow_handler(sender, **kwargs):
class FirstFollowMKHandler(FirstFollowHandler):
"""
First Follow Badge is a badge you get when you follow an MK.
- """
+ """
def __init__(self):
-
+
name = u'FirstMKFollow'
description = u'You are following an MK'
super(FirstFollowHandler, self).__init__(badge_name=name, badge_description=description)
-
+
# These two lines make sure translation identifies these strings
ugettext(u'FirstMKFollow')
ugettext(u'You are following an MK')
-
-
+
+
def test(self, sender, **kwargs):
instance = kwargs.get('instance',None)
return instance is not None and isinstance(instance.actor, Member)
@@ -3,7 +3,7 @@
from django.db import models
from django.utils.translation import ugettext as _
-from knesset.user.models import UserProfile
+from user.models import UserProfile
class BadgeType(models.Model):
name = models.CharField(max_length=100, unique=True)
@@ -31,3 +31,5 @@ def __unicode__(self):
class Meta:
unique_together=('profile','badge_type')
ordering = ('profile', 'badge_type')
+
+from handlers import *
@@ -1,10 +1,10 @@
from django.conf.urls.defaults import *
-from knesset.badges.views import *
+from views import BadgeTypeDetailView, BadgeTypeListView
detail_view = BadgeTypeDetailView.as_view()
list_view = BadgeTypeListView()
urlpatterns = patterns('',
- url(r'^$',list_view,name='all-badge-list'),
- url(r'^(?P<pk>\d+)/$',detail_view,name='badge-detail'),
+ url(r'^$', list_view, name='all-badge-list'),
+ url(r'^(?P<pk>\d+)/$', detail_view, name='badge-detail'),
)
@@ -1,9 +1,8 @@
from django.views.generic.list_detail import object_list
from django.db.models import Count
-from knesset.hashnav import DetailView, ListView
-from knesset.badges.models import Badge, BadgeType
-
+from hashnav import DetailView, ListView
+from models import Badge, BadgeType
class BadgeTypeDetailView(DetailView):
model = BadgeType
@@ -17,4 +16,3 @@ def get_context_data(self, *args, **kwargs):
class BadgeTypeListView(ListView):
queryset = BadgeType.objects.all().annotate(amount=Count('badges')).order_by('-amount')
template_name = 'badges/all_badge_list.html'
-
@@ -1,9 +1,8 @@
from django.contrib.contenttypes.generic import GenericTabularInline
-from knesset.committees.models import *
-from knesset.video.models import Video
from django.db.models import Q
-
from django.contrib import admin
+from video.models import Video
+from models import *
class CommitteeRelatedVideosInline(generic.GenericTabularInline):
model = Video
Oops, something went wrong.

0 comments on commit da3a8bf

Please sign in to comment.