fat_free_crm 0.13.2 → 0.13.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of fat_free_crm might be problematic. Click here for more details.

Files changed (407) hide show
  1. checksums.yaml +5 -13
  2. data/.travis.yml +3 -3
  3. data/Gemfile +5 -2
  4. data/Gemfile.lock +137 -119
  5. data/MIT-LICENSE +1 -1
  6. data/README.md +5 -3
  7. data/app/assets/javascripts/admin/fields.js.coffee +31 -8
  8. data/app/assets/javascripts/application.js.erb +6 -10
  9. data/app/assets/javascripts/crm.js.coffee +426 -0
  10. data/app/assets/javascripts/crm_chosen.js.coffee +19 -38
  11. data/app/assets/javascripts/crm_classes.js.coffee +215 -0
  12. data/app/assets/javascripts/crm_comments.js.coffee +20 -58
  13. data/app/assets/javascripts/crm_loginout.js.coffee +27 -0
  14. data/app/assets/javascripts/crm_select2.js.coffee +29 -0
  15. data/app/assets/javascripts/crm_sortable.js.coffee +32 -0
  16. data/app/assets/javascripts/crm_tags.js.coffee +22 -0
  17. data/app/assets/javascripts/crm_textarea_autocomplete.js.coffee +33 -0
  18. data/app/assets/javascripts/datepicker.js.coffee +2 -2
  19. data/app/assets/javascripts/format_buttons.js.coffee +23 -24
  20. data/app/assets/javascripts/lists.js.coffee +45 -76
  21. data/app/assets/javascripts/pagination.js.coffee +16 -0
  22. data/app/assets/javascripts/search.js.coffee +6 -22
  23. data/app/assets/javascripts/timeago.js.coffee +21 -0
  24. data/app/assets/stylesheets/application.css.erb +0 -1
  25. data/app/assets/stylesheets/common.scss +36 -29
  26. data/app/assets/stylesheets/lists.css.scss +17 -3
  27. data/app/controllers/admin/groups_controller.rb +2 -1
  28. data/app/controllers/application_controller.rb +5 -5
  29. data/app/controllers/entities/accounts_controller.rb +1 -1
  30. data/app/controllers/entities/campaigns_controller.rb +1 -1
  31. data/app/controllers/entities/contacts_controller.rb +1 -1
  32. data/app/controllers/entities/leads_controller.rb +1 -1
  33. data/app/controllers/entities/opportunities_controller.rb +1 -1
  34. data/app/controllers/home_controller.rb +10 -7
  35. data/app/controllers/tasks_controller.rb +15 -0
  36. data/app/controllers/users_controller.rb +6 -4
  37. data/app/helpers/accounts_helper.rb +8 -5
  38. data/app/helpers/application_helper.rb +53 -39
  39. data/app/helpers/campaigns_helper.rb +1 -0
  40. data/app/helpers/leads_helper.rb +3 -3
  41. data/app/helpers/opportunities_helper.rb +15 -0
  42. data/app/helpers/remote_link_pagination_helper.rb +8 -0
  43. data/app/helpers/tags_helper.rb +2 -2
  44. data/app/helpers/tasks_helper.rb +22 -15
  45. data/app/helpers/users_helper.rb +3 -2
  46. data/app/mailers/user_mailer.rb +9 -3
  47. data/app/models/entities/account_contact.rb +1 -1
  48. data/app/models/fields/custom_field.rb +1 -1
  49. data/app/models/list.rb +1 -0
  50. data/app/models/observers/entity_observer.rb +10 -1
  51. data/app/models/observers/lead_observer.rb +2 -0
  52. data/app/models/observers/opportunity_observer.rb +2 -0
  53. data/app/models/observers/task_observer.rb +2 -0
  54. data/app/models/polymorphic/avatar.rb +2 -0
  55. data/app/models/polymorphic/comment.rb +0 -1
  56. data/app/models/polymorphic/task.rb +41 -9
  57. data/app/models/users/ability.rb +1 -0
  58. data/app/models/users/group.rb +0 -5
  59. data/app/models/users/user.rb +0 -7
  60. data/app/views/accounts/_edit.html.haml +1 -0
  61. data/app/views/accounts/_index_brief.html.haml +2 -2
  62. data/app/views/accounts/_index_long.html.haml +2 -2
  63. data/app/views/accounts/_new.html.haml +1 -0
  64. data/app/views/accounts/_sidebar_index.html.haml +1 -1
  65. data/app/views/accounts/_sidebar_show.html.haml +1 -1
  66. data/app/views/accounts/_top_section.html.haml +1 -1
  67. data/app/views/accounts/create.js.haml +9 -9
  68. data/app/views/accounts/destroy.js.haml +2 -2
  69. data/app/views/accounts/edit.js.haml +5 -5
  70. data/app/views/accounts/index.js.haml +5 -5
  71. data/app/views/accounts/new.js.haml +1 -1
  72. data/app/views/accounts/show.html.haml +1 -1
  73. data/app/views/accounts/show.js.haml +1 -1
  74. data/app/views/accounts/update.js.haml +7 -5
  75. data/app/views/admin/field_groups/_field_group.html.haml +4 -5
  76. data/app/views/admin/field_groups/confirm.js.haml +2 -2
  77. data/app/views/admin/field_groups/create.js.haml +6 -12
  78. data/app/views/admin/field_groups/destroy.js.haml +3 -3
  79. data/app/views/admin/field_groups/edit.js.haml +1 -1
  80. data/app/views/admin/field_groups/new.js.haml +1 -1
  81. data/app/views/admin/field_groups/update.js.haml +2 -2
  82. data/app/views/admin/fields/_field.html.haml +1 -1
  83. data/app/views/admin/fields/_sort_by.html.haml +3 -3
  84. data/app/views/admin/fields/create.js.haml +9 -9
  85. data/app/views/admin/fields/destroy.js.haml +4 -4
  86. data/app/views/admin/fields/edit.js.haml +2 -2
  87. data/app/views/admin/fields/index.html.haml +1 -8
  88. data/app/views/admin/fields/show.html.haml +1 -1
  89. data/app/views/admin/fields/update.js.haml +8 -8
  90. data/app/views/admin/groups/_form.html.haml +1 -3
  91. data/app/views/admin/groups/create.js.haml +8 -8
  92. data/app/views/admin/groups/destroy.js.haml +3 -3
  93. data/app/views/admin/groups/edit.js.haml +3 -3
  94. data/app/views/admin/groups/index.js.haml +2 -2
  95. data/app/views/admin/groups/new.js.haml +2 -2
  96. data/app/views/admin/groups/update.js.haml +5 -5
  97. data/app/views/admin/tags/confirm.js.haml +2 -2
  98. data/app/views/admin/tags/create.js.haml +8 -8
  99. data/app/views/admin/tags/destroy.js.haml +3 -3
  100. data/app/views/admin/tags/edit.js.haml +4 -4
  101. data/app/views/admin/tags/new.js.haml +1 -1
  102. data/app/views/admin/tags/update.js.haml +5 -5
  103. data/app/views/admin/users/_profile.html.haml +3 -4
  104. data/app/views/admin/users/confirm.js.haml +2 -2
  105. data/app/views/admin/users/create.js.haml +8 -8
  106. data/app/views/admin/users/destroy.js.haml +3 -3
  107. data/app/views/admin/users/edit.js.haml +4 -4
  108. data/app/views/admin/users/index.js.haml +2 -2
  109. data/app/views/admin/users/new.js.haml +2 -2
  110. data/app/views/admin/users/reactivate.js.haml +2 -2
  111. data/app/views/admin/users/suspend.js.haml +2 -2
  112. data/app/views/admin/users/update.js.haml +5 -5
  113. data/app/views/campaigns/_edit.html.haml +1 -0
  114. data/app/views/campaigns/_index_brief.html.haml +1 -1
  115. data/app/views/campaigns/_index_long.html.haml +1 -1
  116. data/app/views/campaigns/_new.html.haml +1 -0
  117. data/app/views/campaigns/_sidebar_index.html.haml +1 -1
  118. data/app/views/campaigns/_sidebar_show.html.haml +1 -1
  119. data/app/views/campaigns/_status.html.haml +1 -1
  120. data/app/views/campaigns/_top_section.html.haml +1 -1
  121. data/app/views/campaigns/create.js.haml +10 -10
  122. data/app/views/campaigns/destroy.js.haml +2 -2
  123. data/app/views/campaigns/edit.js.haml +6 -6
  124. data/app/views/campaigns/index.js.haml +5 -5
  125. data/app/views/campaigns/new.js.haml +1 -1
  126. data/app/views/campaigns/show.html.haml +1 -1
  127. data/app/views/campaigns/show.js.haml +1 -1
  128. data/app/views/campaigns/update.js.haml +8 -6
  129. data/app/views/comments/_edit.html.haml +1 -1
  130. data/app/views/comments/_new.html.haml +1 -1
  131. data/app/views/comments/create.js.haml +9 -9
  132. data/app/views/comments/destroy.js.haml +2 -2
  133. data/app/views/comments/edit.js.haml +3 -3
  134. data/app/views/comments/update.js.haml +5 -5
  135. data/app/views/contacts/_contacts.html.haml +1 -1
  136. data/app/views/contacts/_edit.html.haml +1 -0
  137. data/app/views/contacts/_index_brief.html.haml +2 -2
  138. data/app/views/contacts/_index_full.html.haml +2 -2
  139. data/app/views/contacts/_index_long.html.haml +2 -2
  140. data/app/views/contacts/_new.html.haml +1 -0
  141. data/app/views/contacts/_section_general.html.haml +4 -3
  142. data/app/views/contacts/_sidebar_show.html.haml +1 -1
  143. data/app/views/contacts/_top_section.html.haml +1 -1
  144. data/app/views/contacts/create.js.haml +10 -10
  145. data/app/views/contacts/destroy.js.haml +3 -3
  146. data/app/views/contacts/edit.js.haml +5 -5
  147. data/app/views/contacts/index.js.haml +5 -5
  148. data/app/views/contacts/new.js.haml +1 -1
  149. data/app/views/contacts/show.html.haml +1 -1
  150. data/app/views/contacts/show.js.haml +1 -1
  151. data/app/views/contacts/update.js.haml +8 -6
  152. data/app/views/emails/destroy.js.haml +2 -2
  153. data/app/views/entities/_basic_search.html.haml +15 -12
  154. data/app/views/entities/_permissions.html.haml +6 -11
  155. data/app/views/entities/attach.js.haml +3 -3
  156. data/app/views/entities/contacts.js.haml +2 -2
  157. data/app/views/entities/discard.js.haml +1 -1
  158. data/app/views/entities/leads.js.haml +2 -2
  159. data/app/views/entities/opportunities.js.haml +2 -2
  160. data/app/views/entities/subscription_update.js.haml +1 -1
  161. data/app/views/entities/versions.js.haml +2 -2
  162. data/app/views/fields/group.js.erb +1 -1
  163. data/app/views/home/_account.html.haml +2 -2
  164. data/app/views/home/_assets_menu.html.haml +3 -3
  165. data/app/views/home/_duration_menu.html.haml +3 -3
  166. data/app/views/home/_events_menu.html.haml +3 -3
  167. data/app/views/home/_opportunity.html.haml +2 -2
  168. data/app/views/home/_options.html.haml +0 -1
  169. data/app/views/home/_users_menu.html.haml +3 -3
  170. data/app/views/home/index.js.haml +4 -4
  171. data/app/views/home/options.js.haml +1 -1
  172. data/app/views/layouts/_about.html.haml +3 -3
  173. data/app/views/layouts/_footer.html.haml +1 -1
  174. data/app/views/layouts/_header.html.haml +1 -1
  175. data/app/views/layouts/_jumpbox.html.haml +23 -21
  176. data/app/views/layouts/_sidebar.html.haml +1 -2
  177. data/app/views/layouts/admin/application.html.haml +1 -1
  178. data/app/views/layouts/application.html.haml +3 -3
  179. data/app/views/leads/_convert.html.haml +1 -11
  180. data/app/views/leads/_convert_permissions.html.haml +4 -9
  181. data/app/views/leads/_edit.html.haml +1 -0
  182. data/app/views/leads/_index_brief.html.haml +1 -1
  183. data/app/views/leads/_index_long.html.haml +1 -1
  184. data/app/views/leads/_leads.html.haml +1 -1
  185. data/app/views/leads/_new.html.haml +1 -0
  186. data/app/views/leads/_sidebar_index.html.haml +1 -1
  187. data/app/views/leads/_sidebar_show.html.haml +1 -1
  188. data/app/views/leads/_top_section.html.haml +1 -1
  189. data/app/views/leads/convert.js.haml +5 -5
  190. data/app/views/leads/create.js.haml +9 -9
  191. data/app/views/leads/destroy.js.haml +2 -2
  192. data/app/views/leads/edit.js.haml +5 -5
  193. data/app/views/leads/index.js.haml +5 -5
  194. data/app/views/leads/new.js.haml +1 -1
  195. data/app/views/leads/promote.js.haml +7 -7
  196. data/app/views/leads/reject.js.haml +2 -2
  197. data/app/views/leads/show.html.haml +1 -1
  198. data/app/views/leads/show.js.haml +1 -1
  199. data/app/views/leads/update.js.haml +9 -7
  200. data/app/views/lists/_lists.html.haml +6 -0
  201. data/app/views/lists/_sidebar.html.haml +18 -17
  202. data/app/views/lists/create.js.haml +6 -7
  203. data/app/views/lists/destroy.js.haml +1 -1
  204. data/app/views/opportunities/_edit.html.haml +2 -1
  205. data/app/views/opportunities/_index_brief.html.haml +1 -1
  206. data/app/views/opportunities/_index_long.html.haml +1 -1
  207. data/app/views/opportunities/_new.html.haml +2 -1
  208. data/app/views/opportunities/_opportunities.html.haml +1 -1
  209. data/app/views/opportunities/_sidebar_index.html.haml +1 -1
  210. data/app/views/opportunities/_sidebar_show.html.haml +1 -1
  211. data/app/views/opportunities/_top_section.html.haml +2 -2
  212. data/app/views/opportunities/contacts.js.haml +2 -2
  213. data/app/views/opportunities/create.js.haml +10 -10
  214. data/app/views/opportunities/destroy.js.haml +3 -3
  215. data/app/views/opportunities/edit.js.haml +5 -5
  216. data/app/views/opportunities/index.html.haml +1 -1
  217. data/app/views/opportunities/index.js.haml +5 -5
  218. data/app/views/opportunities/new.js.haml +1 -1
  219. data/app/views/opportunities/show.html.haml +1 -1
  220. data/app/views/opportunities/show.js.haml +1 -1
  221. data/app/views/opportunities/update.js.haml +8 -6
  222. data/app/views/shared/_address.html.haml +1 -1
  223. data/app/views/shared/_inline_styles.html.haml +1 -1
  224. data/app/views/shared/_naming.html.haml +3 -3
  225. data/app/views/shared/_paginate.haml +2 -1
  226. data/app/views/shared/_paginate_with_per_page.html.haml +10 -12
  227. data/app/views/shared/_search.html.haml +7 -3
  228. data/app/views/shared/_select_popup.html.haml +9 -11
  229. data/app/views/shared/_tags.html.haml +5 -4
  230. data/app/views/tasks/_completed.html.haml +3 -1
  231. data/app/views/tasks/_selector.html.haml +1 -1
  232. data/app/views/tasks/_top_section.html.haml +1 -1
  233. data/app/views/tasks/complete.js.haml +7 -7
  234. data/app/views/tasks/create.js.haml +17 -17
  235. data/app/views/tasks/destroy.js.haml +2 -2
  236. data/app/views/tasks/discard.js.haml +1 -1
  237. data/app/views/tasks/edit.js.haml +4 -4
  238. data/app/views/tasks/filter.js.haml +2 -2
  239. data/app/views/tasks/new.js.haml +1 -1
  240. data/app/views/tasks/uncomplete.js.haml +12 -0
  241. data/app/views/tasks/update.js.haml +4 -4
  242. data/app/views/users/_avatar.html.haml +1 -1
  243. data/app/views/users/_languages.html.haml +3 -3
  244. data/app/views/users/_profile.html.haml +1 -1
  245. data/app/views/users/avatar.js.haml +1 -1
  246. data/app/views/users/change_password.js.haml +5 -5
  247. data/app/views/users/edit.js.haml +1 -1
  248. data/app/views/users/password.js.haml +2 -2
  249. data/app/views/users/show.html.haml +1 -1
  250. data/app/views/users/update.js.haml +5 -5
  251. data/app/views/users/upload_avatar.js.haml +3 -3
  252. data/app/views/versions/_versions.html.haml +1 -1
  253. data/config/application.rb +3 -0
  254. data/config/environments/production.rb +1 -1
  255. data/config/environments/staging.rb +58 -13
  256. data/config/initializers/locale.rb +2 -0
  257. data/config/locales/cz_fat_free_crm.yml +1 -0
  258. data/config/locales/de_fat_free_crm.yml +1 -0
  259. data/config/locales/en-GB_fat_free_crm.yml +1 -0
  260. data/config/locales/en-US_fat_free_crm.yml +2 -0
  261. data/config/locales/es_fat_free_crm.yml +1 -0
  262. data/config/locales/fr-CA_fat_free_crm.yml +1 -0
  263. data/config/locales/fr_fat_free_crm.yml +1 -0
  264. data/config/locales/it_fat_free_crm.yml +1 -0
  265. data/config/locales/ja_fat_free_crm.yml +1 -0
  266. data/config/locales/pl_fat_free_crm.yml +1 -0
  267. data/config/locales/pt-BR_fat_free_crm.yml +1 -0
  268. data/config/locales/ru_fat_free_crm.yml +444 -61
  269. data/config/locales/sv-SE_fat_free_crm.yml +1 -0
  270. data/config/locales/th_fat_free_crm.yml +1 -0
  271. data/config/locales/zh-CN_fat_free_crm.yml +1 -0
  272. data/config/routes.rb +20 -19
  273. data/config/settings.default.yml +11 -10
  274. data/fat_free_crm.gemspec +5 -4
  275. data/lib/{plugins/country_select/lib/country_select.rb → country_select.rb} +0 -0
  276. data/lib/fat_free_crm.rb +3 -1
  277. data/lib/fat_free_crm/engine.rb +2 -4
  278. data/lib/fat_free_crm/gem_dependencies.rb +1 -1
  279. data/lib/fat_free_crm/gem_ext.rb +0 -2
  280. data/lib/fat_free_crm/permissions.rb +2 -3
  281. data/lib/fat_free_crm/version.rb +1 -1
  282. data/lib/{plugins/gravatar_image_tag/lib/gravatar_image_tag.rb → gravatar_image_tag.rb} +0 -0
  283. data/lib/tasks/ffcrm/settings.rake +4 -16
  284. data/public/favicon.ico +0 -0
  285. data/spec/controllers/entities/accounts_controller_spec.rb +5 -5
  286. data/spec/controllers/entities/campaigns_controller_spec.rb +5 -5
  287. data/spec/controllers/entities/contacts_controller_spec.rb +42 -5
  288. data/spec/controllers/entities/leads_controller_spec.rb +7 -7
  289. data/spec/controllers/entities/opportunities_controller_spec.rb +5 -5
  290. data/spec/controllers/home_controller_spec.rb +3 -3
  291. data/spec/controllers/tasks_controller_spec.rb +29 -0
  292. data/spec/factories/shared_factories.rb +1 -3
  293. data/spec/features/support/selector_helpers.rb +4 -4
  294. data/spec/helpers/tasks_helper_spec.rb +10 -5
  295. data/spec/lib/permissions_spec.rb +10 -22
  296. data/spec/mailers/user_mailer_spec.rb +5 -4
  297. data/spec/models/observers/entity_observer_spec.rb +13 -8
  298. data/spec/models/polymorphic/task_spec.rb +111 -32
  299. data/spec/routing/accounts_routing_spec.rb +1 -1
  300. data/spec/routing/campaigns_routing_spec.rb +1 -1
  301. data/spec/routing/contacts_routing_spec.rb +1 -1
  302. data/spec/routing/leads_routing_spec.rb +1 -1
  303. data/spec/routing/opportunities_routing_spec.rb +1 -1
  304. data/spec/shared/controllers.rb +2 -2
  305. data/spec/spec_helper.rb +1 -0
  306. data/spec/views/accounts/create.js.haml_spec.rb +3 -3
  307. data/spec/views/accounts/index.js.haml_spec.rb +4 -4
  308. data/spec/views/accounts/update.js.haml_spec.rb +5 -5
  309. data/spec/views/admin/field_groups/create.js.haml_spec.rb +2 -2
  310. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +1 -1
  311. data/spec/views/admin/field_groups/new.js.haml_spec.rb +1 -1
  312. data/spec/views/admin/field_groups/update.js.haml_spec.rb +1 -1
  313. data/spec/views/admin/users/create.js.haml_spec.rb +2 -2
  314. data/spec/views/admin/users/destroy.js.haml_spec.rb +1 -1
  315. data/spec/views/admin/users/edit.js.haml_spec.rb +1 -1
  316. data/spec/views/admin/users/index.js.haml_spec.rb +1 -1
  317. data/spec/views/admin/users/new.js.haml_spec.rb +1 -1
  318. data/spec/views/admin/users/reactivate.js.haml_spec.rb +1 -1
  319. data/spec/views/admin/users/suspend.js.haml_spec.rb +1 -1
  320. data/spec/views/admin/users/update.js.haml_spec.rb +3 -3
  321. data/spec/views/campaigns/create.js.haml_spec.rb +4 -4
  322. data/spec/views/campaigns/destroy.js.haml_spec.rb +1 -1
  323. data/spec/views/campaigns/edit.js.haml_spec.rb +4 -4
  324. data/spec/views/campaigns/index.js.haml_spec.rb +2 -2
  325. data/spec/views/campaigns/new.js.haml_spec.rb +1 -1
  326. data/spec/views/campaigns/update.js.haml_spec.rb +7 -7
  327. data/spec/views/contacts/create.js.haml_spec.rb +4 -4
  328. data/spec/views/contacts/edit.js.haml_spec.rb +4 -4
  329. data/spec/views/contacts/index.js.html_spec.rb +2 -2
  330. data/spec/views/contacts/new.js.haml_spec.rb +2 -2
  331. data/spec/views/contacts/update.js.haml_spec.rb +11 -11
  332. data/spec/views/home/index.js.haml_spec.rb +1 -1
  333. data/spec/views/home/options.js.haml_spec.rb +3 -3
  334. data/spec/views/leads/convert.js.haml_spec.rb +3 -3
  335. data/spec/views/leads/create.js.haml_spec.rb +5 -5
  336. data/spec/views/leads/destroy.js.haml_spec.rb +1 -1
  337. data/spec/views/leads/edit.js.haml_spec.rb +4 -4
  338. data/spec/views/leads/index.js.haml_spec.rb +2 -2
  339. data/spec/views/leads/new.js.haml_spec.rb +1 -1
  340. data/spec/views/leads/promote.js.haml_spec.rb +13 -13
  341. data/spec/views/leads/reject.js.haml_spec.rb +6 -6
  342. data/spec/views/leads/update.js.haml_spec.rb +11 -11
  343. data/spec/views/opportunities/create.js.haml_spec.rb +4 -4
  344. data/spec/views/opportunities/destroy.js.haml_spec.rb +1 -1
  345. data/spec/views/opportunities/edit.js.haml_spec.rb +4 -4
  346. data/spec/views/opportunities/index.js.haml_spec.rb +2 -2
  347. data/spec/views/opportunities/update.js.haml_spec.rb +11 -11
  348. data/spec/views/tasks/complete.js.haml_spec.rb +5 -5
  349. data/spec/views/tasks/create.js.haml_spec.rb +13 -13
  350. data/spec/views/tasks/destroy.js.haml_spec.rb +3 -3
  351. data/spec/views/tasks/edit.js.haml_spec.rb +4 -4
  352. data/spec/views/tasks/new.js.haml_spec.rb +2 -2
  353. data/spec/views/tasks/uncomplete.js.haml_spec.rb +44 -0
  354. data/spec/views/tasks/update.js.haml_spec.rb +17 -17
  355. data/spec/views/users/avatar.js.haml_spec.rb +1 -1
  356. data/spec/views/users/change_password.js.haml_spec.rb +4 -4
  357. data/spec/views/users/edit.js.haml_spec.rb +1 -1
  358. data/spec/views/users/password.js.haml_spec.rb +2 -2
  359. data/spec/views/users/update.js.haml_spec.rb +5 -5
  360. data/spec/views/users/upload_avatar.js.haml_spec.rb +2 -2
  361. data/vendor/assets/javascripts/ajax-chosen.jquery.coffee +166 -76
  362. data/vendor/assets/javascripts/chosen.jquery.coffee +2 -2
  363. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-pt-BR.js +22 -0
  364. data/vendor/assets/javascripts/jquery_ui_datepicker/{jquery-ui-timepicker-sv.js → jquery-ui-timepicker-sv-SE.js} +0 -0
  365. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery-ui-timepicker-th.js +19 -0
  366. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-fr-CA.js +21 -0
  367. data/vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-pt.js +21 -0
  368. data/vendor/assets/javascripts/rating.js +2 -2
  369. metadata +101 -122
  370. data/app/assets/images/facebook-close.gif +0 -0
  371. data/app/assets/javascripts/crm.js +0 -495
  372. data/app/assets/javascripts/crm_classes.js +0 -218
  373. data/app/assets/javascripts/crm_fields.js +0 -34
  374. data/app/assets/javascripts/crm_loginout.js +0 -29
  375. data/app/assets/javascripts/crm_textarea_autocomplete.js +0 -32
  376. data/app/assets/javascripts/groups.js.coffee +0 -8
  377. data/app/assets/javascripts/jquery-noconflict.js +0 -6
  378. data/app/assets/javascripts/timeago.js +0 -17
  379. data/app/views/lists/_personal_sidebar.html.haml +0 -28
  380. data/lib/fat_free_crm/gem_ext/active_model/serializers/xml/serializer/attribute.rb +0 -17
  381. data/lib/fat_free_crm/gem_ext/authlogic/session/cookies.rb +0 -16
  382. data/lib/fat_free_crm/plugin_dependencies.rb +0 -12
  383. data/lib/plugins/country_select/MIT-LICENSE +0 -20
  384. data/lib/plugins/country_select/README +0 -14
  385. data/lib/plugins/country_select/init.rb +0 -1
  386. data/lib/plugins/country_select/install.rb +0 -2
  387. data/lib/plugins/country_select/uninstall.rb +0 -2
  388. data/lib/plugins/gravatar_image_tag/Gemfile +0 -8
  389. data/lib/plugins/gravatar_image_tag/README.textile +0 -108
  390. data/lib/plugins/gravatar_image_tag/ROADMAP.textile +0 -33
  391. data/lib/plugins/gravatar_image_tag/Rakefile +0 -50
  392. data/lib/plugins/gravatar_image_tag/VERSION +0 -1
  393. data/lib/plugins/gravatar_image_tag/gravatar_image_tag.gemspec +0 -45
  394. data/lib/plugins/gravatar_image_tag/init.rb +0 -2
  395. data/lib/plugins/gravatar_image_tag/spec/gravatar_image_tag_spec.rb +0 -83
  396. data/lib/plugins/gravatar_image_tag/spec/test_helper.rb +0 -12
  397. data/lib/tasks/db/migrate.rake +0 -66
  398. data/lib/tasks/db/schema.rake +0 -20
  399. data/vendor/assets/javascripts/ajax-chosen-prototype.js +0 -2
  400. data/vendor/assets/javascripts/ajax-chosen.proto.coffee +0 -98
  401. data/vendor/assets/javascripts/chosen-prototype.js +0 -3
  402. data/vendor/assets/javascripts/chosen.proto.coffee +0 -580
  403. data/vendor/assets/javascripts/event.simulate.js +0 -64
  404. data/vendor/assets/javascripts/facebooklist.js +0 -548
  405. data/vendor/assets/javascripts/facebooklist.simulate.js +0 -28
  406. data/vendor/assets/javascripts/modalbox.js +0 -506
  407. data/vendor/assets/stylesheets/facebooklist.css +0 -47
