fat_free_crm 0.12.3 → 0.13.0

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 (521) hide show
  1. checksums.yaml +5 -13
  2. data/.travis.yml +1 -11
  3. data/Gemfile +7 -19
  4. data/Gemfile.lock +166 -166
  5. data/Procfile +1 -1
  6. data/README.md +20 -20
  7. data/app/assets/javascripts/admin/fields.js.coffee +3 -3
  8. data/app/assets/javascripts/application.js.erb +3 -0
  9. data/app/assets/javascripts/crm.js +1 -0
  10. data/app/assets/javascripts/crm_comments.js.coffee +66 -0
  11. data/app/assets/javascripts/lists.js.coffee +45 -2
  12. data/app/assets/javascripts/search.js.coffee +2 -0
  13. data/app/assets/javascripts/timeago.js +17 -0
  14. data/app/assets/stylesheets/advanced_search.css.scss +49 -25
  15. data/app/assets/stylesheets/application.css.erb +3 -0
  16. data/app/assets/stylesheets/common.scss +13 -0
  17. data/app/assets/stylesheets/format_buttons.css.scss +15 -10
  18. data/app/assets/stylesheets/header.scss +3 -0
  19. data/app/assets/stylesheets/lists.css.scss +4 -0
  20. data/app/controllers/admin/fields_controller.rb +5 -5
  21. data/app/controllers/admin/users_controller.rb +1 -3
  22. data/app/controllers/application_controller.rb +23 -23
  23. data/app/controllers/comments_controller.rb +3 -31
  24. data/app/controllers/entities/accounts_controller.rb +3 -3
  25. data/app/controllers/entities/campaigns_controller.rb +4 -4
  26. data/app/controllers/entities/contacts_controller.rb +2 -2
  27. data/app/controllers/entities/leads_controller.rb +3 -3
  28. data/app/controllers/entities/opportunities_controller.rb +4 -3
  29. data/app/controllers/entities_controller.rb +6 -6
  30. data/app/controllers/home_controller.rb +1 -1
  31. data/app/controllers/lists_controller.rb +8 -1
  32. data/app/controllers/tasks_controller.rb +1 -1
  33. data/app/controllers/users_controller.rb +46 -23
  34. data/app/helpers/admin/application_helper.rb +1 -3
  35. data/app/helpers/admin/field_groups_helper.rb +2 -1
  36. data/app/helpers/application_helper.rb +37 -16
  37. data/app/helpers/home_helper.rb +1 -2
  38. data/app/helpers/leads_helper.rb +5 -6
  39. data/app/helpers/tasks_helper.rb +36 -50
  40. data/app/models/entities/account.rb +10 -7
  41. data/app/models/entities/campaign.rb +4 -4
  42. data/app/models/entities/contact.rb +8 -5
  43. data/app/models/entities/lead.rb +8 -8
  44. data/app/models/entities/opportunity.rb +13 -18
  45. data/app/models/fields/custom_field.rb +10 -0
  46. data/app/models/fields/field.rb +3 -3
  47. data/app/models/fields/field_group.rb +1 -1
  48. data/app/models/list.rb +1 -0
  49. data/app/models/polymorphic/address.rb +3 -3
  50. data/app/models/polymorphic/comment.rb +2 -4
  51. data/app/models/polymorphic/task.rb +32 -27
  52. data/app/models/setting.rb +3 -9
  53. data/app/models/users/ability.rb +2 -13
  54. data/app/models/users/user.rb +12 -15
  55. data/app/views/accounts/_edit.html.haml +1 -1
  56. data/app/views/accounts/_index_brief.html.haml +3 -3
  57. data/app/views/accounts/_index_long.html.haml +3 -3
  58. data/app/views/accounts/_new.html.haml +1 -1
  59. data/app/views/accounts/create.js.haml +17 -0
  60. data/app/views/accounts/destroy.js.haml +6 -0
  61. data/app/views/accounts/edit.js.haml +32 -0
  62. data/app/views/accounts/index.js.haml +11 -0
  63. data/app/views/accounts/index.xls.builder +9 -7
  64. data/app/views/accounts/new.js.haml +11 -0
  65. data/app/views/accounts/show.js.haml +5 -0
  66. data/app/views/accounts/update.js.haml +17 -0
  67. data/app/views/admin/field_groups/_edit.html.haml +1 -1
  68. data/app/views/admin/field_groups/_new.html.haml +1 -1
  69. data/app/views/admin/field_groups/confirm.js.haml +7 -0
  70. data/app/views/admin/field_groups/create.js.haml +20 -0
  71. data/app/views/admin/field_groups/destroy.js.haml +9 -0
  72. data/app/views/admin/field_groups/edit.js.haml +12 -0
  73. data/app/views/admin/field_groups/new.js.haml +8 -0
  74. data/app/views/admin/field_groups/update.js.haml +8 -0
  75. data/app/views/admin/fields/_field.html.haml +2 -2
  76. data/app/views/admin/fields/_form.html.haml +2 -2
  77. data/app/views/admin/fields/create.js.haml +17 -0
  78. data/app/views/admin/fields/destroy.js.haml +8 -0
  79. data/app/views/admin/fields/edit.js.haml +3 -0
  80. data/app/views/admin/fields/update.js.haml +13 -0
  81. data/app/views/admin/groups/_edit.html.haml +1 -1
  82. data/app/views/admin/groups/_new.html.haml +1 -1
  83. data/app/views/admin/groups/create.js.haml +10 -0
  84. data/app/views/admin/groups/destroy.js.haml +9 -0
  85. data/app/views/admin/groups/edit.js.haml +14 -0
  86. data/app/views/admin/groups/index.html.haml +1 -1
  87. data/app/views/admin/groups/index.js.haml +2 -0
  88. data/app/views/admin/groups/new.js.haml +9 -0
  89. data/app/views/admin/groups/update.js.haml +9 -0
  90. data/app/views/admin/tags/_edit.html.haml +1 -1
  91. data/app/views/admin/tags/_new.html.haml +1 -1
  92. data/app/views/admin/tags/confirm.js.haml +7 -0
  93. data/app/views/admin/tags/create.js.haml +11 -0
  94. data/app/views/admin/tags/destroy.js.haml +10 -0
  95. data/app/views/admin/tags/edit.js.haml +20 -0
  96. data/app/views/admin/tags/new.js.haml +7 -0
  97. data/app/views/admin/tags/update.js.haml +9 -0
  98. data/app/views/admin/users/_edit.html.haml +1 -1
  99. data/app/views/admin/users/_new.html.haml +1 -1
  100. data/app/views/admin/users/_user.html.haml +1 -1
  101. data/app/views/admin/users/confirm.js.haml +7 -0
  102. data/app/views/admin/users/create.js.haml +10 -0
  103. data/app/views/admin/users/destroy.js.haml +10 -0
  104. data/app/views/admin/users/edit.js.haml +20 -0
  105. data/app/views/admin/users/index.js.haml +2 -0
  106. data/app/views/admin/users/new.js.haml +9 -0
  107. data/app/views/admin/users/reactivate.js.haml +3 -0
  108. data/app/views/admin/users/suspend.js.haml +3 -0
  109. data/app/views/admin/users/update.js.haml +9 -0
  110. data/app/views/authentications/new.html.haml +1 -1
  111. data/app/views/campaigns/_edit.html.haml +1 -1
  112. data/app/views/campaigns/_new.html.haml +1 -1
  113. data/app/views/campaigns/create.js.haml +20 -0
  114. data/app/views/campaigns/destroy.js.haml +6 -0
  115. data/app/views/campaigns/edit.js.haml +33 -0
  116. data/app/views/campaigns/index.js.haml +11 -0
  117. data/app/views/campaigns/index.xls.builder +9 -7
  118. data/app/views/campaigns/new.js.haml +11 -0
  119. data/app/views/campaigns/show.js.haml +5 -0
  120. data/app/views/campaigns/update.js.haml +20 -0
  121. data/app/views/comments/_comment.html.haml +1 -1
  122. data/app/views/comments/_edit.html.haml +1 -1
  123. data/app/views/comments/_new.html.haml +3 -2
  124. data/app/views/comments/create.js.haml +14 -0
  125. data/app/views/comments/destroy.js.haml +5 -0
  126. data/app/views/comments/edit.js.haml +11 -0
  127. data/app/views/comments/update.js.haml +9 -0
  128. data/app/views/contacts/_edit.html.haml +1 -1
  129. data/app/views/contacts/_index_full.html.haml +1 -1
  130. data/app/views/contacts/_index_long.html.haml +2 -1
  131. data/app/views/contacts/_new.html.haml +1 -1
  132. data/app/views/contacts/_section_general.html.haml +3 -3
  133. data/app/views/contacts/create.js.haml +23 -0
  134. data/app/views/contacts/destroy.js.haml +9 -0
  135. data/app/views/contacts/edit.js.haml +35 -0
  136. data/app/views/contacts/index.js.haml +11 -0
  137. data/app/views/contacts/index.xls.builder +9 -7
  138. data/app/views/contacts/new.js.haml +13 -0
  139. data/app/views/contacts/show.js.haml +5 -0
  140. data/app/views/contacts/update.js.haml +22 -0
  141. data/app/views/emails/destroy.js.haml +5 -0
  142. data/app/views/entities/_permissions.html.haml +1 -1
  143. data/app/views/entities/attach.js.haml +21 -0
  144. data/app/views/entities/contacts.js.haml +3 -0
  145. data/app/views/entities/discard.js.haml +6 -0
  146. data/app/views/entities/leads.js.haml +3 -0
  147. data/app/views/entities/opportunities.js.haml +3 -0
  148. data/app/views/entities/subscription_update.js.haml +4 -0
  149. data/app/views/entities/versions.js.haml +3 -0
  150. data/app/views/fields/group.js.erb +3 -0
  151. data/app/views/home/_account.html.haml +3 -3
  152. data/app/views/home/_opportunity.html.haml +3 -3
  153. data/app/views/home/index.atom.builder +3 -3
  154. data/app/views/home/index.js.haml +7 -0
  155. data/app/views/home/index.rss.builder +2 -2
  156. data/app/views/home/options.js.haml +7 -0
  157. data/app/views/layouts/_footer.html.haml +0 -4
  158. data/app/views/layouts/_sidebar.html.haml +1 -0
  159. data/app/views/layouts/_tabbed.html.haml +1 -4
  160. data/app/views/layouts/admin/application.html.haml +0 -1
  161. data/app/views/layouts/application.html.haml +5 -7
  162. data/app/views/leads/_convert.html.haml +1 -1
  163. data/app/views/leads/_edit.html.haml +1 -1
  164. data/app/views/leads/_index_long.html.haml +2 -2
  165. data/app/views/leads/_new.html.haml +1 -1
  166. data/app/views/leads/convert.js.haml +35 -0
  167. data/app/views/leads/create.js.haml +21 -0
  168. data/app/views/leads/destroy.js.haml +9 -0
  169. data/app/views/leads/edit.js.haml +35 -0
  170. data/app/views/leads/index.js.haml +11 -0
  171. data/app/views/leads/index.xls.builder +9 -7
  172. data/app/views/leads/new.js.haml +11 -0
  173. data/app/views/leads/promote.js.haml +26 -0
  174. data/app/views/leads/reject.js.haml +12 -0
  175. data/app/views/leads/show.js.haml +5 -0
  176. data/app/views/leads/update.js.haml +26 -0
  177. data/app/views/lists/_personal_sidebar.html.haml +28 -0
  178. data/app/views/lists/_sidebar.html.haml +10 -7
  179. data/app/views/lists/create.js.haml +10 -0
  180. data/app/views/lists/destroy.js.haml +1 -0
  181. data/app/views/opportunities/_edit.html.haml +1 -1
  182. data/app/views/opportunities/_index_brief.html.haml +3 -3
  183. data/app/views/opportunities/_index_long.html.haml +3 -3
  184. data/app/views/opportunities/_new.html.haml +1 -2
  185. data/app/views/opportunities/_top_section.html.haml +4 -0
  186. data/app/views/opportunities/contacts.js.haml +3 -0
  187. data/app/views/opportunities/create.js.haml +29 -0
  188. data/app/views/opportunities/destroy.js.haml +13 -0
  189. data/app/views/opportunities/edit.js.haml +35 -0
  190. data/app/views/opportunities/index.js.haml +11 -0
  191. data/app/views/opportunities/index.xls.builder +9 -7
  192. data/app/views/opportunities/new.js.haml +13 -0
  193. data/app/views/opportunities/show.js.haml +5 -0
  194. data/app/views/opportunities/update.js.haml +25 -0
  195. data/app/views/passwords/edit.html.haml +1 -1
  196. data/app/views/passwords/new.html.haml +1 -1
  197. data/app/views/shared/_comment.html.haml +1 -1
  198. data/app/views/shared/_inline_styles.html.haml +1 -1
  199. data/app/views/tasks/_edit.html.haml +1 -1
  200. data/app/views/tasks/_new.html.haml +1 -1
  201. data/app/views/tasks/complete.js.haml +14 -0
  202. data/app/views/tasks/create.js.haml +39 -0
  203. data/app/views/tasks/destroy.js.haml +7 -0
  204. data/app/views/tasks/discard.js.haml +1 -0
  205. data/app/views/tasks/edit.js.haml +26 -0
  206. data/app/views/tasks/filter.js.haml +4 -0
  207. data/app/views/tasks/index.xls.builder +7 -5
  208. data/app/views/tasks/new.js.haml +8 -0
  209. data/app/views/tasks/update.js.haml +19 -0
  210. data/app/views/users/_password.html.haml +1 -1
  211. data/app/views/users/_profile.html.haml +1 -1
  212. data/app/views/users/avatar.js.haml +9 -0
  213. data/app/views/users/change_password.js.haml +13 -0
  214. data/app/views/users/edit.js.haml +9 -0
  215. data/app/views/users/new.html.haml +1 -1
  216. data/app/views/users/password.js.haml +10 -0
  217. data/app/views/users/update.js.haml +9 -0
  218. data/app/views/users/upload_avatar.js.haml +7 -0
  219. data/app/views/versions/_version.html.haml +1 -1
  220. data/config/application.rb +1 -4
  221. data/config/environments/production.rb +3 -2
  222. data/config/initializers/custom_field_ransack_translations.rb +15 -0
  223. data/config/initializers/locale.rb +9 -1
  224. data/config/initializers/secret_token.rb +1 -25
  225. data/config/initializers/views.rb +20 -20
  226. data/config/locales/cz.yml +245 -211
  227. data/config/locales/cz_fat_free_crm.yml +105 -181
  228. data/config/locales/de.yml +162 -118
  229. data/config/locales/de_fat_free_crm.yml +760 -731
  230. data/config/locales/de_ransack.yml +91 -0
  231. data/config/locales/en-GB.yml +158 -119
  232. data/config/locales/en-GB_fat_free_crm.yml +161 -279
  233. data/config/locales/en-US.yml +158 -121
  234. data/config/locales/en-US_fat_free_crm.yml +185 -179
  235. data/config/locales/en-US_ransack.yml +81 -82
  236. data/config/locales/es.yml +164 -123
  237. data/config/locales/es_fat_free_crm.yml +151 -209
  238. data/config/locales/fr-CA.yml +167 -130
  239. data/config/locales/fr-CA_fat_free_crm.yml +142 -202
  240. data/config/locales/fr.yml +170 -125
  241. data/config/locales/fr_fat_free_crm.yml +199 -302
  242. data/config/locales/it.yml +158 -122
  243. data/config/locales/it_fat_free_crm.yml +105 -168
  244. data/config/locales/ja.yml +162 -131
  245. data/config/locales/ja_fat_free_crm.yml +118 -188
  246. data/config/locales/pl.yml +168 -132
  247. data/config/locales/pl_fat_free_crm.yml +115 -186
  248. data/config/locales/pt-BR.yml +160 -127
  249. data/config/locales/pt-BR_fat_free_crm.yml +125 -182
  250. data/config/locales/ru.yml +256 -233
  251. data/config/locales/ru_fat_free_crm.yml +136 -193
  252. data/config/locales/sv-SE.yml +164 -181
  253. data/config/locales/sv-SE_fat_free_crm.yml +129 -193
  254. data/config/locales/th_fat_free_crm.yml +114 -194
  255. data/config/locales/zh-CN.yml +176 -149
  256. data/config/locales/zh-CN_fat_free_crm.yml +78 -167
  257. data/config/routes.rb +1 -1
  258. data/config/settings.default.yml +74 -23
  259. data/custom_plan.rb +11 -0
  260. data/db/migrate/20131207033244_add_user_id_to_lists.rb +6 -0
  261. data/db/schema.rb +4 -1
  262. data/fat_free_crm.gemspec +3 -3
  263. data/lib/fat_free_crm.rb +1 -11
  264. data/lib/fat_free_crm/export_csv.rb +3 -3
  265. data/lib/fat_free_crm/fields.rb +10 -0
  266. data/lib/fat_free_crm/gem_dependencies.rb +1 -2
  267. data/lib/fat_free_crm/i18n.rb +9 -5
  268. data/lib/fat_free_crm/version.rb +2 -2
  269. data/lib/fat_free_crm/view_factory.rb +8 -5
  270. data/lib/tasks/ffcrm/config.rake +9 -12
  271. data/lib/tasks/ffcrm/missing_translations.rake +2 -1
  272. data/spec/controllers/admin/users_controller_spec.rb +6 -4
  273. data/spec/controllers/applications_controller_spec.rb +4 -4
  274. data/spec/controllers/authentications_controller_spec.rb +15 -15
  275. data/spec/controllers/comments_controller_spec.rb +9 -87
  276. data/spec/controllers/emails_controller_spec.rb +1 -1
  277. data/spec/controllers/entities/accounts_controller_spec.rb +7 -7
  278. data/spec/controllers/entities/campaigns_controller_spec.rb +5 -5
  279. data/spec/controllers/entities/contacts_controller_spec.rb +7 -7
  280. data/spec/controllers/entities/leads_controller_spec.rb +14 -14
  281. data/spec/controllers/entities/opportunities_controller_spec.rb +8 -8
  282. data/spec/controllers/home_controller_spec.rb +6 -6
  283. data/spec/controllers/tasks_controller_spec.rb +7 -7
  284. data/spec/controllers/users_controller_spec.rb +22 -50
  285. data/spec/features/support/selector_helpers.rb +1 -6
  286. data/spec/features/tasks_spec.rb +2 -2
  287. data/spec/helpers/application_helper_spec.rb +15 -15
  288. data/spec/lib/fields_spec.rb +29 -29
  289. data/spec/lib/mail_processor/base_spec.rb +7 -7
  290. data/spec/lib/mail_processor/dropbox_spec.rb +3 -3
  291. data/spec/lib/view_factory_spec.rb +14 -14
  292. data/spec/models/entities/opportunity_spec.rb +1 -1
  293. data/spec/models/fields/custom_field_date_pair_spec.rb +14 -14
  294. data/spec/models/fields/custom_field_pair_spec.rb +13 -13
  295. data/spec/models/fields/custom_field_spec.rb +5 -5
  296. data/spec/models/fields/field_spec.rb +2 -2
  297. data/spec/models/observers/entity_observer_spec.rb +2 -2
  298. data/spec/models/users/user_spec.rb +7 -7
  299. data/spec/routing/comments_routing_spec.rb +0 -9
  300. data/spec/shared/controllers.rb +75 -77
  301. data/spec/shared/models.rb +1 -1
  302. data/spec/spec_helper.rb +1 -2
  303. data/spec/support/auth_macros.rb +3 -3
  304. data/spec/support/mail_processor_mocks.rb +13 -13
  305. data/spec/views/accounts/_edit.haml_spec.rb +1 -1
  306. data/spec/views/accounts/{create.rjs_spec.rb → create.js.haml_spec.rb} +9 -14
  307. data/spec/views/accounts/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -8
  308. data/spec/views/accounts/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +10 -18
  309. data/spec/views/accounts/{index.rjs_spec.rb → index.js.haml_spec.rb} +7 -11
  310. data/spec/views/accounts/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
  311. data/spec/views/accounts/show.haml_spec.rb +1 -1
  312. data/spec/views/accounts/{update.rjs_spec.rb → update.js.haml_spec.rb} +16 -25
  313. data/spec/views/admin/field_groups/create.js.haml_spec.rb +31 -0
  314. data/spec/views/admin/field_groups/destroy.js.haml_spec.rb +31 -0
  315. data/spec/views/admin/field_groups/edit.js.haml_spec.rb +24 -0
  316. data/spec/views/admin/field_groups/new.js.haml_spec.rb +25 -0
  317. data/spec/views/admin/field_groups/update.js.haml_spec.rb +30 -0
  318. data/spec/views/admin/users/_create.haml_spec.rb +1 -1
  319. data/spec/views/admin/users/{create.rjs_spec.rb → create.js.haml_spec.rb} +6 -9
  320. data/spec/views/admin/users/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -7
  321. data/spec/views/admin/users/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +6 -12
  322. data/spec/views/admin/users/index.haml_spec.rb +0 -0
  323. data/spec/views/admin/users/{index.rjs_spec.rb → index.js.haml_spec.rb} +3 -5
  324. data/spec/views/admin/users/{new.rjs_spec.rb → new.js.haml_spec.rb} +4 -6
  325. data/spec/views/admin/users/{reactivate.rjs_spec.rb → reactivate.js.haml_spec.rb} +2 -4
  326. data/spec/views/admin/users/show.haml_spec.rb +0 -0
  327. data/spec/views/admin/users/{suspend.rjs_spec.rb → suspend.js.haml_spec.rb} +2 -4
  328. data/spec/views/admin/users/{update.rjs_spec.rb → update.js.haml_spec.rb} +6 -10
  329. data/spec/views/campaigns/{create.rjs_spec.rb → create.js.haml_spec.rb} +9 -14
  330. data/spec/views/campaigns/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -7
  331. data/spec/views/campaigns/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +11 -19
  332. data/spec/views/campaigns/{index.rjs_spec.rb → index.js.haml_spec.rb} +5 -9
  333. data/spec/views/campaigns/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
  334. data/spec/views/campaigns/{update.rjs_spec.rb → update.js.haml_spec.rb} +14 -21
  335. data/spec/views/comments/{new.rjs_spec.rb → edit.js.haml_spec.rb} +12 -9
  336. data/spec/views/contacts/{create.rjs_spec.rb → create.js.haml_spec.rb} +9 -16
  337. data/spec/views/contacts/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +6 -8
  338. data/spec/views/contacts/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +12 -19
  339. data/spec/views/contacts/index.haml_spec.rb +1 -1
  340. data/spec/views/contacts/{index.rjs_spec.rb → index.js.html_spec.rb} +7 -11
  341. data/spec/views/contacts/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -7
  342. data/spec/views/contacts/{update.rjs_spec.rb → update.js.haml_spec.rb} +20 -35
  343. data/spec/views/home/{index.rjs_spec.rb → index.js.haml_spec.rb} +2 -4
  344. data/spec/views/home/{options.rjs_spec.rb → options.js.haml_spec.rb} +7 -12
  345. data/spec/views/leads/{convert.rjs_spec.rb → convert.js.haml_spec.rb} +12 -20
  346. data/spec/views/leads/{create.rjs_spec.rb → create.js.haml_spec.rb} +13 -19
  347. data/spec/views/leads/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +9 -12
  348. data/spec/views/leads/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +12 -20
  349. data/spec/views/leads/{index.rjs_spec.rb → index.js.haml_spec.rb} +5 -9
  350. data/spec/views/leads/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
  351. data/spec/views/leads/{promote.rjs_spec.rb → promote.js.haml_spec.rb} +28 -43
  352. data/spec/views/leads/{reject.rjs_spec.rb → reject.js.haml_spec.rb} +10 -17
  353. data/spec/views/leads/{update.rjs_spec.rb → update.js.haml_spec.rb} +25 -38
  354. data/spec/views/opportunities/{create.rjs_spec.rb → create.js.haml_spec.rb} +16 -26
  355. data/spec/views/opportunities/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +13 -16
  356. data/spec/views/opportunities/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +10 -18
  357. data/spec/views/opportunities/{index.rjs_spec.rb → index.js.haml_spec.rb} +7 -12
  358. data/spec/views/opportunities/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
  359. data/spec/views/opportunities/{update.rjs_spec.rb → update.js.haml_spec.rb} +29 -46
  360. data/spec/views/tasks/_edit.haml_spec.rb +1 -1
  361. data/spec/views/tasks/{complete.rjs_spec.rb → complete.js.haml_spec.rb} +9 -14
  362. data/spec/views/tasks/{create.rjs_spec.rb → create.js.haml_spec.rb} +25 -33
  363. data/spec/views/tasks/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb} +9 -11
  364. data/spec/views/tasks/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +9 -14
  365. data/spec/views/tasks/index.haml_spec.rb +1 -2
  366. data/spec/views/tasks/{new.rjs_spec.rb → new.js.haml_spec.rb} +6 -8
  367. data/spec/views/tasks/{update.rjs_spec.rb → update.js.haml_spec.rb} +28 -41
  368. data/spec/views/users/{avatar.rjs_spec.rb → avatar.js.haml_spec.rb} +7 -9
  369. data/spec/views/users/{change_password.rjs_spec.rb → change_password.js.haml_spec.rb} +10 -12
  370. data/spec/views/users/{edit.rjs_spec.rb → edit.js.haml_spec.rb} +8 -10
  371. data/spec/views/users/{password.rjs_spec.rb → password.js.haml_spec.rb} +9 -11
  372. data/spec/views/users/{update.rjs_spec.rb → update.js.haml_spec.rb} +7 -15
  373. data/spec/views/users/{upload_avatar.rjs_spec.rb → upload_avatar.js.haml_spec.rb} +8 -10
  374. data/vendor/assets/javascripts/ajax-chosen-jquery.js +2 -0
  375. data/vendor/assets/javascripts/ajax-chosen-prototype.js +2 -0
  376. data/vendor/assets/javascripts/ajax-chosen.jquery.coffee +81 -0
  377. data/vendor/assets/javascripts/ajax-chosen.proto.coffee +98 -0
  378. data/vendor/assets/javascripts/jquery_timeago/index.js +17 -0
  379. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.cz.js +18 -0
  380. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.de.js +18 -0
  381. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.en-GB.js +20 -0
  382. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.en-US.js +20 -0
  383. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.es.js +18 -0
  384. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.fr-CA.js +17 -0
  385. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.fr.js +17 -0
  386. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.it.js +16 -0
  387. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.ja.js +19 -0
  388. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.js +194 -0
  389. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.pl.js +31 -0
  390. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.pt-BR.js +18 -0
  391. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.ru.js +34 -0
  392. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.sv-SE.js +18 -0
  393. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.th.js +20 -0
  394. data/vendor/assets/javascripts/jquery_timeago/jquery.timeago.zh-CN.js +20 -0
  395. data/zeus.json +2 -1
  396. metadata +240 -245
  397. data/app/assets/images/delete.png +0 -0
  398. data/app/assets/images/iconset_attribution.png +0 -0
  399. data/app/views/accounts/create.js.rjs +0 -14
  400. data/app/views/accounts/destroy.js.rjs +0 -3
  401. data/app/views/accounts/edit.js.rjs +0 -33
  402. data/app/views/accounts/index.js.rjs +0 -8
  403. data/app/views/accounts/new.js.rjs +0 -9
  404. data/app/views/accounts/show.js.erb +0 -2
  405. data/app/views/accounts/update.js.rjs +0 -17
  406. data/app/views/admin/field_groups/confirm.js.rjs +0 -6
  407. data/app/views/admin/field_groups/create.js.rjs +0 -20
  408. data/app/views/admin/field_groups/destroy.js.rjs +0 -11
  409. data/app/views/admin/field_groups/edit.js.rjs +0 -14
  410. data/app/views/admin/field_groups/new.js.rjs +0 -9
  411. data/app/views/admin/field_groups/update.js.rjs +0 -9
  412. data/app/views/admin/fields/create.js.erb +0 -19
  413. data/app/views/admin/fields/destroy.js.erb +0 -9
  414. data/app/views/admin/fields/edit.js.erb +0 -1
  415. data/app/views/admin/fields/update.js.erb +0 -13
  416. data/app/views/admin/groups/create.js.rjs +0 -11
  417. data/app/views/admin/groups/destroy.js.rjs +0 -11
  418. data/app/views/admin/groups/edit.js.rjs +0 -21
  419. data/app/views/admin/groups/index.js.rjs +0 -2
  420. data/app/views/admin/groups/new.js.rjs +0 -9
  421. data/app/views/admin/groups/update.js.rjs +0 -10
  422. data/app/views/admin/tags/confirm.js.rjs +0 -6
  423. data/app/views/admin/tags/create.js.rjs +0 -12
  424. data/app/views/admin/tags/destroy.js.rjs +0 -11
  425. data/app/views/admin/tags/edit.js.rjs +0 -21
  426. data/app/views/admin/tags/new.js.rjs +0 -8
  427. data/app/views/admin/tags/update.js.rjs +0 -10
  428. data/app/views/admin/users/confirm.js.rjs +0 -6
  429. data/app/views/admin/users/create.js.rjs +0 -11
  430. data/app/views/admin/users/destroy.js.rjs +0 -11
  431. data/app/views/admin/users/edit.js.rjs +0 -21
  432. data/app/views/admin/users/index.js.rjs +0 -3
  433. data/app/views/admin/users/new.js.rjs +0 -8
  434. data/app/views/admin/users/reactivate.js.rjs +0 -3
  435. data/app/views/admin/users/suspend.js.rjs +0 -3
  436. data/app/views/admin/users/update.js.rjs +0 -10
  437. data/app/views/campaigns/create.js.rjs +0 -18
  438. data/app/views/campaigns/destroy.js.rjs +0 -3
  439. data/app/views/campaigns/edit.js.rjs +0 -34
  440. data/app/views/campaigns/index.js.rjs +0 -8
  441. data/app/views/campaigns/new.js.rjs +0 -9
  442. data/app/views/campaigns/show.js.erb +0 -2
  443. data/app/views/campaigns/update.js.rjs +0 -21
  444. data/app/views/comments/create.js.rjs +0 -11
  445. data/app/views/comments/destroy.js.rjs +0 -6
  446. data/app/views/comments/edit.js.rjs +0 -11
  447. data/app/views/comments/new.js.rjs +0 -14
  448. data/app/views/comments/update.js.rjs +0 -11
  449. data/app/views/contacts/create.js.rjs +0 -19
  450. data/app/views/contacts/destroy.js.rjs +0 -7
  451. data/app/views/contacts/edit.js.rjs +0 -36
  452. data/app/views/contacts/index.js.rjs +0 -8
  453. data/app/views/contacts/new.js.rjs +0 -11
  454. data/app/views/contacts/show.js.erb +0 -2
  455. data/app/views/contacts/update.js.rjs +0 -22
  456. data/app/views/emails/destroy.js.rjs +0 -6
  457. data/app/views/entities/attach.js.rjs +0 -24
  458. data/app/views/entities/contacts.js.rjs +0 -3
  459. data/app/views/entities/discard.js.rjs +0 -7
  460. data/app/views/entities/leads.js.rjs +0 -3
  461. data/app/views/entities/opportunities.js.rjs +0 -3
  462. data/app/views/entities/subscription_update.js.rjs +0 -4
  463. data/app/views/entities/versions.js.erb +0 -3
  464. data/app/views/fields/group.js.rjs +0 -7
  465. data/app/views/home/index.js.rjs +0 -7
  466. data/app/views/home/options.js.rjs +0 -8
  467. data/app/views/leads/convert.js.rjs +0 -37
  468. data/app/views/leads/create.js.rjs +0 -19
  469. data/app/views/leads/destroy.js.rjs +0 -7
  470. data/app/views/leads/edit.js.rjs +0 -36
  471. data/app/views/leads/index.js.rjs +0 -8
  472. data/app/views/leads/new.js.rjs +0 -9
  473. data/app/views/leads/promote.js.rjs +0 -27
  474. data/app/views/leads/reject.js.rjs +0 -10
  475. data/app/views/leads/show.js.erb +0 -2
  476. data/app/views/leads/update.js.rjs +0 -27
  477. data/app/views/lists/create.js.rjs +0 -9
  478. data/app/views/lists/destroy.js.rjs +0 -1
  479. data/app/views/opportunities/contacts.js.rjs +0 -3
  480. data/app/views/opportunities/create.js.rjs +0 -29
  481. data/app/views/opportunities/destroy.js.rjs +0 -11
  482. data/app/views/opportunities/edit.js.rjs +0 -36
  483. data/app/views/opportunities/index.js.rjs +0 -8
  484. data/app/views/opportunities/new.js.rjs +0 -12
  485. data/app/views/opportunities/show.js.erb +0 -2
  486. data/app/views/opportunities/update.js.rjs +0 -26
  487. data/app/views/tasks/complete.js.rjs +0 -17
  488. data/app/views/tasks/create.js.rjs +0 -41
  489. data/app/views/tasks/destroy.js.rjs +0 -7
  490. data/app/views/tasks/discard.rjs +0 -1
  491. data/app/views/tasks/edit.js.rjs +0 -23
  492. data/app/views/tasks/filter.js.rjs +0 -1
  493. data/app/views/tasks/new.js.rjs +0 -9
  494. data/app/views/tasks/update.js.rjs +0 -21
  495. data/app/views/users/avatar.js.rjs +0 -10
  496. data/app/views/users/change_password.js.rjs +0 -15
  497. data/app/views/users/edit.js.rjs +0 -10
  498. data/app/views/users/password.js.rjs +0 -11
  499. data/app/views/users/update.js.rjs +0 -10
  500. data/app/views/users/upload_avatar.js.rjs +0 -8
  501. data/lib/fat_free_crm/secret_token_generator.rb +0 -65
  502. data/spec/lib/secret_token_generator_spec.rb +0 -79
  503. data/spec/models/users/abilities/user_ability_spec.rb +0 -58
  504. data/spec/support/rjs_support.rb +0 -14
  505. data/vendor/assets/images/brief.png +0 -0
  506. data/vendor/assets/images/full.png +0 -0
  507. data/vendor/assets/images/long.png +0 -0
  508. data/vendor/assets/images/tab_icons/accounts.png +0 -0
  509. data/vendor/assets/images/tab_icons/accounts_active.png +0 -0
  510. data/vendor/assets/images/tab_icons/campaigns.png +0 -0
  511. data/vendor/assets/images/tab_icons/campaigns_active.png +0 -0
  512. data/vendor/assets/images/tab_icons/contacts.png +0 -0
  513. data/vendor/assets/images/tab_icons/contacts_active.png +0 -0
  514. data/vendor/assets/images/tab_icons/dashboard.png +0 -0
  515. data/vendor/assets/images/tab_icons/dashboard_active.png +0 -0
  516. data/vendor/assets/images/tab_icons/leads.png +0 -0
  517. data/vendor/assets/images/tab_icons/leads_active.png +0 -0
  518. data/vendor/assets/images/tab_icons/opportunities.png +0 -0
  519. data/vendor/assets/images/tab_icons/opportunities_active.png +0 -0
  520. data/vendor/assets/images/tab_icons/tasks.png +0 -0
  521. data/vendor/assets/images/tab_icons/tasks_active.png +0 -0
@@ -0,0 +1,20 @@
1
+ - id = dom_id(@user)
2
+
3
+ - if params[:cancel].true? # <----------------- Hide [Edit User]
4
+ jQuery('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }');
5
+
6
+ - else # <---------------------------------------- Show [Edit User] form.
7
+
8
+ - if @previous # Hide open [Edit User] form if any.
9
+ - if @previous.is_a?(User) # Previous user still exists?
10
+ jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => "user", :collection => [ @previous ]) }');
11
+ - else
12
+ crm.flick('user_#{@previous}', 'remove');
13
+
14
+ -# Disable onMouseOver for the list item.
15
+ -# Hide [Create User] form if any.
16
+ -# Show [Edit User] form.
17
+ crm.highlight_off('#{id}');
18
+ crm.hide_form('create_user');
19
+ jQuery('##{id}').html('#{ j render(:partial => "edit") }');
20
+ jQuery('#user_username').focus();
@@ -0,0 +1,2 @@
1
+ jQuery('#users').html('#{ j render(:partial => "admin/users/user", :collection => @users) }');
2
+ jQuery('#paginate').html('#{ j render(:partial => "shared/paginate") }')
@@ -0,0 +1,9 @@
1
+ crm.flip_form('create_user');
2
+
3
+ - unless params[:cancel].true?
4
+ jQuery('#create_user').html('#{ j render(:partial => "new") }');
5
+ jQuery('#empty').html('');
6
+ crm.set_title('create_user', '#{t(:create_user)}');
7
+
8
+ - else
9
+ crm.set_title('create_user', '#{t(:users)}');
@@ -0,0 +1,3 @@
1
+ - id = dom_id(@user)
2
+ jQuery('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }');
3
+ jQuery('##{id}').effect("highlight", { duration:1000 });
@@ -0,0 +1,3 @@
1
+ - id = dom_id(@user)
2
+ jQuery('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }');
3
+ jQuery('##{id}').effect("highlight", { duration:1000 });
@@ -0,0 +1,9 @@
1
+ - id = dom_id(@user)
2
+
3
+ - if @user.errors.empty?
4
+ jQuery('##{id}').replaceWith('#{ j render(:partial => "user", :collection => [ @user ]) }')
5
+ jQuery('##{id}').effect("highlight", { duration:1000 });
6
+ - else
7
+ jQuery('##{id}').html('#{j render(:partial => "edit") }')
8
+ jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
9
+ jQuery('#user_username').focus()
@@ -13,7 +13,7 @@
13
13
  .standalone#standalone