@@ -2,8 +2,8 @@
2
2
  - @entity = instance_variable_get("@#{entity_name}")
3
3
  - id = dom_id(@entity)
4
4
 
5
- jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
6
- jQuery('##{id}').effect("highlight", { duration:1500 });
5
+ $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
6
+ $('##{id}').effect("highlight", { duration:1500 });
7
7
  - if called_from_index_page?
8
8
  = refresh_sidebar(:index, :filters)
9
9
  - elsif called_from_landing_page?("campaigns")
@@ -11,7 +11,7 @@
11
11
  = render "comments/new", :commentable => @lead
12
12
  = render :partial => "shared/timeline", :collection => @timeline
13
13
 
14
- = hook(:show_lead_bottom, self) do
14
+ = hook(:show_lead_bottom, self, {entity: @lead}) do
15
15
 
16
16
  = render :partial => "tasks/tasks", :locals => {:object => @lead}
17
17
 
@@ -1,5 +1,5 @@
1
1
  - entity_name = controller.controller_name.singularize.underscore #account
2
2
  - @entity = instance_variable_get("@#{entity_name}")
3
3
 
4
- jQuery('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
4
+ $('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
5
5
  = raw generate_js_for_popups(@entity, :tasks)
@@ -8,19 +8,21 @@
8
8
  crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
9
9
  = refresh_sidebar(:show, :summary)
10
10
  - else
11
- jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
- jQuery('##{id}').effect("highlight", { duration:1500 });
11
+ $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
+ $('##{id}').effect("highlight", { duration:1500 });
13
13
  - if called_from_index_page?
14
14
  = refresh_sidebar(:index, :filters)
15
15
  - elsif called_from_landing_page?("campaigns")
16
16
  = refresh_sidebar_for(:campaigns, :show, :summary)
17
17
  - else
18
- jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
18
+ $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
19
19
 
20
20
  - else
21
- jQuery('##{id}').html('#{ j render(:partial => "edit") }');
22
- jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
21
+ $('##{id}').html('#{ j render(:partial => "edit") }');
22
+ $('##{id}').effect("shake", { duration:250, distance: 6 });
23
23
  - if @entity.errors[:first_name].blank? and entity.errors[:last_name].present?
24
- jQuery('#lead_last_name').focus();
24
+ $('#lead_last_name').focus();
25
25
  - else
26
- jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
26
+ $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
27
+
28
+ = hook(:entity_update, self, {entity: @entity}) {}
@@ -0,0 +1,6 @@
1
+ - @global_lists = List.where(:user_id => nil)
2
+ - @personal_lists = List.where(:user_id => current_user.id)
3
+
4
+ #lists
5
+ = render "lists/sidebar", lists: @global_lists
6
+ = render "lists/sidebar", lists: @personal_lists, personal: true
@@ -1,28 +1,29 @@
1
- - @global_lists = List.where(:user_id => nil)
2
- - @list = List.new
3
- .panel#lists
4
- .caption #{t :global_lists}
1
+ - personal ||= false
2
+ - caption = personal ? :personal_lists : :global_lists
3
+
4
+ .panel.lists
5
+ .caption #{t caption}
5
6
  %ul
6
- - if @global_lists.none?
7
+ - if lists.none?
7
8
  %div #{t :no_saved_lists}
8
9
  - else
9
- - @global_lists.sort.each_with_index do |list, i|
10
- %li[list]{ :class => i < @global_lists.size - 1 ? "" : "last" }
11
- %dt= link_to(truncate(list.name, :length => 25), h(list.url), :title => list.name)
10
+ - lists.sort.each_with_index do |item, i|
11
+ %li[item]{ :class => i < lists.size - 1 ? "" : "last" }
12
+ %dt= link_to(truncate(item.name, :length => 25), h(item.url), :title => item.name)
12
13
  %tt
13
- = link_to(url_for(list), :method => :delete, :confirm => 'Are you sure?', :remote => true, :class => "list_icon delete_on_hover") do
14
- %i.fa{:"data-controller" => list.controller, class: get_icon(list.controller)}
14
+ = link_to(url_for(item), :method => :delete, :confirm => t(:confirm_delete, value: 'list'), :remote => true, :class => "list_icon delete_on_hover") do
15
+ %i.fa{:"data-controller" => item.controller, class: get_icon(item.controller)}
15
16
 
16
- .show_lists_save_form{ hidden_if(!params[:q]) }
17
+ .list_save{ hidden_if(!params[:q]) }
17
18
  = link_to(t(:make_current_view_list), '#')
18
19
 
19
- .save_list{ hidden }
20
- = simple_form_for(@list, :html => one_submit_only, :remote => true) do |f|
20
+ .list_form{ hidden }
21
+ = simple_form_for(List.new, :remote => true) do |f|
21
22
  = f.text_field :name, :size => 25
22
- = image_tag("/assets/info_tiny.png", :title => t(:list_name_info), :class => "input_info")
23
+ = image_tag(asset_path('info_tiny.png'), :title => t(:list_name_info), class: "input_info")
23
24
  = f.hidden_field :url
24
- %input{:type => "hidden", :name => "is_global", :value => 1}
25
+ %input{:type => "hidden", :name => "is_global", :value => (personal ? 0 : 1) }
25
26
  %div
26
- = f.submit(t(:save), :id => "save_list", :style => "vertical-align: bottom;")
27
+ = f.submit( t(:save) )
27
28
  #{t :or}
28
- = link_to(t(:cancel), '#', :class => "hide_lists_save_form")
29
+ = link_to(t(:cancel), '#', :class => "cancel")
@@ -1,10 +1,9 @@
1
1
  - if @list.valid?
2
- jQuery('#lists').replaceWith('#{ j render(:partial => "lists/sidebar") }');
3
- jQuery('.show_lists_save_form').show();
4
- jQuery('#personal_lists').replaceWith('#{ j render(:partial => "lists/personal_sidebar") }');
5
- jQuery('.show_personal_lists_save_form').show();
2
+ $('#lists').replaceWith('#{ j render(partial: "lists/lists") }');
3
+ $('.list_save').show();
6
4
 
7
5
  - else # Couldn't create the saved list -- validation failed.
8
- jQuery('#new_list').effect("shake", { duration:250, distance: 6 });
9
- jQuery('#list_name').focus();
10
- jQuery('#save_list').enable();
6
+ $form = $('.lists .list_form:visible')
7
+ $form.effect("shake", { duration:250, distance: 6 });
8
+ $form.find("[name='list[name]']").focus();
9
+ $form.find("[type=submit]").prop('disabled', false);
@@ -1 +1 @@
1
- jQuery('##{dom_id(@list)}').css('background-color', '#ffe4e1').slideUp();
1
+ $('##{dom_id(@list)}').css('background-color', '#ffe4e1').slideUp();
@@ -10,8 +10,9 @@
10
10
  = render "fields/edit_custom_field_group", :f => f, :edit => true
11
11
  = render "fields/groups", :f => f, :edit => true
12
12
  = render "entities/permissions", :f => f, :edit => true, :entity => @opportunity
13
+ = hook(:entity_form, self, {f: f, entity: @opportunity}) {}
13
14
 
14
15
  .buttonbar
15
- = f.submit t(:save_opportunity), :onclick => %/$("account_assigned_to").value = $F("opportunity_assigned_to");/
16
+ = f.submit t(:save_opportunity), :onclick => %/$("#account_assigned_to").val($("#opportunity_assigned_to").val());/
16
17
  #{t :or}
17
18
  = link_to_cancel edit_opportunity_path(@opportunity)
@@ -26,4 +26,4 @@
26
26
  - else
27
27
  = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
28
28
 
29
- = hook(:opportunity_bottom, self, :opportunity => opportunity)
29
+ = hook(:opportunity_bottom, self, :opportunity => opportunity) {}
@@ -56,4 +56,4 @@
56
56
  %dt
57
57
  .tags= tags_for_index(opportunity)
58
58
 
59
- = hook(:opportunity_bottom, self, :opportunity => opportunity)
59
+ = hook(:opportunity_bottom, self, :opportunity => opportunity) {}
@@ -10,8 +10,9 @@
10
10
  = render "shared/add_comment", :f => f
11
11
  = render "fields/groups", :f => f
12
12
  = render "entities/permissions", :f => f, :entity => @opportunity
13
+ = hook(:entity_form, self, {f: f, entity: @opportunity}) {}
13
14
 
14
15
  .buttonbar
15
- = f.submit t(:create_opportunity), :onclick => %/$("account_assigned_to").value = $F("opportunity_assigned_to"); if ($("account_id").visible()) { $("account_id").enable(); }/
16
+ = f.submit t(:create_opportunity), :onclick => %/$("#account_assigned_to").val($("#opportunity_assigned_to").val()); if ($("#account_id").css('display') != 'none') { $("#account_id").enable(); }/
16
17
  #{t :or}
17
18
  = link_to_cancel new_opportunity_path
@@ -3,4 +3,4 @@
3
3
  - opportunities = object.opportunities.order('updated_at desc').paginate(:page => 1, :per_page => 20)
4
4
  = render :partial => "opportunities/opportunity", :collection => opportunities
5
5
 
6
- = will_paginate opportunities, :id => 'opportunities_pagination', :params => {:action => :opportunities}
6
+ = paginate( collection: opportunities, id: 'opportunities_pagination', params: { action: 'opportunities' } )
@@ -17,4 +17,4 @@
17
17
  %div{:style => "float:right;"}
18
18
  %b= @opportunity_stage_total[:all]
19
19
  %b #{t :total_opportunities}
20
- = hook(:index_opportunity_sidebar_bottom, self)
20
+ = hook(:index_opportunity_sidebar_bottom, self) {}
@@ -58,4 +58,4 @@
58
58
  %dt
59
59
  .tags= tags_for_index(@opportunity)
60
60
 
61
- = hook(:show_opportunity_sidebar_bottom, self, :opportunity => @opportunity)
61
+ = hook(:show_opportunity_sidebar_bottom, self, :opportunity => @opportunity) {}
@@ -46,7 +46,7 @@
46
46
  %tr
47
47
  %td
48
48
  .label #{t :campaign}:
49
- = f.collection_select "campaign_id", Campaign.all, :id, :name, { :selected => (@campaign.try(:id) || 0), :include_blank => true }
49
+ = opportunity_campaign_select( selected: (@campaign.try(:id) || @opportunity.campaign_id), include_blank: true )
50
50
 
51
51
  - if Setting.background_info && Setting.background_info.include?(:opportunity)
52
52
  %tr
@@ -56,4 +56,4 @@
56
56
 
57
57
  = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
58
58
 
59
- = hook(:opportunity_top_section_bottom, self, :f => f)
59
+ = hook(:opportunity_top_section_bottom, self, :f => f) {}
@@ -1,3 +1,3 @@
1
1
  - @contacts = @opportunity.contacts.paginate(:page => params[:page], :per_page => 20)
2
- jQuery('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => @contacts) }');
3
- jQuery('#contacts_pagination').replaceWith('#{ j will_paginate(@contacts, :id => :contacts_pagination, :params => {:action => :contacts}) }');
2
+ $('#contacts').html('#{ j render(:partial => 'contacts/contact', :collection => @contacts) }');
3
+ $('#contacts_pagination').replaceWith('#{ j paginate(collection: @contacts, id: 'contacts_pagination', params: { action: 'contacts' } ) }');
@@ -3,15 +3,15 @@
3
3
  - create_id = "create_#{entity_name}"
4
4
 
5
5
  - if @entity.valid?
6
- jQuery('##{create_id}_arrow').html(crm.COLLAPSED);
7
- jQuery('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
8
- jQuery('##{create_id}').slideUp(250);
9
- jQuery('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
10
- jQuery('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
6
+ $('##{create_id}_arrow').html(crm.COLLAPSED);
7
+ $('##{create_id}_title').html('#{ j t(entity_name.pluralize) }');
8
+ $('##{create_id}').slideUp(250);
9
+ $('##{entity_name.pluralize}').prepend('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
10
+ $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
11
11
 
12
12
  - if called_from_index_page?
13
13
  = refresh_sidebar(:index, :filters)
14
- jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
14
+ $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
15
15
  - elsif called_from_landing_page?("accounts") # Opportunity created on Account landing page: refresh Account summary.
16
16
  - @account.reload
17
17
  = refresh_sidebar_for(:accounts, :show, :summary)
@@ -19,11 +19,11 @@
19
19
  - @campaign.reload
20
20
  = refresh_sidebar_for(:campaigns, :show, :summary)
21
21
  - else # Opportunity created on Contact landing page: refresh recent items list.
22
- jQuery('#recently').html('#{ j render(:partial => "shared/recently") }');
22
+ $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
23
23
  crm.flick('empty', 'remove');
24
24
 
25
25
  - else
26
- jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
26
+ $('##{create_id}').html('#{ j render(:partial => "new") }');
27
27
  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
28
- jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
29
- jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
28
+ $('##{create_id}').effect("shake", { duration:250, distance: 6 });
29
+ $('#new_#{entity_name} input[type!=hidden]').first().focus();
@@ -1,13 +1,13 @@
1
1
  - entity_name = controller.controller_name.singularize.underscore
2
2
  - @entity = instance_variable_get("@#{entity_name}")
3
3
 
4
- jQuery('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
4
+ $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
5
5
  - if called_from_index_page?
6
6
  = refresh_sidebar(:index, :filters)
7
- jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
7
+ $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
8
8
  - elsif called_from_landing_page?("accounts")
9
9
  = refresh_sidebar_for(:accounts, :show, :summary)
10
10
  - elsif called_from_landing_page?("campaigns")
11
11
  = refresh_sidebar_for(:campaigns, :show, :summary)
12
12
  - else
13
- jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
13
+ $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
@@ -8,14 +8,14 @@
8
8
  crm.flip_form('edit_#{entity_name}');
9
9
  crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
10
10
  - else # Called from index page...
11
- jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
11
+ $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
12
 
13
13
  - else # <----------------------------------------- Show requested [Edit Opportunity] form.
14
14
 
15
15
  - if params[:cancel].blank? # Called from opportunities list item...
16
16
  - if @previous # Hide open [Edit Opportunity] form if any.
17
17
  - if @previous.is_a?(Opportunity)
18
- jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
18
+ $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
19
19
  - else
20
20
  crm.flick('#{entity_name}_#{@previous}', 'remove');
21
21
 
@@ -24,12 +24,12 @@
24
24
  -# Hide [Create] form if any.
25
25
  crm.hide_form('create_#{entity_name}');
26
26
  -# Show [Edit] form.
27
- jQuery('##{id}').html('#{ j render(:partial => "edit") }');
27
+ $('##{id}').html('#{ j render(:partial => "edit") }');
28
28
 
29
29
  - elsif params[:cancel].false? # Called from title of the opportunity landing page...
30
- jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
30
+ $('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
31
31
  crm.flip_form('edit_#{entity_name}');
32
32
  crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @opportunity.name}");
33
33
 
34
34
  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
35
- jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
35
+ $('#new_#{entity_name} input[type!=hidden]').first().focus();
@@ -17,4 +17,4 @@
17
17
  #paginate= render "shared/paginate_with_per_page"
18
18
  #export= render "shared/export"
19
19
 
20
- = hook(:opportunity_index_after, self)
20
+ = hook(:opportunity_index_after, self) {}
@@ -2,10 +2,10 @@
2
2
  - @entities = instance_variable_get("@#{entities}")
3
3
 
4
4
  - if @entities.any?
5
- jQuery('##{entities}').html('#{ j render(@entities) }');
5
+ $('##{entities}').html('#{ j render(@entities) }');
6
6
  - else
7
- jQuery('##{entities}').html('#{ j render(:partial => "shared/empty") }');
7
+ $('##{entities}').html('#{ j render(:partial => "shared/empty") }');
8
8
 
9
- jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
10
- jQuery('#export').html('#{ j render(:partial => "shared/export") }');
11
- jQuery('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
9
+ $('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
10
+ $('#export').html('#{ j render(:partial => "shared/export") }');
11
+ $('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
5
5
  crm.flip_form('#{create_id}');
6
6
 
7
7
  - unless params[:cancel].true?
8
- jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
8
+ $('##{create_id}').html('#{ j render(:partial => "new") }');
9
9
  crm.set_title('#{create_id}', '#{ j t(create_id) }');
10
10
  -# this function call is the only difference to normal new.js.haml
11
11
  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
@@ -11,7 +11,7 @@
11
11
  = render "comments/new", :commentable => @opportunity
12
12
  = render :partial => "shared/timeline", :collection => @timeline
13
13
 
14
- = hook(:show_opportunity_bottom, self) do
14
+ = hook(:show_opportunity_bottom, self, {entity: @opportunity}) do
15
15
 
16
16
  = render "tasks/tasks", :object => @opportunity
17
17
 
@@ -1,5 +1,5 @@
1
1
  - entity_name = controller.controller_name.singularize.underscore #account
2
2
  - @entity = instance_variable_get("@#{entity_name}")
3
3
 
4
- jQuery('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
4
+ $('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
5
5
  = raw generate_js_for_popups(@entity, :tasks, :contacts)
@@ -8,8 +8,8 @@
8
8
  crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
9
9
  = refresh_sidebar(:show, :summary)
10
10
  - else
11
- jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
- jQuery('##{id}').effect("highlight", { duration:1500 });
11
+ $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
+ $('##{id}').effect("highlight", { duration:1500 });
13
13
  - if called_from_index_page?
14
14
  = refresh_sidebar(:index, :filters)
15
15
  - elsif called_from_landing_page?(:accounts)
@@ -17,9 +17,11 @@
17
17
  - elsif called_from_landing_page?(:campaigns)
18
18
  = refresh_sidebar_for(:campaigns, :show, :summary)
19
19
  - else
20
- jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
20
+ $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
21
21
  - else
22
- jQuery('##{id}').html('#{ j render(:partial => "edit") }');
22
+ $('##{id}').html('#{ j render(:partial => "edit") }');
23
23
  crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
24
- jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
25
- jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
24
+ $('##{id}').effect("shake", { duration:250, distance: 6 });
25
+ $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
26
+
27
+ = hook(:entity_update, self, {entity: @entity}) {}
@@ -41,4 +41,4 @@
41
41
  = address_field(a, address, :zipcode, "width:80px;")
42
42
  %td= spacer
43
43
  %td
44
- = a.country_select(:country, priority_countries, { :include_blank => "" }, {:"data-placeholder" => t(:select_a_country), :style => "width:150px; margin-top:6px"})
44
+ = a.country_select(:country, priority_countries, { :include_blank => "" }, {:"data-placeholder" => t(:select_a_country), :style => "width:150px; margin-top:6px", :class => 'select2'})
@@ -27,5 +27,5 @@
27
27
  li.user .active { background: lightgreen; }
28
28
  li.user .signed_up { background: lightsalmon; }
29
29
 
30
- = hook(:inline_styles, self, local_assigns)
30
+ = hook(:inline_styles, self, local_assigns) {}
31
31
 
@@ -2,8 +2,8 @@
2
2
 
3
3
  :plain
4
4
  new crm.Menu({
5
- trigger : "naming",
6
- fade : 0.5,
7
- appear : 0.5,
5
+ trigger : "#naming",
6
+ fade : 500,
7
+ appear : 500,
8
8
  menu_items: [ #{naming_menu_items.join(",")} ]
9
9
  });
@@ -1 +1,2 @@
1
- = will_paginate :params => {:action => :index}
1
+ = image_tag("loading.gif", size: 'thumb', class: "spinner", style: "display: none;")
2
+ = paginate
@@ -1,14 +1,12 @@
1
+ = image_tag("loading.gif", size: 'thumb', class: "spinner", style: "display: none;")
2
+ = paginate
1
3
 
2
- = will_paginate :params => {:action => :index}
4
+ .per_page_options
5
+ %span.per_page_label
6
+ = t('entities_per_page', :entity => t(controller_name))
3
7
 
4
- - entities = instance_variable_get("@#{controller_name}")
5
- - if entities.count > @per_page.to_i
6
- .per_page_options
7
- %span.per_page_label
8
- = t('entities_per_page', :entity => t(controller_name))
9
-
10
- - [ 10, 20, 30, 50 ].each do |count|
11
- - if count == @per_page.to_i
12
- %em.current= count
13
- - else
14
- = link_to count, send("redraw_#{controller.controller_name}_path", :per_page => count, :query => params[:query], :q => params[:q])
8
+ - [ 10, 20, 30, 50 ].each do |count|
9
+ - if count == @per_page.to_i
10
+ %em.current= count
11
+ - else
12
+ = link_to count, send("redraw_#{controller.controller_name}_path", per_page: count, query: params[:query], q: params[:q]), remote: true
@@ -4,8 +4,12 @@
4
4
  %h4 #{t(:search_assets, t(controller.controller_name + "_small"))}
5
5
  %div{ :style => "margin: 0px 0px 6px 0px" }
6
6
  = text_field_tag('query', @current_query, :size => 23)
7
-
7
+
8
8
  :javascript
9
- new Form.Element.Observer('query', 1.5, function(element, value) {
10
- crm.search(value, '#{path}')
9
+ var searchTimeout;
10
+
11
+ $('#query').on('keydown', function(event) {
12
+ $el = $(event.target)
13
+ if (searchTimeout) clearTimeout(searchTimeout);
14
+ searchTimeout = setTimeout(function () { crm.search($el.val(), '#{path}'); }, 500);
11
15
  });