14
14
  -# The following form gets submitted to #create when @authentication is nil,
15
15
  -# or to #update when @authentication is not nil (ex. suspended).
16
- = form_for @authentication, :url => authentication_path, :html => one_submit_only(:authentication) do |f|
16
+ = form_for @authentication, :url => authentication_path, :html => one_submit_only do |f|
17
17
  - if can_signup?
18
18
  .title_tools #{t :no_account} #{link_to t(:sign_up_now), signup_path}
19
19
  .title= t(:login)
@@ -1,5 +1,5 @@
1
1
  .remote
2
- = simple_form_for(@campaign, :html => one_submit_only(:campaign), :remote => true) do |f|
2
+ = simple_form_for(@campaign, :html => one_submit_only, :remote => true) do |f|
3
3
  = link_to_close edit_campaign_path(@campaign)
4
4
  = f.hidden_field :user_id
5
5
 
@@ -1,4 +1,4 @@
1
- = simple_form_for(@campaign, :html => one_submit_only(:campaign), :remote => true) do |f|
1
+ = simple_form_for(@campaign, :html => one_submit_only, :remote => true) do |f|
2
2
  = link_to_close new_campaign_path
3
3
  = f.hidden_field :user_id
4
4
 
@@ -0,0 +1,20 @@
1
+ - entity_name = controller.controller_name.singularize.underscore #account
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+ - create_id = "create_#{entity_name}" # create_account
4
+
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 });
11
+ = refresh_sidebar(:index, :filters)
12
+ jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
13
+ crm.flick('empty', 'remove');
14
+ - else
15
+ jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
16
+ jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
17
+ - if @entity.errors[:name].blank? and @entity.errors[:ends_on].present?
18
+ jQuery('#campaign_ends_on').focus();
19
+ - else
20
+ jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
@@ -0,0 +1,6 @@
1
+ - entity_name = controller.controller_name.singularize.underscore
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+
4
+ jQuery('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250)
5
+ = refresh_sidebar(:index, :filters)
6
+ jQuery('#paginate').replaceWith('#{ j render(:partial => "shared/paginate_with_per_page") }');
@@ -0,0 +1,33 @@
1
+ - entity_name = controller.controller_name.singularize.underscore #account
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+ - id = dom_id(@entity)
4
+
5
+ - if params[:cancel].true? # <--------------------- Hide [Edit]
6
+
7
+ - if called_from_landing_page?
8
+ crm.flip_form('edit_#{entity_name}');
9
+ crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
10
+ - else # Called from index page...
11
+ jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
+
13
+ - else # <---------------------------------------- Show [Edit] form.
14
+
15
+ - if params[:cancel].blank? # Called from index page...
16
+ - if @previous # Hide open [Edit] form if any.
17
+ - if @previous.is_a?(@entity.class)
18
+ jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
19
+ - else
20
+ crm.flick('#{entity_name}_#{@previous}', 'remove');
21
+ -# Disable onMouseOver for the list item.
22
+ crm.highlight_off('#{id}');
23
+ -# Hide [Create] form if any.
24
+ crm.hide_form('create_#{entity_name}');
25
+ -# Show [Edit] form.
26
+ jQuery('##{id}').html('#{ j render(:partial => "edit") }');
27
+
28
+ - elsif params[:cancel].false? # Called from title of the landing page...
29
+ jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
30
+ crm.flip_form('edit_#{entity_name}');
31
+ crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.name}");
32
+ jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
33
+
@@ -0,0 +1,11 @@
1
+ - entities = controller.controller_name # accounts
2
+ - @entities = instance_variable_get("@#{entities}")
3
+
4
+ - if @entities.any?
5
+ jQuery('##{entities}').html('#{ j render(@entities) }');
6
+ - else
7
+ jQuery('##{entities}').html('#{ j render(:partial => "shared/empty") }');
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)) }');
@@ -3,7 +3,8 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
3
3
  unless @campaigns.empty?
4
4
  # Header.
5
5
  xml.Row do
6
- heads = [I18n.t('user'),
6
+ heads = [I18n.t('id'),
7
+ I18n.t('user'),
7
8
  I18n.t('assigned_to'),
8
9
  I18n.t('name'),
9
10
  I18n.t('access'),
@@ -21,12 +22,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
21
22
  I18n.t('background_info'),
22
23
  I18n.t('date_created'),
23
24
  I18n.t('date_updated')]
24
-
25
+
25
26
  # Append custom field labels to header
26
27
  Campaign.fields.each do |field|
27
28
  heads << field.label
28
29
  end
29
-
30
+
30
31
  heads.each do |head|
31
32
  xml.Cell do
32
33
  xml.Data head,
@@ -34,11 +35,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
34
35
  end
35
36
  end
36
37
  end
37
-
38
+
38
39
  # Campaign rows.
39
40
  @campaigns.each do |campaign|
40
41
  xml.Row do
41
- data = [campaign.user.try(:name),
42
+ data = [campaign.id,
43
+ campaign.user.try(:name),
42
44
  campaign.assignee.try(:name),
43
45
  campaign.name,
44
46
  campaign.access,
@@ -56,12 +58,12 @@ xml.Worksheet 'ss:Name' => I18n.t(:tab_campaigns) do
56
58
  campaign.background_info,
57
59
  campaign.created_at,
58
60
  campaign.updated_at]
59
-
61
+
60
62
  # Append custom field values.
61
63
  Campaign.fields.each do |field|
62
64
  data << campaign.send(field.name)
63
65
  end
64
-
66
+
65
67
  data.each do |value|
66
68
  xml.Cell do
67
69
  xml.Data value,
@@ -0,0 +1,11 @@
1
+ - entity_name = controller.controller_name.singularize # account
2
+ - create_id = "create_#{entity_name}"
3
+
4
+ crm.flick('empty', 'toggle');
5
+ crm.flip_form('#{create_id}');
6
+
7
+ - unless params[:cancel].true?
8
+ jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
9
+ crm.set_title('#{create_id}', '#{ j t(create_id) }');
10
+ - else
11
+ crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');
@@ -0,0 +1,5 @@
1
+ - entity_name = controller.controller_name.singularize.underscore #account
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+
4
+ jQuery('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
5
+ = raw generate_js_for_popups(@entity, :tasks, :leads, :opportunities)
@@ -0,0 +1,20 @@
1
+ - entity_name = controller.controller_name.singularize.underscore #account
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+ - id = called_from_landing_page? ? "edit_#{entity_name}" : dom_id(@entity)
4
+
5
+ - if @entity.errors.empty?
6
+ - if called_from_landing_page?
7
+ crm.flip_form('edit_#{entity_name}');
8
+ crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
9
+ = refresh_sidebar(:show, :summary)
10
+ - else
11
+ jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
+ jQuery('##{id}').effect("highlight", { duration:1500 });
13
+ = refresh_sidebar(:index, :filters)
14
+ - else
15
+ jQuery('##{id}').html('#{ j render(:partial => "edit") }');
16
+ jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
17
+ - if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
18
+ jQuery('#campaign_ends_on').focus();
19
+ - else
20
+ jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
@@ -14,7 +14,7 @@
14
14
 
15
15
  = link_to(comment.user.full_name, user_path(comment.user)) + ","
16
16
  %tt
17
- added note #{t(:time_ago, distance_of_time_in_words(Time.now, comment.created_at))}
17
+ = t(:added_note, value: timeago(comment.created_at) ).html_safe
18
18
  - if collapsable && can?(:read, commentable)
19
19
  = " | "
20
20
  = link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
@@ -8,4 +8,4 @@
8
8
  %div{:style => "padding:6px 0px 0px 40px;"}
9
9
  = f.submit t(:save_note)
10
10
  #{t :or}
11
- = link_to(t(:cancel), edit_comment_path("#{class_name}_id" => commentable, :cancel => true), :remote => true)
11
+ = link_to(t(:cancel), edit_comment_path(@comment, "#{class_name}_id" => commentable.id, :cancel => true), :remote => true)
@@ -23,11 +23,12 @@
23
23
  = hidden_field_tag "comment[commentable_type]", class_name.classify, :id => "#{id_prefix}_comment_commentable_type"
24
24
  = f.text_area :comment, :id => "#{id_prefix}_comment_comment"
25
25
  %div{:style => "padding:6px 0px 0px 40px;"}
26
+ = image_tag("loading.gif", :size => :thumb, :class => "spinner", :style => "display: none;")
26
27
  = f.submit t(:add_note), :id => "#{id_prefix}_comment_submit"
27
28
  #{t :or}
28
- = link_to(t(:cancel), new_comment_path("#{class_name}_id" => commentable) + '&cancel=true', :remote => true)
29
+ = link_to(t(:cancel), '#', :class => 'cancel')
29
30
  %div{ {:id => "#{id_prefix}_ask"}.merge(hidden_if(false))}
30
- = text_field_tag :post_new_note, t(:add_note_help), :onclick => remote_function(:url => new_comment_path("#{class_name}_id" => commentable), :method => :get), :id => "#{id_prefix}_post_new_note"
31
+ = text_field_tag :post_new_note, t(:add_note_help), :id => "#{id_prefix}_post_new_note"
31
32
 
32
33
  - if notification_emails_configured?
33
34
  = render :partial => "comments/subscription_links", :locals => {:entity => commentable}
@@ -0,0 +1,14 @@
1
+ - class_name = @comment.commentable.class.name.underscore
2
+ - id_prefix = "#{class_name}_#{@comment.commentable.id}"
3
+
4
+ - if @comment.valid?
5
+ jQuery('##{id_prefix}_comment_new').after('#{ j (render :partial => "comment", :locals => { :comment => @comment }) }');
6
+ jQuery('##{dom_id(@comment)}').effect("highlight", { duration:1500 });
7
+ jQuery('##{id_prefix}_post').hide();
8
+ jQuery('##{id_prefix}_ask').show();
9
+
10
+ jQuery('##{id_prefix}_shown_notes').val('#{ j @comment.commentable.comment_ids.join(',') }');
11
+ jQuery('##{id_prefix}_comment_comment').val('');
12
+ jQuery('##{id_prefix}_comment_comment').focus();
13
+ jQuery('##{id_prefix}_post').find('form [type=submit]').removeAttr("disabled")
14
+ jQuery('##{id_prefix}_post').find('.spinner').hide()
@@ -0,0 +1,5 @@
1
+ - class_name = @comment.commentable.class.name.downcase
2
+ - id_prefix = "#{class_name}_#{@comment.commentable.id}"
3
+
4
+ jQuery('##{id_prefix}_shown_notes').val('#{ j @comment.commentable.comment_ids.join(',') }');
5
+ jQuery('##{dom_id(@comment)}').css('background-color', '#ffe4e1').slideUp(250);
@@ -0,0 +1,11 @@
1
+ - id = dom_id(@comment)
2
+
3
+ - if params[:cancel].true? # <----------------- Hide [Edit Comment]
4
+ jQuery('##{id}').replaceWith('#{ j render(:partial => "comment", :collection => [ @comment ]) }');
5
+
6
+ - else # <----------------------------------------- Show [Edit Comment] form.
7
+
8
+ -# Disable onMouseOver for the list item.
9
+ crm.highlight_off('#{id}');
10
+ jQuery('##{id}').html('#{ j render(:partial => "edit", :locals => { :commentable => @comment.commentable }) }');
11
+ jQuery('##{dom_id(@comment, :text)}').focus();
@@ -0,0 +1,9 @@
1
+ - id = dom_id(@comment)
2
+
3
+ - if @comment.errors.empty?
4
+ jQuery('##{id}').replaceWith('#{ j render(:partial => "comment", :collection => [ @comment ]) }');
5
+ jQuery('##{id}').effect("highlight", { duration:1500 });
6
+ - else
7
+ jQuery('##{id}').html('#{ j render(:partial => "edit") }');
8
+ jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
9
+ jQuery('#comment_comment').focus();
@@ -1,5 +1,5 @@
1
1
  .remote
2
- = simple_form_for(@contact, :html => one_submit_only(:contact), :remote => true) do |f|
2
+ = simple_form_for(@contact, :html => one_submit_only, :remote => true) do |f|
3
3
  = link_to_close edit_contact_path(@contact)
4
4
  = f.hidden_field :user_id
5
5
 
@@ -41,7 +41,7 @@
41
41
  == #{t :mobile_small}:
42
42
  %b= contact.mobile
43
43
  |
44
- = t(:added_ago, time_ago_in_words(contact.created_at))
44
+ = t(:added_ago, value: timeago(contact.created_at)).html_safe
45
45
  - if contact.tag_list.present?
46
46
  %dt
47
47
  .tags= tags_for_index(contact)
@@ -35,7 +35,8 @@
35
35
  == #{t :mobile_small}:
36
36
  %b= contact.mobile
37
37
  |
38
- = t(:added_ago, time_ago_in_words(contact.created_at))
38
+ = t(:added_ago, value: timeago(contact.created_at)).html_safe
39
+
39
40
  - if contact.tag_list.present?
40
41
  %dt
41
42
  .tags= tags_for_index(contact)
@@ -1,4 +1,4 @@
1
- = simple_form_for(@contact, :html => one_submit_only(:contact), :remote => true) do |f|
1
+ = simple_form_for(@contact, :html => one_submit_only, :remote => true) do |f|
2
2
  = link_to_close new_contact_path
3
3
  = f.hidden_field :user_id
4
4
  = hidden_field_tag "opportunity", "#{@opportunity.id if @opportunity}"
@@ -15,8 +15,8 @@
15
15
  = col(t(:assigned_to), assigned_to_user ? link_to(assigned_to_user.name, url_for(assigned_to_user)) : "")
16
16
  %tr
17
17
  = col(t(:tags), contact.tag_list.map{|tag| content_tag(:span, tag, :class => "fbtag")}.join(' '))
18
-
18
+
19
19
  -# Show custom fields that are in the default field group
20
20
  - custom_field_group = contact.field_groups.select{|f| f.name == 'custom_fields'}
21
- - fields = custom_field_group.first.fields.without_pairs
22
- = render("fields/group_view", :fields => fields, :entity => contact) if fields.any?
21
+ - fields = custom_field_group.first.try(:fields).try(:without_pairs)
22
+ = render("fields/group_view", :fields => fields, :entity => contact) unless fields.nil?
@@ -0,0 +1,23 @@
1
+ - entity_name = controller.controller_name.singularize.underscore
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+ - create_id = "create_#{entity_name}"
4
+
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 });
11
+
12
+ - if called_from_index_page?
13
+ = refresh_sidebar(:index)
14
+ jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
15
+ - else
16
+ jQuery('#recently').html('#{ j render(:partial => "shared/recently") }');
17
+ crm.flick('empty', 'remove');
18
+
19
+ - else
20
+ jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
21
+ crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
22
+ jQuery('##{create_id}').effect("shake", { duration:250, distance: 6 });
23
+ jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
@@ -0,0 +1,9 @@
1
+ - entity_name = controller.controller_name.singularize.underscore
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+
4
+ jQuery('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
5
+ - if called_from_index_page?
6
+ = refresh_sidebar(:index, :filters)
7
+ jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
8
+ - else
9
+ jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
@@ -0,0 +1,35 @@
1
+ - entity_name = controller.controller_name.singularize.underscore #account
2
+ - @entity = instance_variable_get("@#{entity_name}")
3
+ - id = dom_id(@entity)
4
+
5
+ - if params[:cancel].true? # <--------------------- Hide [Edit]
6
+
7
+ - if called_from_landing_page?
8
+ crm.flip_form('edit_#{entity_name}');
9
+ crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
10
+ - else # Called from index page...
11
+ jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
12
+
13
+
14
+ - else # <----------------------------------------- Show [Edit Contact] form.
15
+
16
+ - if params[:cancel].blank? # Called from contacts list item...
17
+ - if @previous # Hide open [Edit Contact] form if any.
18
+ - if @previous.is_a?(Contact)
19
+ jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
20
+ - else
21
+ crm.flick('#{entity_name}_#{@previous}', 'remove');
22
+ -# Disable onMouseOver for the list item.
23
+ crm.highlight_off('#{id}');
24
+ -# Hide [Create] form if any.
25
+ crm.hide_form('create_#{entity_name}');
26
+ -# Show [Edit] form.
27
+ jQuery('##{id}').html('#{ j render(:partial => "edit") }');
28
+
29
+ - elsif params[:cancel].false? # Called from title of the contact landing page...
30
+ jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
31
+ crm.flip_form('edit_#{entity_name}');
32
+ crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.full_name}");
33
+
34
+ crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
35
+ jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();